Changeset 6806

Timestamp:

Sep 25, 2001, 2:05:27 AM (24 years ago)

Author:

phaller

Message:

implemented OemKeyScan

File:

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

trunk/src/user32/winkeyboard.cpp ¶

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.15 2001-09-24 16:24:59 phaller Exp $ */
+/* $Id: winkeyboard.cpp,v 1.16 2001-09-25 00:05:27 phaller Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -570 +570 @@
                              };
 
+
 //******************************************************************************
 //******************************************************************************
@@ -1068 +1069 @@
  * Result    :
  * Remark    :
- * Status    : UNTESTED STUB
+ * Status    : Borrowed from NT
  *
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
@@ -1075 +1076 @@
               WORD,  wOemChar)
 {
-  dprintf(("not implemented.\n"));
-
-  return (wOemChar);
+  int nVirtKey;
+  
+  OemToCharBuffA((LPCSTR)&wOemChar,
+                 (LPSTR) &nVirtKey,
+                 1);
+  if (nVirtKey != 0)
+  {
+    SHORT sScan = VkKeyScanA(nVirtKey);
+    nVirtKey = MapVirtualKeyA( (sScan & 0xff), 0);
+    if (nVirtKey != 0)
+    {
+      return ( (nVirtKey & 0x00FF) ||
+               ( (nVirtKey & 0xFF00) << 8) );
+    }
+  }
+  
+  // if not found ...
+  return 0xffffffff;
 }
 //******************************************************************************