Changeset 1704

Timestamp:

Nov 11, 1999, 2:17:33 PM (25 years ago)

Author:

sandervl

Message:

dlg fix, keyboard additions, + misc other things

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (4 diffs)
• dc.h (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (2 diffs)
• pmframe.cpp (modified) (2 diffs)
• user32.cpp (modified) (5 diffs)
• win32dlg.cpp (modified) (5 diffs)
• win32wbase.cpp (modified) (8 diffs)
• win32wbase.h (modified) (3 diffs)
• window.cpp (modified) (5 diffs)
• windowword.cpp (modified) (9 diffs)
• winkeyboard.cpp (modified) (3 diffs)

trunk/src/user32/dc.cpp ¶

@@ -1 @@
-/* $Id: dc.cpp,v 1.20 1999-11-10 14:16:44 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.21 1999-11-11 13:17:29 sandervl Exp $ */
 
 /*
@@ -875 +875 @@
    if (hwnd == NULLHANDLE)
    {
+#if 1
+        // Don't do this for now (causes lots of desktop repaints in WordPad)
+         O32_SetLastError (ERROR_INVALID_PARAMETER);
+         return FALSE;
+#else
       hwnd = HWND_DESKTOP;
       wnd  = Win32BaseWindow::GetWindowFromOS2Handle(OSLIB_HWND_DESKTOP);
@@ -885 +890 @@
          return FALSE;
       }
-
+#endif
    }
    else
@@ -1415 +1420 @@
 //******************************************************************************
 //******************************************************************************
+INT WIN32API ExcludeUpdateRgn( HDC hDC, HWND  hWnd)
+{
+    dprintf(("USER32:  ExcludeUpdateRgn\n"));
+    hWnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
+
+    return O32_ExcludeUpdateRgn(hDC,hWnd);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/dc.h ¶

@@ -1 @@
-/* $Id: dc.h,v 1.7 1999-11-02 19:13:00 sandervl Exp $ */
+/* $Id: dc.h,v 1.8 1999-11-11 13:17:29 sandervl Exp $ */
 /*
  * public dc functions
@@ -332 +332 @@
 }
 
+BOOL    OPEN32API _O32_ExcludeUpdateRgn( HDC, HWND );
+
+inline BOOL O32_ExcludeUpdateRgn(HDC a, HWND b)
+{
+ BOOL yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = _O32_ExcludeUpdateRgn(a, b);
+    SetFS(sel);
+
+    return yyrc;
+} 
+
 BOOL OPEN32API _O32_CreateCaret (HWND hwnd, HBITMAP hbm, int width, int height);
 

trunk/src/user32/oslibwin.cpp ¶

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.43 1999-11-10 17:11:29 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.44 1999-11-11 13:17:29 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -1164 +1164 @@
 //******************************************************************************
 //******************************************************************************
+BOOL OSLibWinGetKeyboardStateTable(unsigned char *PMKeyState)
+{
+  return WinSetKeyboardStateTable(HWND_DESKTOP, (PBYTE)&PMKeyState, FALSE );
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinSetKeyboardStateTable(unsigned char *PMKeyState)
+{
+  return WinSetKeyboardStateTable(HWND_DESKTOP, (PBYTE)&PMKeyState, TRUE );
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibwin.h ¶

@@ -1 @@
-/* $Id: oslibwin.h,v 1.24 1999-11-10 17:11:29 cbratschi Exp $ */
+/* $Id: oslibwin.h,v 1.25 1999-11-11 13:17:30 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -281 +281 @@
 BOOL OSLibSetWindowMinPos(HWND hwnd, ULONG x, ULONG y);
 
+BOOL  OSLibWinGetKeyboardStateTable(unsigned char * PMKeyState);
+BOOL  OSLibWinSetKeyboardStateTable(unsigned char * PMKeyState);
+
 #endif //__OSLIBWIN_H__

trunk/src/user32/pmframe.cpp ¶

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.22 1999-11-10 17:11:29 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.23 1999-11-11 13:17:30 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -312 +312 @@
         goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
     }
-
+        
     case WM_WINDOWPOSCHANGED:
     {

trunk/src/user32/user32.cpp ¶

@@ -1 @@
-/* $Id: user32.cpp,v 1.52 1999-11-09 19:23:16 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.53 1999-11-11 13:17:30 sandervl Exp $ */
 
 /*
@@ -1038 +1038 @@
 /* Help Functions */
 
-DWORD WIN32API GetWindowContextHelpId(HWND hwnd)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  GetWindowContextHelpId, not implemented\n");
-#endif
-  hwnd = Win32Window::Win32ToOS2Handle(hwnd);
-
-  return(0);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetWindowContextHelpId(HWND hwnd, DWORD dwContextHelpId)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  SetWindowContextHelpId, not implemented\n");
-#endif
-  hwnd = Win32Window::Win32ToOS2Handle(hwnd);
-
-  return(TRUE);
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API WinHelpA( HWND hwnd, LPCSTR lpszHelp, UINT uCommand, DWORD  dwData)
 {
@@ -1123 +1101 @@
 {
   return (GetOEMCP());
-}
-/*****************************************************************************
- * Name      : BOOL WIN32API GetKeyboardLayoutNameA
- * Purpose   : The GetKeyboardLayoutName function retrieves the name of the
- *             active keyboard layout.
- * Parameters: LPTSTR pwszKLID address of buffer for layout name
- * Variables :
- * Result    : If the function succeeds, the return value is TRUE.
- *             If the function fails, the return value is FALSE. To get extended
- *               error information, call GetLastError.
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
- *****************************************************************************/
-// @@@PH Win32 BOOL's are casted to INTs
-INT WIN32API GetKeyboardLayoutNameA(LPTSTR pwszKLID)
-{
-  dprintf(("USER32:GetKeyboardLayoutNameA (%08x) not implemented.",
-         pwszKLID));
-
-  return(FALSE);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API GetKeyboardLayoutList(int nBuff, HKL *lpList)
-{
-  dprintf(("USER32:  GetKeyboardLayoutList, not implemented\n"));
-  return(0);
-}
-//******************************************************************************
-//******************************************************************************
-HKL WIN32API GetKeyboardLayout(DWORD dwLayout)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  GetKeyboardLayout, not implemented\n");
-#endif
-  return(0);
-}
-/*****************************************************************************
- * Name      : BOOL WIN32API GetKeyboardLayoutNameW
- * Purpose   : The GetKeyboardLayoutName function retrieves the name of the
- *             active keyboard layout.
- * Parameters: LPTSTR pwszKLID address of buffer for layout name
- * Variables :
- * Result    : If the function succeeds, the return value is TRUE.
- *             If the function fails, the return value is FALSE. To get extended
- *               error information, call GetLastError.
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
- *****************************************************************************/
-// @@@PH Win32 BOOL's are casted to INTs
-INT WIN32API GetKeyboardLayoutNameW(LPWSTR pwszKLID)
-{
-  dprintf(("USER32:GetKeyboardLayoutNameW (%08x) not implemented.",
-         pwszKLID));
-
-  return(FALSE);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetKeyboardState(PBYTE lpKeyState)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  GetKeyboardState, not properly implemented\n");
-#endif
-  memset(lpKeyState, 0, 256);
-  return(TRUE);
 }
 //******************************************************************************
@@ -1409 +1317 @@
 #endif
   hwnd = Win32Window::Win32ToOS2Handle(hwnd);
-  return(TRUE);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetKeyboardState(PBYTE lpKeyState)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  SetKeyboardState, not implemented\n");
-#endif
   return(TRUE);
 }
@@ -1713 +1612 @@
   return (FALSE);
 }
