Changeset 8512 for trunk/src

Timestamp:

May 29, 2002, 11:56:43 AM (23 years ago)

Author:

sandervl

Message:

Fix for ToAscii(Ex) & GetKeyboardState (WinTranslateChar2 call)

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (2 diffs)
• winkeyboard.cpp (modified) (3 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.120 2002-04-30 18:47:46 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.121 2002-05-29 09:56:43 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -931 +931 @@
 USHORT OSLibWinTranslateChar(USHORT usScanCode, ULONG type, USHORT shiftstate)
 {
+  USHORT usResult;
   USHORT sel = GetFS();
-  usScanCode = WinTranslateChar2(0, &usScanCode, NULL, type, &shiftstate);
+
+  usResult = WinTranslateChar2(0, &usScanCode, NULL, type, &shiftstate);
   SetFS(sel);
   return usScanCode;

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.34 2002-05-23 07:13:00 sandervl Exp $ */
+/* $Id: winkeyboard.cpp,v 1.35 2002-05-29 09:56:43 sandervl Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -26 +26 @@
 #define DBG_LOCALLOG    DBG_winkeyboard
 #include "dbglocal.h"
-
-
-
-
-ODINDEBUGCHANNEL(USER32-WINKBD)
 
 
@@ -1196 +1191 @@
        else ret = 1;
   }
-  dprintf2(("USER32:ToAscii returned %x, len %d", *lpwTransKey, ret));
+  dprintf(("USER32:ToAscii returned %x, len %d", *lpwTransKey, ret));
   return ret;
 }