From 755aa24a95b6cf75f022534c4b6a349dac20aca8 Mon Sep 17 00:00:00 2001 From: "Carl J. Bialorucki" Date: Mon, 24 Feb 2025 22:58:53 -0700 Subject: [PATCH] [0.4.15][SHELL32] Fix Control_RunDLL single comma syntax out of range dialog box numbers (#7595) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes CORE-19580 and CORE-8981. If an out of range dialog box number was given in a single comma syntax for Control_RunDLL(), it should be set to 0 to launch the default dialog box instead of failing. Addendum to dcf9eb0. This is a cherry pick of commit: b114e3a05104dfefede16a9371fea64cbac7ac68 [SHELL32] Fix Control_RunDLL single comma syntax out of range dialog box numbers (#7595) Co-Authored-By: Marcin Jabłoński <24442148+TheNNX@users.noreply.github.com> --- dll/win32/shell32/wine/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index dbbca6a2e4a..b07cda047f4 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -1104,7 +1104,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) } } - if (sp >= applet->count && wszDialogBoxName[0] == L'\0') + if (sp >= applet->count && (wszDialogBoxName[0] == L'\0' || wszDialogBoxName[0] == L'@')) { sp = 0; }