[PATCH 0/1] MR8084: comctl32/taskdialog: Protect WM_COMMAND handler from partially initialized dialog.

[Nikolay Sivov (＠nsivov)]

It's possible to get WM_COMMAND(BN_CLICKED) during initialization in taskdialog_init(),
when window property is not yet set. Exceptions are swallowed on win32u transition.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8084

[PATCH 1/1] comctl32/taskdialog: Protect WM_COMMAND handler from partially initialized dialog.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

It's possible to get WM_COMMAND(BN_CLICKED) during initialization in taskdialog_init(),
when window property is not yet set. Exceptions are swallowed on win32u transition.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/comctl32/taskdialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c
index a2e632af878..2f8f6de5a4e 100644
--- a/dlls/comctl32/taskdialog.c
+++ b/dlls/comctl32/taskdialog.c
@@ -1304,7 +1304,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
             taskdialog_check_default_radio_buttons(dialog_info);
             return FALSE;
         case WM_COMMAND:
-            if (HIWORD(wParam) == BN_CLICKED)
+            if (dialog_info && HIWORD(wParam) == BN_CLICKED)
             {
                 taskdialog_on_button_click(dialog_info, (HWND)lParam, LOWORD(wParam));
                 break;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8084

[PATCH 0/1] MR8084: comctl32/taskdialog: Protect WM_COMMAND handler from partially initialized dialog. - approved

[Zhiyi Zhang (＠zhiyi)]

This merge request was approved by Zhiyi Zhang.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8084