[SHELL32] Fix starting disk cleanup from drive properties

learn-more · learn-more · commit 70422cda517e · 2025-03-27T10:55:41.000+01:00
CORE-12314
diff --git a/dll/win32/shell32/dialogs/drvdefext.cpp b/dll/win32/shell32/dialogs/drvdefext.cpp
@@ -553,8 +553,13 @@ CDrvDefExt::GeneralPageProc(
                     WCHAR wszCmd[MAX_PATH];
 
                     StringCbPrintfW(wszCmd, sizeof(wszCmd), wszBuf, pDrvDefExt->m_wszDrive[0]);
+                    WCHAR* wszArgs = PathGetArgsW(wszCmd);
+                    if (wszArgs && *wszArgs && wszArgs != wszCmd)
+                        wszArgs[-1] = UNICODE_NULL;
+                    else
+                        wszArgs = NULL;
 
-                    if (ShellExecuteW(hwndDlg, NULL, wszCmd, NULL, NULL, SW_SHOW) <= (HINSTANCE)32)
+                    if (ShellExecuteW(hwndDlg, NULL, wszCmd, wszArgs, NULL, SW_SHOW) <= (HINSTANCE)32)
                         ERR("Failed to create cleanup process %ls\n", wszCmd);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -553,8 +553,13 @@ CDrvDefExt::GeneralPageProc(`
`553`	`553`	`WCHAR wszCmd[MAX_PATH];`
`554`	`554`
`555`	`555`	`StringCbPrintfW(wszCmd, sizeof(wszCmd), wszBuf, pDrvDefExt->m_wszDrive[0]);`
	`556`	`+ WCHAR* wszArgs = PathGetArgsW(wszCmd);`
	`557`	`+ if (wszArgs && *wszArgs && wszArgs != wszCmd)`
	`558`	`+ wszArgs[-1] = UNICODE_NULL;`
	`559`	`+ else`
	`560`	`+ wszArgs = NULL;`
`556`	`561`
`557`		`- if (ShellExecuteW(hwndDlg, NULL, wszCmd, NULL, NULL, SW_SHOW) <= (HINSTANCE)32)`
	`562`	`+ if (ShellExecuteW(hwndDlg, NULL, wszCmd, wszArgs, NULL, SW_SHOW) <= (HINSTANCE)32)`
`558`	`563`	`ERR("Failed to create cleanup process %ls\n", wszCmd);`
`559`	`564`	`}`
`560`	`565`	`}`