-//******************************************************************************
-//******************************************************************************
-HWND WIN32API GetForegroundWindow(void)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetForegroundWindow\n");
-#endif
-    return Win32Window::OS2ToWin32Handle(O32_GetForegroundWindow());
-}
-//******************************************************************************
-//******************************************************************************
-HWND WIN32API GetLastActivePopup( HWND hWnd)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetLastActivePopup\n");
-#endif
-    hWnd = Win32Window::Win32ToOS2Handle(hWnd);
-
-    return Win32Window::OS2ToWin32Handle(O32_GetLastActivePopup(hWnd));
-}
-//******************************************************************************
-//******************************************************************************
-DWORD WIN32API GetWindowThreadProcessId(HWND hWnd, PDWORD  lpdwProcessId)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetWindowThreadProcessId\n");
-#endif
-    hWnd = Win32Window::Win32ToOS2Handle(hWnd);
-
-    return O32_GetWindowThreadProcessId(hWnd,lpdwProcessId);
-}
-
-/* Painting and Drawing Functions */
-
-INT WIN32API ExcludeUpdateRgn( HDC hDC, HWND  hWnd)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  ExcludeUpdateRgn\n");
-#endif
-    hWnd = Win32Window::Win32ToOS2Handle(hWnd);
-
-    return O32_ExcludeUpdateRgn(hDC,hWnd);
-}
+
 //******************************************************************************
 //******************************************************************************

