Changeset 7871 for trunk/src/user32/winkeyboard.cpp

Timestamp:

Feb 11, 2002, 3:03:18 PM (24 years ago)

Author:

sandervl

Message:

PF: Numpad enter fix for GetKeyNameTextA

File:

• trunk/src/user32/winkeyboard.cpp (modified) (8 diffs)

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.30 2002-02-11 13:48:43 sandervl Exp $ */
+/* $Id: winkeyboard.cpp,v 1.31 2002-02-11 14:03:18 sandervl Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -346 +346 @@
 /* 0x0B                   */ , 0x00                   , NULL
 /* 0x0C VK_CLEAR          */ , PMSCAN_PAD5            , "Num 5"
-/* 0x0D VK_RETURN         */ , PMSCAN_ENTER           , "Enter" // @@@PH BUG: identical to "Num Enter" !
+/* 0x0D VK_RETURN         */ , PMSCAN_ENTER           , "Enter" 
 /* 0x0E                   */ , 0x00                   , NULL
 /* 0x0F                   */ , 0x00                   , NULL
@@ -591 +591 @@
                              };
 
+// @@PF reflect Num Enter key
+LPSTR lpstrNumEnter = "Num Enter";
 
 // @@@PH
@@ -1310 +1312 @@
  *****************************************************************************/
 
-ODINFUNCTION0(UINT, GetKBCodePage)
+UINT WIN32API GetKBCodePage()
 {
   return (GetOEMCP());
@@ -1316 +1318 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION3(int,    GetKeyNameTextA,
-              LPARAM, lParam, 
-              LPSTR,  lpString, 
-              int,    nSize)
+int WIN32API GetKeyNameTextA(LPARAM lParam, LPSTR  lpString, int nSize)
 {
   // check the scancodes if the extended key bit is set so
   // we can easily distinguish between "left" and "right" special keys, etc.
   BOOL  fDontCare = (lParam & WIN_KEY_DONTCARE) != 0;
-  BOOL  fExtended = (lParam & WIN_KEY_EXTENDED) != 0;
+  BOOL  fExtended = (lParam & WIN_KEY_EXTENDED) != 0,PMExtended;
   UCHAR ucWinScan = (lParam & 0x00ff0000) >> 16;
   UCHAR ucWinVKey;
@@ -1348 +1347 @@
            ucPMScan));
   ucWinVKey = abPMScanToWinVKey[ucPMScan][0];
-  dprintf(("ucPMScan=%02xh translated to ucWinVKey=%02xh\n",
+  PMExtended = abPMScanToWinVKey[ucPMScan][1];
+
+  dprintf(("ucPMScan=%02xh translated to ucWinVKey=%02xh PMExtended=%d\n",
            ucPMScan,
-           ucWinVKey));
+           ucWinVKey,PMExtended));
 
   // Bug in Open32:
@@ -1360 +1361 @@
   memset(lpString, 0, nSize);
   
-  LPSTR lpstrKey = abWinVKeyToPMScan[ucWinVKey].lpstrName;
+  LPSTR lpstrKey;
+  lpstrKey = abWinVKeyToPMScan[ucWinVKey].lpstrName;
+
+  // handle Enter on Numeric Keypad here
+  if (PMExtended) 
+  {
+   if (ucWinVKey==VK_RETURN) lpstrKey = lpstrNumEnter;
+  }
+
   if (NULL == lpstrKey)
   {
@@ -1391 +1400 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION3(int,    GetKeyNameTextW,
-              LPARAM, lParam,
-              LPWSTR, lpString,
-              int,    nSize)
+int WIN32API GetKeyNameTextW(LPARAM lParam, LPWSTR lpString, int nSize)
 {
     dprintf(("USER32:  GetKeyNameTextW DOES NOT WORK (not implemented)\n"));