[PATCH 0/1] MR8268: comdlg32/tests: Add broken to PrintDlg{A,W} tests.
Followup to 2ca6741d57 and cd96c69876. [Test pattern page](https://test.winehq.org/data/patterns.html#comdlg32:printdlg) [Testbot run with this patch](https://testbot.winehq.org/JobDetails.pl?Key=158591) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8268
From: Bernhard Übelacker <bernhardu(a)mailbox.org> Followup to 2ca6741d57 and cd96c69876. --- dlls/comdlg32/tests/printdlg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index e30971aba75..3c7a40832d8 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -135,7 +135,8 @@ static UINT_PTR CALLBACK printer_properties_hook_procA(HWND hdlg, UINT msg, WPAR dlg = (PRINTDLGA*)lp; dm = GlobalLock(dlg->hDevMode); ok(dm->dmDuplex != 123, "dmDuplex should not equal 123 in the hook.\n"); - ok(dm->dmPaperSize != 321, "dmPaperSize should not equal 321 in the hook.\n"); + ok(dm->dmPaperSize != 321 || broken(dm->dmPaperSize == 321) /* Win10-1507 and before */, + "dmPaperSize should not equal 321 in the hook.\n"); GlobalUnlock(dlg->hDevMode); PostMessageW(hdlg, WM_COMMAND, psh2, lp); } @@ -329,7 +330,8 @@ static UINT_PTR CALLBACK printer_properties_hook_procW(HWND hdlg, UINT msg, WPAR dlg = (PRINTDLGW*)lp; dm = GlobalLock(dlg->hDevMode); ok(dm->dmDuplex != 123, "dmDuplex should not equal 123 in the hook.\n"); - ok(dm->dmPaperSize != 321, "dmPaperSize should not equal 321 in the hook.\n"); + ok(dm->dmPaperSize != 321 || broken(dm->dmPaperSize == 321) /* Win10-1507 and before */, + "dmPaperSize should not equal 321 in the hook.\n"); GlobalUnlock(dlg->hDevMode); PostMessageW(hdlg, WM_COMMAND, psh2, lp); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8268
Superseeded by !8269. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8268#note_106206
This merge request was closed by Bernhard Übelacker. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8268
participants (1)
-
Bernhard Übelacker