[ros-diffs] 08/16: [USER32] Fix 64 bit issues

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9ad66d52f6809ecf7745…

commit e9ad66d52f6809ecf7745544343d00172f87ee9c
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sun Mar 4 17:44:13 2018 +0100
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Sat Aug 4 19:19:34 2018 +0200

    [USER32] Fix 64 bit issues
---
 win32ss/user/user32/misc/desktop.c       | 2 +-
 win32ss/user/user32/misc/dllmain.c       | 2 +-
 win32ss/user/user32/windows/cursoricon.c | 2 +-
 win32ss/user/user32/windows/defwnd.c     | 2 +-
 win32ss/user/user32/windows/dialog.c     | 2 +-
 win32ss/user/user32/windows/messagebox.c | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/win32ss/user/user32/misc/desktop.c b/win32ss/user/user32/misc/desktop.c
index edf17e8199..bd3ca78826 100644
--- a/win32ss/user/user32/misc/desktop.c
+++ b/win32ss/user/user32/misc/desktop.c
@@ -563,7 +563,7 @@ GetThreadDesktop(
     }
 
     return NtUserGetThreadDesktop(dwThreadId,
-                                 
(DWORD)GetThreadConsoleDesktopRequest->ConsoleDesktop);
+                                 
(DWORD_PTR)GetThreadConsoleDesktopRequest->ConsoleDesktop);
 }
 
 
diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c
index 5bf68551f7..704cb2c49a 100644
--- a/win32ss/user/user32/misc/dllmain.c
+++ b/win32ss/user/user32/misc/dllmain.c
@@ -574,7 +574,7 @@ User32CallGetCharsetInfo(PVOID Arguments, ULONG ArgumentLength)
 
   TRACE("GetCharsetInfo\n");
 
-  Ret = TranslateCharsetInfo((DWORD *)pgci->Locale, &pgci->Cs, TCI_SRCLOCALE);
+  Ret = TranslateCharsetInfo((DWORD *)(ULONG_PTR)pgci->Locale, &pgci->Cs,
TCI_SRCLOCALE);
 
   return ZwCallbackReturn(Arguments, ArgumentLength, Ret ? STATUS_SUCCESS :
STATUS_UNSUCCESSFUL);
 }
diff --git a/win32ss/user/user32/windows/cursoricon.c
b/win32ss/user/user32/windows/cursoricon.c
index ee286580bd..ad0ac4d6d0 100644
--- a/win32ss/user/user32/windows/cursoricon.c
+++ b/win32ss/user/user32/windows/cursoricon.c
@@ -281,7 +281,7 @@ create_alpha_bitmap(
     HDC hdc = NULL, hdcScreen;
     unsigned char *ptr;
     void *bits = NULL;
-    size_t size;
+    ULONG size;
 
     hdcScreen = CreateDCW(DISPLAYW, NULL, NULL, NULL);
     if (!hdcScreen)
diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c
index ac9fd93526..ad2bbbbe5d 100644
--- a/win32ss/user/user32/windows/defwnd.c
+++ b/win32ss/user/user32/windows/defwnd.c
@@ -869,7 +869,7 @@ RealDefWindowProcA(HWND hWnd,
         {
             PWSTR buf = NULL;
             PSTR outbuf = (PSTR)lParam;
-            UINT copy;
+            SIZE_T copy;
 
             if (Wnd != NULL && wParam != 0)
             {
diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c
index 7042f45324..3cf8371a54 100644
--- a/win32ss/user/user32/windows/dialog.c
+++ b/win32ss/user/user32/windows/dialog.c
@@ -2532,7 +2532,7 @@ IsDialogMessageW(
                             WCHAR *buffer = HeapAlloc (GetProcessHeap(), 0, maxlen *
sizeof(WCHAR));
                             if (buffer)
                             {
-                                INT length;
+                                SIZE_T length;
                                 SendMessageW (hwndNext, WM_GETTEXT, maxlen, (LPARAM)
buffer);
                                 length = strlenW (buffer);
                                 HeapFree (GetProcessHeap(), 0, buffer);
diff --git a/win32ss/user/user32/windows/messagebox.c
b/win32ss/user/user32/windows/messagebox.c
index 2ceb24fe15..0b94c6c044 100644
--- a/win32ss/user/user32/windows/messagebox.c
+++ b/win32ss/user/user32/windows/messagebox.c
@@ -387,7 +387,7 @@ MessageBoxTimeoutIndirectW(
     else if (IS_INTRESOURCE(lpMsgBoxParams->lpszCaption))
     {
         /* User-defined resource string */
-        caplen = LoadStringW(lpMsgBoxParams->hInstance,
(UINT)lpMsgBoxParams->lpszCaption, (LPWSTR)&caption, 0);
+        caplen = LoadStringW(lpMsgBoxParams->hInstance,
PtrToUlong(lpMsgBoxParams->lpszCaption), (LPWSTR)&caption, 0);
     }
     else
     {
@@ -405,7 +405,7 @@ MessageBoxTimeoutIndirectW(
     else if (IS_INTRESOURCE(lpMsgBoxParams->lpszText))
     {
         /* User-defined resource string */
-        textlen = LoadStringW(lpMsgBoxParams->hInstance,
(UINT)lpMsgBoxParams->lpszText, (LPWSTR)&text, 0);
+        textlen = LoadStringW(lpMsgBoxParams->hInstance,
PtrToUlong(lpMsgBoxParams->lpszText), (LPWSTR)&text, 0);
     }
     else
     {