[PSDK]

- Make some winuser.h functions conforming to MS PSDK.

svn path=/trunk/; revision=48387

diff --git a/reactos/dll/win32/user32/windows/font.c b/reactos/dll/win32/user32/windows/font.c
index a0fede9..468718c 100644 (file)
--- a/reactos/dll/win32/user32/windows/font.c
+++ b/reactos/dll/win32/user32/windows/font.c
@@ -66,7 +66,7 @@ TabbedTextOutA(
   LPCSTR lpString,
   int nCount,
   int nTabPositions,
-  CONST LPINT lpnTabStopPositions,
+  CONST INT *lpnTabStopPositions,
   int nTabOrigin)
 {
   LONG ret;
@@ -196,7 +196,7 @@ TabbedTextOutW(
   LPCWSTR lpString,
   int nCount,
   int nTabPositions,
-  CONST LPINT lpnTabStopPositions,
+  CONST INT *lpnTabStopPositions,
   int nTabOrigin)
 {
   return TEXT_TabbedTextOut(hDC, X, Y, lpString, nCount, nTabPositions, lpnTabStopPositions, nTabOrigin, TRUE);
@@ -213,7 +213,7 @@ GetTabbedTextExtentA(
   LPCSTR lpString,
   int nCount,
   int nTabPositions,
-  CONST LPINT lpnTabStopPositions)
+  CONST INT *lpnTabStopPositions)
 {
     LONG ret;
     DWORD len = MultiByteToWideChar(CP_ACP, 0, lpString, nCount, NULL, 0);
@@ -241,7 +241,7 @@ GetTabbedTextExtentW(
   LPCWSTR lpString,
   int nCount,
   int nTabPositions,
-  CONST LPINT lpnTabStopPositions)
+  CONST INT *lpnTabStopPositions)
 {
    return TEXT_TabbedTextOut(hDC, 0, 0, lpString, nCount, nTabPositions, lpnTabStopPositions, 0, FALSE);
 }

diff --git a/reactos/dll/win32/user32/windows/input.c b/reactos/dll/win32/user32/windows/input.c
index 4e97b0d..aa9a997 100644 (file)
--- a/reactos/dll/win32/user32/windows/input.c
+++ b/reactos/dll/win32/user32/windows/input.c
@@ -398,7 +398,7 @@ SwapMouseButton(
 int WINAPI
 ToAscii(UINT uVirtKey,
        UINT uScanCode,
-       CONST PBYTE lpKeyState,
+       CONST BYTE *lpKeyState,
        LPWORD lpChar,
        UINT uFlags)
 {
@@ -412,7 +412,7 @@ ToAscii(UINT uVirtKey,
 int WINAPI
 ToAsciiEx(UINT uVirtKey,
          UINT uScanCode,
-         CONST PBYTE lpKeyState,
+         CONST BYTE *lpKeyState,
          LPWORD lpChar,
          UINT uFlags,
          HKL dwhkl)
@@ -434,7 +434,7 @@ ToAsciiEx(UINT uVirtKey,
 int WINAPI
 ToUnicode(UINT wVirtKey,
          UINT wScanCode,
-         CONST PBYTE lpKeyState,
+         CONST BYTE *lpKeyState,
          LPWSTR pwszBuff,
          int cchBuff,
          UINT wFlags)
@@ -450,13 +450,13 @@ ToUnicode(UINT wVirtKey,
 int WINAPI
 ToUnicodeEx(UINT wVirtKey,
            UINT wScanCode,
-           CONST PBYTE lpKeyState,
+           CONST BYTE *lpKeyState,
            LPWSTR pwszBuff,
            int cchBuff,
            UINT wFlags,
            HKL dwhkl)
 {
-  return NtUserToUnicodeEx( wVirtKey, wScanCode, lpKeyState, pwszBuff, cchBuff,
+  return NtUserToUnicodeEx( wVirtKey, wScanCode, (PBYTE)lpKeyState, pwszBuff, cchBuff,
                            wFlags, dwhkl );
 }
 

diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h
index 132a132..6008e75 100644 (file)
--- a/reactos/include/psdk/winuser.h
+++ b/reactos/include/psdk/winuser.h
@@ -4163,8 +4163,8 @@ HBRUSH WINAPI GetSysColorBrush(int);
 #define GetSysModalWindow() (NULL)
 HMENU WINAPI GetSystemMenu(HWND,BOOL);
 int WINAPI GetSystemMetrics(int);
-DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST LPINT);
-DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST LPINT);
+DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST INT*);
+DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST INT*);
 LONG WINAPI GetWindowLongA(HWND,int);
 LONG WINAPI GetWindowLongW(HWND,int);
 #ifdef _WIN64
@@ -4491,13 +4491,13 @@ VOID WINAPI SwitchToThisWindow(HWND,BOOL);
 #endif /* (_WIN32_WINNT >= 0x0500) */
 BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT);
 BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT);
-LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST LPINT,int);
-LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST LPINT,int);
+LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST INT*,int);
+LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST INT*,int);
 WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *);
-int WINAPI ToAscii(UINT,UINT,CONST PBYTE,LPWORD,UINT);
-int WINAPI ToAsciiEx(UINT,UINT,CONST PBYTE,LPWORD,UINT,HKL);
-int WINAPI ToUnicode(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT);
-int WINAPI ToUnicodeEx(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT,HKL);
+int WINAPI ToAscii(UINT,UINT,CONST BYTE*,LPWORD,UINT);
+int WINAPI ToAsciiEx(UINT,UINT,CONST BYTE*,LPWORD,UINT,HKL);
+int WINAPI ToUnicode(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT);
+int WINAPI ToUnicodeEx(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT,HKL);
 BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
 BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT);
 BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS);