Author: fireball Date: Sun Apr 18 14:46:53 2010 New Revision: 46918
URL: http://svn.reactos.org/svn/reactos?rev=46918&view=rev Log: [USER32] - Fix SetSysColorTemps prototype and implementation for 64 bit compatibility, part 2/2.
Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/include/psdk/winuser.h
Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stubs... ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sun Apr 18 14:46:53 2010 @@ -174,7 +174,7 @@ WINAPI SetSysColorsTemp(const COLORREF *pPens, const HBRUSH *pBrushes, - DWORD n) + DWORD_PTR n) { DWORD i;
@@ -183,7 +183,7 @@ /* 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);
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] Sun Apr 18 14:46:53 2010 @@ -4442,7 +4442,7 @@ 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);