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

Timestamp:

Feb 11, 2002, 5:08:15 PM (24 years ago)

Author:

sandervl

Message:

logging updates

File:

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

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.31 2002-02-11 14:03:18 sandervl Exp $ */
+/* $Id: winkeyboard.cpp,v 1.32 2002-02-11 16:06:00 sandervl Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -863 +863 @@
 //******************************************************************************
 
-ODINPROCEDURE3(KeyTranslatePMToWinBuf,
-               BYTE *, pmkey,
-               BYTE *, winkey,
-               int,    nrkeys)
+VOID WIN32API KeyTranslatePMToWinBuf(BYTE *pmkey, BYTE *winkey,
+                                     int nrkeys)
 {
    for(int i=1;i<nrkeys;i++) {
@@ -969 +967 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(int, GetKeyboardType,
-              int, nTypeFlag)
+INT WIN32API GetKeyboardType(INT nTypeFlag)
 {
     return O32_GetKeyboardType(nTypeFlag);
@@ -976 +973 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(BOOL,  GetKeyboardState,
-              PBYTE, lpKeyState)
+BOOL WIN32API GetKeyboardState(PBYTE lpKeyState)
 {
  BYTE   PMKeyState[256];
@@ -1011 +1007 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(BOOL,  SetKeyboardState,
-              PBYTE, lpKeyState)
+BOOL WIN32API SetKeyboardState(PBYTE lpKeyState)
 {
   dprintf(("USER32: SetKeyboardState %x not implemented", lpKeyState));
@@ -1025 +1020 @@
  */
 // * Remark    : Based on Wine version (991031)
