mirror of
https://github.com/reactos/reactos.git
synced 2024-06-29 09:21:31 +00:00
[SHELL32] Fix 64 bit issues
This commit is contained in:
parent
e9ad66d52f
commit
52ea7d39db
|
@ -845,7 +845,7 @@ HRESULT WINAPI CDesktopFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IData
|
||||||
{
|
{
|
||||||
if (uMsg == DFM_INVOKECOMMAND && wParam == 0)
|
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 E_FAIL;
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,18 +41,18 @@ HRESULT CALLBACK RegFolderContextMenuCallback(IShellFolder *psf,
|
||||||
|
|
||||||
if (_ILIsMyComputer(apidl[0]))
|
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;
|
hr = E_FAIL;
|
||||||
}
|
}
|
||||||
else if (_ILIsDesktop(apidl[0]))
|
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;
|
hr = E_FAIL;
|
||||||
}
|
}
|
||||||
else if (_ILIsNetHood(apidl[0]))
|
else if (_ILIsNetHood(apidl[0]))
|
||||||
{
|
{
|
||||||
// FIXME path!
|
// 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}",
|
L"::{7007ACC7-3202-11D1-AAD2-00805FC1270E}",
|
||||||
NULL, SW_SHOWDEFAULT))
|
NULL, SW_SHOWDEFAULT))
|
||||||
hr = E_FAIL;
|
hr = E_FAIL;
|
||||||
|
|
|
@ -1530,7 +1530,7 @@ static HRESULT delete_files(FILE_OPERATION *op, const FILE_LIST *flFrom)
|
||||||
{
|
{
|
||||||
fileEntry = &flFrom->feFiles[i];
|
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.
|
// This is a windows 2003 server specific value which has been removed.
|
||||||
// Later versions of windows return ERROR_FILE_NOT_FOUND.
|
// Later versions of windows return ERROR_FILE_NOT_FOUND.
|
||||||
|
|
Loading…
Reference in a new issue