Changeset 21808 for branches/gcc-kmk/src/user32/winkeyboard.cpp

Timestamp:

Nov 14, 2011, 11:03:47 PM (14 years ago)

Author:

dmik

Message:

Port USER32.DLL (continued).

File:

• branches/gcc-kmk/src/user32/winkeyboard.cpp (modified) (4 diffs)

branches/gcc-kmk/src/user32/winkeyboard.cpp

@@ -321 +321 @@
   /* index is the VKey value */
   BYTE  bPMScanCode;
-  LPSTR lpstrName;
+  LPCSTR lpstrName;
 } WINVKEYTOPMSCAN, *PWINVKEYTOPMSCAN;
 
@@ -587 +587 @@
 
 // @@PF reflect Num Enter key
-LPSTR lpstrNumEnter = "Num Enter";
+LPCSTR lpstrNumEnter = "Num Enter";
 
 // @@@PH
@@ -1335 +1335 @@
 }
 
+extern "C"
 int WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
                        LPWSTR lpwStr, int size, UINT flags, HKL hkl)
@@ -1408 +1409 @@
   memset(lpString, 0, nSize);
   
-  LPSTR lpstrKey;
+  LPCSTR lpstrKey;
   lpstrKey = abWinVKeyToPMScan[ucWinVKey].lpstrName;