trunk/src/user32/win32dlg.cpp ¶

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.32 1999-11-05 17:50:30 achimha Exp $ */
+/* $Id: win32dlg.cpp,v 1.33 1999-11-11 13:17:31 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -85 +85 @@
         }
     }
+
+    //Set help id
+    setWindowContextHelpId(dlgInfo.helpId);
 
     /* Create dialog main window */
@@ -209 +212 @@
         }
     }
-
-//TODO:
-//    wndPtr->helpContext = helpId;
 
     if (hUserFont)
@@ -1021 +1021 @@
     LONG oldval;
 
+    dprintf2(("Win32Dialog::SetWindowLongA %x %d %x", getWindowHandle(), index, value));
     switch(index)
     {
     case DWL_DLGPROC:
         oldval = (LONG)Win32DlgProc;
-        Win32DlgProc = (DLGPROC)index;
+        Win32DlgProc = (DLGPROC)value;
         return oldval;
     case DWL_MSGRESULT:
@@ -1043 +1044 @@
 ULONG Win32Dialog::GetWindowLongA(int index)
 {
+    dprintf2(("Win32Dialog::GetWindowLongA %x %d", getWindowHandle(), index));
     switch(index)
     {

trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.80 1999-11-10 20:02:48 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.81 1999-11-11 13:17:31 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -173 +173 @@
   windowId         = 0xFFFFFFFF;        //default = -1
   userData         = 0;
+  contextHelpId    = 0;
 
   pOldFrameProc = NULL;
@@ -1151 +1152 @@
 
     if(ISMOUSE_CAPTURED()) {
-        POINT point = {x,y};
+        POINT point = {x,y};
 
         MapWindowPoints(getWindowHandle(), HWND_DESKTOP, &point, 1);
-        if(DInputMouseHandler(getWindowHandle(), MOUSEMSG_MOVE, point.x, point.y, keystate))
-                return 0;
+        if(DInputMouseHandler(getWindowHandle(), MOUSEMSG_MOVE, point.x, point.y, keystate))
+            return 0;
     }
 
@@ -2692 +2693 @@
  LONG oldval;
 
-   switch(index) {
+    dprintf2(("SetWindowLongA %x %d %x", getWindowHandle(), index, value));
+    switch(index) {
         case GWL_EXSTYLE:
         {
@@ -2752 +2754 @@
                 SetLastError(ERROR_INVALID_PARAMETER);
                 return 0;
-   }
+    }
 }
 //******************************************************************************
@@ -2758 +2760 @@
 ULONG Win32BaseWindow::GetWindowLongA(int index)
 {
-   switch(index) {
+    dprintf2(("GetWindowLongA %x %d", getWindowHandle(), index));
+    switch(index) {
         case GWL_EXSTYLE:
                 return dwExStyle;
@@ -2783 +2786 @@
                 SetLastError(ERROR_INVALID_PARAMETER);
                 return 0;
-   }
+    }
 }
 //******************************************************************************
@@ -2838 +2841 @@
  Win32BaseWindow *win32wnd;
  DWORD        magic;
+
+  if(hwnd == OSLIB_HWND_DESKTOP)
+  {
+    return windowDesktop;
+  }
 
   win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwnd, OFFSET_WIN32WNDPTR);

trunk/src/user32/win32wbase.h ¶

@@ -1 @@
-/* $Id: win32wbase.h,v 1.42 1999-11-10 17:11:31 cbratschi Exp $ */
+/* $Id: win32wbase.h,v 1.43 1999-11-11 13:17:32 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -107 +107 @@
          HWND   getOS2FrameWindowHandle()       { return OS2HwndFrame; };
  Win32WndClass *getWindowClass()                { return windowClass; };
+
+         DWORD  getWindowContextHelpId()        { return contextHelpId; };
+         void   setWindowContextHelpId(DWORD id){ contextHelpId = id; };
 
          BOOL   isFrameWindow();
@@ -268 +271 @@
          HWND   hwndLinkAfter;
         DWORD   flags;
+        DWORD   contextHelpId;
         LONG    lastHitTestVal;         //Last value returned by WM_NCHITTEST handler
 

trunk/src/user32/window.cpp ¶

@@ -1 @@
-/* $Id: window.cpp,v 1.33 1999-11-05 09:16:22 sandervl Exp $ */
+/* $Id: window.cpp,v 1.34 1999-11-11 13:17:32 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1141 +1141 @@
 {
     dprintf(("USER32:  ChildWindowFromPoint\n"));
-//    return O32_ChildWindowFromPoint(arg1, arg2);
     return ChildWindowFromPointEx(hwnd, pt, 0);
 }
@@ -1304 +1303 @@
   return (0);
 }
-/*****************************************************************************
- * Name      : BOOL WIN32API SwitchToThisWindow
- * Purpose   : Unknown
- * Parameters: Unknown
- * Variables :
- * Result    :
- * Remark    :
- * Status    : UNTESTED UNKNOWN STUB
- *
- * Author    : Patrick Haller [Wed, 1998/06/16 11:55]
- *****************************************************************************/
-
-BOOL WIN32API SwitchToThisWindow(HWND hwnd,
-                                 BOOL x2)
-{
-  dprintf(("USER32: SwitchToThisWindow(%08xh,%08xh) not implemented.\n",
-           hwnd,
-           x2));
-
-  return (FALSE); /* default */
+/***********************************************************************
+ *             SwitchToThisWindow   (USER32.539)
+ */
+DWORD WINAPI SwitchToThisWindow( HWND hwnd, BOOL restore )
+{
+    return ShowWindow( hwnd, restore ? SW_RESTORE : SW_SHOWMINIMIZED );
 }
 //******************************************************************************
@@ -1433 +1418 @@
 BOOL WIN32API OpenIcon(HWND hwnd)
 {
-#ifdef DEBUG
-  WriteLog("USER32:  OpenIcon\n");
-#endif
+  dprintf(("USER32:  OpenIcon"));
+
   if(!IsIconic(hwnd))
         return FALSE;
@@ -1450 +1434 @@
 //******************************************************************************
 //******************************************************************************
-
+HWND WIN32API GetForegroundWindow(void)
+{
+    dprintf(("USER32:  GetForegroundWindow"));
+    return Win32BaseWindow::OS2ToWin32Handle(O32_GetForegroundWindow());
+}
+//******************************************************************************
+//******************************************************************************
+HWND WIN32API GetLastActivePopup( HWND hWnd)
+{
+    dprintf(("USER32:  GetLastActivePopup"));
+    hWnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
+
+    return Win32BaseWindow::OS2ToWin32Handle(O32_GetLastActivePopup(hWnd));
+}
+//******************************************************************************
+//******************************************************************************
+DWORD WIN32API GetWindowThreadProcessId(HWND hWnd, PDWORD  lpdwProcessId)
+{
+    dprintf(("USER32:  GetWindowThreadProcessId"));
+    hWnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
+
+    return O32_GetWindowThreadProcessId(hWnd,lpdwProcessId);
+}
+//******************************************************************************
+//******************************************************************************
+DWORD WIN32API GetWindowContextHelpId(HWND hwnd)
+{
+  dprintf(("USER32:  GetWindowContextHelpId, not implemented\n"));
+  hwnd = Win32BaseWindow::Win32ToOS2Handle(hwnd);
+
+  return(0);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API SetWindowContextHelpId(HWND hwnd, DWORD dwContextHelpId)
+{
+  dprintf(("USER32:  SetWindowContextHelpId, not implemented"));
+  hwnd = Win32BaseWindow::Win32ToOS2Handle(hwnd);
+
+  return(TRUE);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/windowword.cpp ¶

@@ -1 @@
-/* $Id: windowword.cpp,v 1.2 1999-10-17 12:17:46 cbratschi Exp $ */
+/* $Id: windowword.cpp,v 1.3 1999-11-11 13:17:33 sandervl Exp $ */
 
 /*
@@ -25 +25 @@
     {
       return window->SetWindowLongA(nIndex,lNewLong);
-    } else
+    }
+    else
     {
       if (nIndex == GWL_WNDPROC && !Win32BaseWindow::GetWindowFromOS2Handle(hwnd))
@@ -47 +48 @@
 
         return (LONG)window->getOldWndProc();
-      } else dprintf(("SetWindowLongA; window %x not found!", hwnd));
+      }
+      else dprintf(("SetWindowLongA; window %x not found!", hwnd));
     }
     return 0;
@@ -61 +63 @@
     {
       return window->SetWindowLongA(nIndex,lNewLong);
-    } else
+    }
+    else
     {
       if (nIndex == GWL_WNDPROC && !Win32BaseWindow::GetWindowFromOS2Handle(hwnd))
@@ -83 +86 @@
 
         return (LONG)window->getOldWndProc();
-      } else dprintf(("SetWindowLongW; window %x not found!", hwnd));
+      }
+      else dprintf(("SetWindowLongW; window %x not found!", hwnd));
     }
     return 0;
@@ -96 +100 @@
     if(window)
     {
-    return window->GetWindowWord(nIndex);
+        return window->GetWindowWord(nIndex);
     }
     else
     {
-    dprintf(("GetWindowWord; window %x not found!", hwnd));
+        dprintf(("GetWindowWord; window %x not found!", hwnd));
     }
     return 0;
@@ -113 +117 @@
     if(window)
     {
-    return window->SetWindowWord(nIndex, arg3);
+        return window->SetWindowWord(nIndex, arg3);
     }
     else
     {
-    dprintf(("SetWindowWord; window %x not found!", hwnd));
+        dprintf(("SetWindowWord; window %x not found!", hwnd));
     }
     return 0;
@@ -130 +134 @@
     if(window)
     {
-    return window->GetWindowLongA(nIndex);
+        return window->GetWindowLongA(nIndex);
     }
     else
     {
-    dprintf(("GetWindowLongA; window %x not found!", hwnd));
+        dprintf(("GetWindowLongA; window %x not found!", hwnd));
     }
     return 0;
@@ -147 +151 @@
     if(window)
     {
-    return window->GetWindowLongA(nIndex);
+        return window->GetWindowLongA(nIndex);
     }
     else
     {
-    dprintf(("GetWindowLongW; window %x not found!", hwnd));
+        dprintf(("GetWindowLongW; window %x not found!", hwnd));
     }
     return 0;

trunk/src/user32/winkeyboard.cpp ¶

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.1 1999-11-08 13:44:40 sandervl Exp $ */
+/* $Id: winkeyboard.cpp,v 1.2 1999-11-11 13:17:33 sandervl Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -9 +9 @@
 #include <os2win.h>
 #include <odin.h>
+#include <string.h>
+#include <stdio.h>
 #include <winkeyboard.h>
+#include "oslibwin.h"
+#include <heapstring.h>
 
 BYTE abPMScanToWinVKey[256] =
@@ -289 +293 @@
 //******************************************************************************
 //******************************************************************************
+BOOL WIN32API GetKeyboardState(PBYTE lpKeyState)
+{
+ BYTE   PMKeyState[256];
+ BOOL   rc;
+
+  dprintf(("USER32:  GetKeyboardState"));
+  rc = OSLibWinGetKeyboardStateTable((PBYTE)&PMKeyState );
+
+  if(rc == TRUE) 
+  {
+        KeyTranslatePMToWinBuf((BYTE *)&PMKeyState, lpKeyState, 256);
+        return TRUE;
+  }
+  return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API SetKeyboardState(PBYTE lpKeyState)
+{
+  dprintf(("USER32:  SetKeyboardState, not implemented"));
+  return(TRUE);
+}
+/***********************************************************************
+ *           GetKeyboardLayout                  (USER32.250)
+ *
+ * FIXME: - device handle for keyboard layout defaulted to 
+ *          the language id. This is the way Windows default works.
+ *        - the thread identifier (dwLayout) is also ignored.
+ */
+// * Remark    : Based on Wine version (991031)
+HKL WIN32API GetKeyboardLayout(DWORD dwLayout)
+{
+        HKL layout;
+        layout = GetSystemDefaultLCID(); /* FIXME */
+        layout |= (layout<<16);          /* FIXME */
+        dprintf(("GetKeyboardLayout returning %08x\n",layout));
+        return layout;
+}
+/*****************************************************************************
+ * Name      : BOOL WIN32API GetKeyboardLayoutNameA
+ * Purpose   : The GetKeyboardLayoutName function retrieves the name of the
+ *             active keyboard layout.
+ * Parameters: LPTSTR pwszKLID address of buffer for layout name
+ * Variables :
+ * Result    : If the function succeeds, the return value is TRUE.
+ *             If the function fails, the return value is FALSE. To get extended
+ *               error information, call GetLastError.
+ * Remark    : Based on Wine version (991031)
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
+ *****************************************************************************/
+INT WIN32API GetKeyboardLayoutNameA(LPTSTR pwszKLID)
+{
+   dprintf(("USER32:GetKeyboardLayoutNameA"));
+
+   sprintf(pwszKLID, "%08x",GetKeyboardLayout(0));
+   return 1;
+}
+/*****************************************************************************
+ * Name      : BOOL WIN32API GetKeyboardLayoutNameW
+ * Purpose   : The GetKeyboardLayoutName function retrieves the name of the
+ *             active keyboard layout.
+ * Parameters: LPTSTR pwszKLID address of buffer for layout name
+ * Variables :
+ * Result    : If the function succeeds, the return value is TRUE.
+ *             If the function fails, the return value is FALSE. To get extended
+ *               error information, call GetLastError.
+ * Remark    : Based on Wine version (991031)
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
+ *****************************************************************************/
+INT WIN32API GetKeyboardLayoutNameW(LPWSTR pwszKLID)
+{
+   LPSTR buf = (LPSTR)HEAP_xalloc( GetProcessHeap(), 0, strlen("00000409")+1);
+
+   dprintf(("USER32:GetKeyboardLayoutNameA"));
+   int res = GetKeyboardLayoutNameA(buf);
+   lstrcpyAtoW(pwszKLID,buf);
+   HeapFree( GetProcessHeap(), 0, buf );
+   return res;
+}
+/***********************************************************************
+ *           GetKeyboardLayoutList              (USER32.251)
+ *
+ * FIXME: Supports only the system default language and layout and 
+ *          returns only 1 value.
+ *
+ * Return number of values available if either input parm is 
+ *  0, per MS documentation.
+ *
+ * Remark    : Based on Wine version (991031)
+ */
+INT WINAPI GetKeyboardLayoutList(INT nBuff,HKL *layouts)
+{
+        dprintf(("GetKeyboardLayoutList(%d,%p)\n",nBuff,layouts));
+        if (!nBuff || !layouts)
+            return 1;
+        if (layouts)
+                layouts[0] = GetKeyboardLayout(0);
+        return 1;
+}
+
+//******************************************************************************
+//******************************************************************************