[PATCH 0/2] MR335: uxtheme/tests: Add dialog procedure message tests.
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/335
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 64 +++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index aa566f554ff..4301a0f76f2 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1614,6 +1614,37 @@ static const struct message empty_seq[] = {0} }; +static const struct message wm_erasebkgnd_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_CTLCOLORDLG, sent}, + {0} +}; + +static const struct message wm_ctlcolormsgbox_seq[] = +{ + {WM_CTLCOLORMSGBOX, sent}, + {0} +}; + +static const struct message wm_ctlcolorbtn_seq[] = +{ + {WM_CTLCOLORBTN, sent}, + {0} +}; + +static const struct message wm_ctlcolordlg_seq[] = +{ + {WM_CTLCOLORDLG, sent}, + {0} +}; + +static const struct message wm_ctlcolorstatic_seq[] = +{ + {WM_CTLCOLORSTATIC, sent}, + {0} +}; + static HWND dialog_child; static DWORD dialog_init_flag; static BOOL handle_WM_ERASEBKGND; @@ -1673,6 +1704,7 @@ static void test_EnableThemeDialogTexture(void) HBRUSH brush, brush2; HDC child_hdc, hdc; LOGBRUSH log_brush; + char buffer[32]; ULONG_PTR proc; WNDCLASSA cls; HTHEME theme; @@ -1779,6 +1811,20 @@ static void test_EnableThemeDialogTexture(void) {{WC_SCROLLBARA}}, }; + static const struct message_test + { + UINT msg; + const struct message *msg_seq; + } + message_tests[] = + { + {WM_ERASEBKGND, wm_erasebkgnd_seq}, + {WM_CTLCOLORMSGBOX, wm_ctlcolormsgbox_seq}, + {WM_CTLCOLORBTN, wm_ctlcolorbtn_seq}, + {WM_CTLCOLORDLG, wm_ctlcolordlg_seq}, + {WM_CTLCOLORSTATIC, wm_ctlcolorstatic_seq}, + }; + if (!IsThemeActive()) { skip("Theming is inactive.\n"); @@ -2260,6 +2306,24 @@ static void test_EnableThemeDialogTexture(void) DestroyWindow(hwnd2); DestroyWindow(hwnd); + /* Test that application dialog procedures should be called only once for each message */ + dialog = CreateDialogIndirectParamA(NULL, &temp.template, GetDesktopWindow(), + test_EnableThemeDialogTexture_proc, + (LPARAM)¶m); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %ld.\n", GetLastError()); + child = dialog_child; + ok(child != NULL, "Failed to get child control, error %ld.\n", GetLastError()); + child_hdc = GetDC(child); + for (i = 0; i < ARRAY_SIZE(message_tests); ++i) + { + sprintf(buffer, "message %#x\n", message_tests[i].msg); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageW(dialog, message_tests[i].msg, (WPARAM)child_hdc, (LPARAM)child); + ok_sequence(sequences, PARENT_SEQ_INDEX, message_tests[i].msg_seq, buffer, TRUE); + } + ReleaseDC(child, child_hdc); + EndDialog(dialog, 0); + UnregisterClassA(cls.lpszClassName, GetModuleHandleA(NULL)); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/335
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Application dialog procedures are called in UXTHEME_DefDlgProc(), then may be called again in USER_DefDlgProcA/W(). Lotus Approach doesn't expect this and run into infinite recursion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52586 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/dialog.c | 21 +++++++++++++++++---- dlls/uxtheme/tests/system.c | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 13943d753bb..a27382af784 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -131,12 +131,25 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 0); lr = LOWORD(CallWindowProcW(dlgproc, hwnd, msg, wp, lp)); - if (lr) + if (lr || !IsWindow(hwnd)) return GetWindowLongPtrW(hwnd, DWLP_MSGRESULT); brush = get_dialog_background_brush(hwnd, TRUE); if (!brush) - break; + { + /* Copied from DEFDLG_Proc() */ + brush = (HBRUSH)SendMessageW(hwnd, WM_CTLCOLORDLG, wp, (LPARAM)hwnd); + if (!brush) + brush = (HBRUSH)DefWindowProcW(hwnd, WM_CTLCOLORDLG, wp, (LPARAM)hwnd); + if (brush) + { + hdc = (HDC)wp; + GetClientRect(hwnd, &rect); + DPtoLP(hdc, (LPPOINT)&rect, 2); + FillRect(hdc, &rect, brush); + } + return TRUE; + } /* Using FillRect() to draw background could introduce a tiling effect if the destination * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is @@ -157,12 +170,12 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); - if (lr) + if (lr || !IsWindow(hwnd)) return lr; brush = get_dialog_background_brush(hwnd, FALSE); if (!brush) - break; + return DefWindowProcW(hwnd, msg, wp, lp); hdc = (HDC)wp; SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 4301a0f76f2..29fe5ec047d 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2319,7 +2319,7 @@ static void test_EnableThemeDialogTexture(void) sprintf(buffer, "message %#x\n", message_tests[i].msg); flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageW(dialog, message_tests[i].msg, (WPARAM)child_hdc, (LPARAM)child); - ok_sequence(sequences, PARENT_SEQ_INDEX, message_tests[i].msg_seq, buffer, TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, message_tests[i].msg_seq, buffer, FALSE); } ReleaseDC(child, child_hdc); EndDialog(dialog, 0); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/335
participants (2)
-
Zhiyi Zhang -
Zhiyi Zhang (＠zhiyi)