From 944aba1fcce206af0e1d35187a0df12571dc318b Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 15 Aug 2019 23:10:06 +0900 Subject: [PATCH] [SHELL32] Fix Desktop Properties menu item action (#1833) 1. Right Click the Desktop. 2. Choose "Properties" menu item. 3. "Properties for Display" dialog must be shown. The parameters of ShellExecuteW were wrong. The execution parameters must be separated from the file parameter. CORE-16299 --- dll/win32/shell32/folders/CDesktopFolder.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index 4105932915e..277499fbc41 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -845,8 +845,11 @@ HRESULT WINAPI CDesktopFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IData { if (uMsg == DFM_INVOKECOMMAND && wParam == 0) { - if (32 >= (UINT_PTR)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", + L"shell32.dll,Control_RunDLL desk.cpl", NULL, SW_SHOWNORMAL)) + { return E_FAIL; + } return S_OK; } else if (uMsg == DFM_MERGECONTEXTMENU) -- 2.17.1