[ros-diffs] [fireball] 48387: [PSDK] - Make some winuser.h functions conforming to MS PSDK.

Author: fireball
Date: Sat Jul 31 22:36:22 2010
New Revision: 48387

URL: http://svn.reactos.org/svn/reactos?rev=48387&view=rev
Log:
[PSDK]
- Make some winuser.h functions conforming to MS PSDK.

Modified:
    trunk/reactos/dll/win32/user32/windows/font.c
    trunk/reactos/dll/win32/user32/windows/input.c
    trunk/reactos/include/psdk/winuser.h

Modified: trunk/reactos/dll/win32/user32/windows/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/font.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/font.c [iso-8859-1] Sat Jul 31 22:36:22 2010
@@ -66,7 +66,7 @@
   LPCSTR lpString,
   int nCount,
   int nTabPositions,
-  CONST LPINT lpnTabStopPositions,
+  CONST INT *lpnTabStopPositions,
   int nTabOrigin)
 {
   LONG ret;
@@ -196,7 +196,7 @@
   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 @@
   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 @@
   LPCWSTR lpString,
   int nCount,
   int nTabPositions,
-  CONST LPINT lpnTabStopPositions)
+  CONST INT *lpnTabStopPositions)
 {
    return TEXT_TabbedTextOut(hDC, 0, 0, lpString, nCount, nTabPositions,
lpnTabStopPositions, 0, FALSE);
 }

Modified: trunk/reactos/dll/win32/user32/windows/input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Sat Jul 31 22:36:22 2010
@@ -398,7 +398,7 @@
 int WINAPI
 ToAscii(UINT uVirtKey,
 	UINT uScanCode,
-	CONST PBYTE lpKeyState,
+	CONST BYTE *lpKeyState,
 	LPWORD lpChar,
 	UINT uFlags)
 {
@@ -412,7 +412,7 @@
 int WINAPI
 ToAsciiEx(UINT uVirtKey,
 	  UINT uScanCode,
-	  CONST PBYTE lpKeyState,
+	  CONST BYTE *lpKeyState,
 	  LPWORD lpChar,
 	  UINT uFlags,
 	  HKL dwhkl)
@@ -434,7 +434,7 @@
 int WINAPI
 ToUnicode(UINT wVirtKey,
 	  UINT wScanCode,
-	  CONST PBYTE lpKeyState,
+	  CONST BYTE *lpKeyState,
 	  LPWSTR pwszBuff,
 	  int cchBuff,
 	  UINT wFlags)
@@ -450,13 +450,13 @@
 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 );
 }
 

Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sat Jul 31 22:36:22 2010
@@ -4163,8 +4163,8 @@
 #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 @@
 #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);