-ODINFUNCTION1(HKL,   GetKeyboardLayout,
-              DWORD, dwLayout)
+HKL WIN32API GetKeyboardLayout(DWORD dwLayout)
 {
         HKL layout;
@@ -1048 +1042 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION1(INT,   GetKeyboardLayoutNameA,
-              LPSTR, pwszKLID)
+INT WIN32API GetKeyboardLayoutNameA(LPSTR pwszKLID)
 {
    dprintf(("not correctly implemented"));
@@ -1072 +1065 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION1(INT,    GetKeyboardLayoutNameW,
-              LPWSTR, pwszKLID)
+INT WIN32API GetKeyboardLayoutNameW(LPWSTR pwszKLID)
 {
    LPSTR buf = (LPSTR)HEAP_xalloc( GetProcessHeap(), 0, strlen("00000409")+1);
@@ -1093 +1085 @@
  * Remark    : Based on Wine version (991031)
  */
-ODINFUNCTION2(INT,   GetKeyboardLayoutList,
-              INT,   nBuff,
-              HKL *, layouts)
+INT WIN32API GetKeyboardLayoutList(INT nBuff, HKL *layouts)
 {
   dprintf(("not correctly implemented"));
@@ -1130 +1120 @@
  *****************************************************************************/
 
-ODINFUNCTION5(int,    ToAscii,
-              UINT,   uVirtKey,
-              UINT,   uScanCode,
-              PBYTE,  lpbKeyState,
-              LPWORD, lpwTransKey,
-              UINT,   fuState)
+int WIN32API ToAscii(UINT uVirtKey, UINT uScanCode, PBYTE lpbKeyState,
+                     LPWORD lpwTransKey, UINT fuState)
 {
   INT ret;
@@ -1237 +1223 @@
  *****************************************************************************/
 
-ODINFUNCTION6(int,    ToAsciiEx,
-              UINT,   uVirtKey,
-              UINT,   uScanCode,
-              PBYTE,  lpbKeyState,
-              LPWORD, lpwTransKey,
-              UINT,   fuState,
-              HKL,    hkl)
+int WIN32API ToAsciiEx(UINT uVirtKey, UINT uScanCode, PBYTE lpbKeyState,
+                       LPWORD lpwTransKey, UINT fuState, HKL hkl)
 {
   dprintf(("imcompletely implemented"));
@@ -1283 +1264 @@
  *****************************************************************************/
 
-ODINFUNCTION6(int,    ToUnicode,
-              UINT,   uVirtKey,
-              UINT,   uScanCode,
-              PBYTE,  lpKeyState,
-              LPWSTR, pwszBuff,
-              int,    cchBuff,
-              UINT,   wFlags)
+int WIN32API ToUnicode(UINT uVirtKey, UINT uScanCode, PBYTE lpKeyState,
+                       LPWSTR pwszBuff, int cchBuff, UINT wFlags)
 {
   dprintf(("not implemented.\n"));
@@ -1409 +1385 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(SHORT, GetKeyState,
-              int,   nVirtKey)
+SHORT WIN32API GetKeyState(int nVirtKey)
 {
   // check overlay array first
@@ -1431 +1406 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(WORD,  GetAsyncKeyState,
-              INT,   nVirtKey)
+WORD WIN32API GetAsyncKeyState(INT nVirtKey)
 {
   // check overlay array first
@@ -1453 +1427 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(UINT,  MapVirtualKeyA,
-              UINT,  uCode, 
-              UINT,  uMapType)
+UINT WIN32API MapVirtualKeyA(UINT uCode,  UINT uMapType)
 {
   dprintf(("imcompletely implemented"));
@@ -1480 +1452 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(UINT,  MapVirtualKeyW,
-              UINT,  uCode, 
-              UINT,  uMapType)
+UINT WIN32API MapVirtualKeyW(UINT uCode, UINT uMapType)
 {
   dprintf(("incorrectly implemented\n"));
@@ -1506 +1476 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION3(UINT,  MapVirtualKeyExA,
-              UINT,  uCode, 
-              UINT,  uMapType, 
-              HKL,   dwhkl)
+UINT WIN32API MapVirtualKeyExA(UINT uCode,  UINT uMapType, HKL dwhkl)
 {
   dprintf(("incompletely implemented"));
@@ -1532 +1499 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION3(UINT, MapVirtualKeyExW,
-              UINT, uCode, 
-              UINT, uMapType, 
-              HKL,  dwhkl)
+UINT WIN32API MapVirtualKeyExW(UINT uCode, UINT uMapType, HKL dwhkl)
 {
   dprintf(("incompletely implemented"));
@@ -1555 +1519 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION1(DWORD, OemKeyScan,
-              WORD,  wOemChar)
+DWORD WIN32API OemKeyScan(WORD wOemChar)
 {
   int nVirtKey;
@@ -1579 +1542 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION4(BOOL,  RegisterHotKey,
-              HWND,  hwnd, 
-              int,   idHotKey, 
-              UINT,  fuModifiers, 
-              UINT,  uVirtKey)
+BOOL WIN32API RegisterHotKey(HWND hwnd, int idHotKey, UINT fuModifiers, 
+                             UINT uVirtKey)
 {
   dprintf(("not implemented"));
@@ -1592 +1552 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(BOOL, UnregisterHotKey,
-              HWND, hwnd, 
-              int,  idHotKey)
+BOOL WIN32API UnregisterHotKey(HWND hwnd, int idHotKey)
 {
   dprintf(("not implemented"));
@@ -1604 +1562 @@
 
 //******************************************************************************
-//SvL: 24-6-'97 - Added
-//******************************************************************************
-ODINFUNCTION1(WORD, VkKeyScanA,
-              char, ch)
+//******************************************************************************
+WORD WIN32API VkKeyScanA(char ch)
 {
   return O32_VkKeyScan(ch);
@@ -1613 +1569 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(WORD,  VkKeyScanW,
-              WCHAR, wch)
+WORD WIN32API VkKeyScanW(WCHAR wch)
 {
   dprintf(("incorrectly implemented"));
@@ -1635 +1590 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION2(WORD,  VkKeyScanExW,
-              WCHAR, uChar,
-              HKL,   hkl)
+WORD WIN32API VkKeyScanExW(WCHAR uChar, HKL hkl)
 {
   dprintf(("partially implemented"));
@@ -1658 +1611 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION2(WORD, VkKeyScanExA,
-              CHAR, uChar,
-              HKL,  hkl)
+WORD WIN32API VkKeyScanExA(CHAR uChar, HKL hkl)
 {
   dprintf(("partially implemented"));
@@ -1684 +1635 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINPROCEDURE4(keybd_event,
-               BYTE,  bVk,
-               BYTE,  bScan,
-               DWORD, dwFlags,
-               DWORD, dwExtraInfo)
+VOID WIN32API keybd_event(BYTE bVk, BYTE bScan, DWORD dwFlags, DWORD dwExtraInfo)
 {
   INPUT i;
@@ -1719 +1666 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION2(HKL,     LoadKeyboardLayoutA,
-              LPCSTR,  pwszKLID,
-              UINT,    Flags)
+HKL WIN32API LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags)
 {
   dprintf(("USER32:LeadKeyboardLayoutA (%s,%u) not implemented.\n",
@@ -1746 +1691 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION2(HKL,     LoadKeyboardLayoutW,
-              LPCWSTR, pwszKLID,
-              UINT,    Flags)
+HKL WIN32API LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags)
 {
   dprintf(("USER32:LoadKeyboardLayoutW (%ls,%u) not implemented.\n",
@@ -1758 +1701 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(BOOL,  ActivateKeyboardLayout,
-              HKL,   hkl,
-              UINT,  fuFlags)
+BOOL WIN32API ActivateKeyboardLayout(HKL hkl, UINT fuFlags)
 {
   dprintf(("not implemented\n"));
@@ -1788 +1729 @@
 
 // this is an internal function to emulate Alt-Gr behaviour
-ODINPROCEDURE2(KeySetOverlayKeyState,
-               int, nVirtKey,
-               char, nState)
+VOID WIN32API KeySetOverlayKeyState(int nVirtKey, char nState)
 {
   // setup overlay array