[ros-diffs] 09/16: [SHELL32] Fix 64 bit issues

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52ea7d39dbd35ae8864b9d...

commit 52ea7d39dbd35ae8864b9dcc7caeea2bb0adb12b
Author:     Timo Kreuzer [e-mail]
AuthorDate: Sun Mar 4 16:05:00 2018 +0100
Commit:     Timo Kreuzer [e-mail]
CommitDate: Sat Aug 4 19:19:34 2018 +0200

[SHELL32] Fix 64 bit issues
---
 dll/win32/shell32/folders/CDesktopFolder.cpp | 2 +-
 dll/win32/shell32/folders/CRegFolder.cpp     | 6 +++---
 dll/win32/shell32/shlfileop.cpp              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp
index b5bb839603..4105932915 100644
--- a/dll/win32/shell32/folders/CDesktopFolder.cpp
+++ b/dll/win32/shell32/folders/CDesktopFolder.cpp
@@ -845,7 +845,7 @@ HRESULT WINAPI CDesktopFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IData
     {
         if (uMsg == DFM_INVOKECOMMAND && wParam == 0)
         {
-            if (32 >= (UINT)ShellExecuteW(hwndOwner, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL))
+            if (32 >= (UINT_PTR)ShellExecuteW(hwndOwner, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL))
                 return E_FAIL;
             return S_OK;
         }
diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp
index fa233124d5..fc8eba29fe 100644
--- a/dll/win32/shell32/folders/CRegFolder.cpp
+++ b/dll/win32/shell32/folders/CRegFolder.cpp
@@ -41,18 +41,18 @@ HRESULT CALLBACK RegFolderContextMenuCallback(IShellFolder *psf,

if (_ILIsMyComputer(apidl[0]))
     {
-        if (32 >= (UINT)ShellExecuteW(hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL))
+        if (32 >= (UINT_PTR)ShellExecuteW(hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL))
             hr = E_FAIL;
     }
     else if (_ILIsDesktop(apidl[0]))
     {
-        if (32 >= (UINT)ShellExecuteW(hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL))
+        if (32 >= (UINT_PTR)ShellExecuteW(hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL))
             hr = E_FAIL;
     }
     else if (_ILIsNetHood(apidl[0]))
     {
         // FIXME path!
-        if (32 >= (UINT)ShellExecuteW(NULL, L"open", L"explorer.exe",
+        if (32 >= (UINT_PTR)ShellExecuteW(NULL, L"open", L"explorer.exe",
                                       L"::{7007ACC7-3202-11D1-AAD2-00805FC1270E}",
                                       NULL, SW_SHOWDEFAULT))
             hr = E_FAIL;
diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp
index e07d32d8d7..63486989db 100644
--- a/dll/win32/shell32/shlfileop.cpp
+++ b/dll/win32/shell32/shlfileop.cpp
@@ -1530,7 +1530,7 @@ static HRESULT delete_files(FILE_OPERATION *op, const FILE_LIST *flFrom)
     {
         fileEntry = &flFrom->feFiles[i];

-        if ((HANDLE)fileEntry->attributes == INVALID_HANDLE_VALUE)
+        if (fileEntry->attributes == (ULONG)-1)
         {
             // This is a windows 2003 server specific value which has been removed.
             // Later versions of windows return ERROR_FILE_NOT_FOUND.