[USER32]

- Fix SetSysColorTemps prototype and implementation for 64 bit compatibility, part 2/2.

svn path=/trunk/; revision=46918

diff --git a/reactos/dll/win32/user32/misc/stubs.c b/reactos/dll/win32/user32/misc/stubs.c
index c141ef6..06608d8 100644 (file)
--- a/reactos/dll/win32/user32/misc/stubs.c
+++ b/reactos/dll/win32/user32/misc/stubs.c
@@ -174,7 +174,7 @@ DWORD_PTR
 WINAPI
 SetSysColorsTemp(const COLORREF *pPens,
                  const HBRUSH *pBrushes,
-                                DWORD n)
+                                DWORD_PTR n)
 {
     DWORD i;
 
@@ -183,7 +183,7 @@ SetSysColorsTemp(const COLORREF *pPens,
         /* allocate our structure to remember old colors */
         LPVOID pOldCol = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)+n*sizeof(HPEN)+n*sizeof(HBRUSH));
         LPVOID p = pOldCol;
-        *(DWORD *)p = n; p = (char*)p + sizeof(DWORD);
+        *(DWORD_PTR *)p = n; p = (char*)p + sizeof(DWORD);
         memcpy(p, SysColorPens, n*sizeof(HPEN)); p = (char*)p + n*sizeof(HPEN);
         memcpy(p, SysColorBrushes, n*sizeof(HBRUSH)); p = (char*)p + n*sizeof(HBRUSH);
 

diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h
index bf3fff8..21cdf04 100644 (file)
--- a/reactos/include/psdk/winuser.h
+++ b/reactos/include/psdk/winuser.h
@@ -4442,7 +4442,7 @@ int WINAPI SetScrollInfo(HWND,int,LPCSCROLLINFO,BOOL);
 int WINAPI SetScrollPos(HWND,int,int,BOOL);
 BOOL WINAPI SetScrollRange(HWND,int,int,int,BOOL);
 BOOL WINAPI SetSysColors(int,const INT *,const COLORREF *);
-DWORD_PTR WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD);
+DWORD_PTR WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD_PTR);
 #define SetSysModalWindow(h) (NULL)
 BOOL WINAPI SetSystemCursor(HCURSOR,DWORD);
 BOOL WINAPI SetSystemMenu(HWND,HMENU);