Changeset 10552 for trunk/src

Timestamp:

Mar 23, 2004, 4:49:50 PM (22 years ago)

Author:

sandervl

Message:

MapVirtualKeyA: must convert return value from PM to windows scancodes

File:

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

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.44 2004-03-15 14:00:12 sandervl Exp $ */
+/* $Id: winkeyboard.cpp,v 1.45 2004-03-23 15:49:50 sandervl Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -893 +893 @@
   
   // experiment
+
 #if 0
   bAlmost = abWinVKeyToPMScan[bWinVKey].bPMScanCode;
@@ -973 +974 @@
   return bAlmost; 
   
+}
+//******************************************************************************
+//******************************************************************************
+BYTE KeyTranslatePMScanToWinScan(BYTE bPMScan)
+{
+  // Note:
+  // MapVirtualKeyA requires this function,
+  // O32_MapVirtualKeyA uses PM Scancodes only!
+  
+  return abPMScanToWinScan[bPMScan][0];
 }
 //******************************************************************************
@@ -1637 +1648 @@
            return ret;
       }
-      break;
+      ret = O32_MapVirtualKey(uCode, uMapType);
+
+      // WGSS returns PM scancodes
+      ret = KeyTranslatePMScanToWinScan(ret);
+      return ret;
     }