[USER32]

[reactos.git] / reactos / dll / win32 / user32 / misc / stubs.c

diff --git a/reactos/dll/win32/user32/misc/stubs.c b/reactos/dll/win32/user32/misc/stubs.c
index 05c4c92..06608d8 100644 (file)
--- a/reactos/dll/win32/user32/misc/stubs.c
+++ b/reactos/dll/win32/user32/misc/stubs.c
@@ -170,11 +170,11 @@ UserRealizePalette ( HDC hDC )
 static HPEN SysColorPens[COLOR_MENUBAR + 1];
 static HBRUSH SysColorBrushes[COLOR_MENUBAR + 1];
 
-DWORD
+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);
 
@@ -193,11 +193,11 @@ SetSysColorsTemp(const COLORREF *pPens,
             SysColorBrushes[i] = pBrushes[i];
         }
 
-        return PtrToLong(pOldCol); /* FIXME: pointer truncation */
+        return (DWORD_PTR) pOldCol;
     }
     if (!pPens && !pBrushes) /* "restore" call */
     {
-        LPVOID pOldCol = LongToPtr(n); /* FIXME: not 64-bit safe */
+        LPVOID pOldCol = (LPVOID)n; /* FIXME: not 64-bit safe */
         LPVOID p = pOldCol;
         DWORD nCount = *(DWORD *)p;
         p = (char*)p + sizeof(DWORD);