Module: wine Branch: master Commit: 9a7d510ccb2ffc232f56192f89b52ae2fd0ccf18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7d510ccb2ffc232f56192f89...
Author: Detlef Riekenberg wine.dev@web.de Date: Fri Aug 23 19:08:44 2013 +0200
comdlg32/tests: Limit the number of copies to avoid a test hang.
---
dlls/comdlg32/tests/printdlg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 83be893..d0b0443 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -128,7 +128,9 @@ static UINT_PTR CALLBACK print_hook_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM { if (msg == WM_INITDIALOG) { - SetDlgItemInt(hdlg, edt3, 1234, FALSE); + /* some driver popup a dialog and hung the test or silently limit the number of copies, + when trying to set more than 999 copies */ + SetDlgItemInt(hdlg, edt3, 123, FALSE); PostMessage(hdlg, WM_COMMAND, IDOK, FALSE); } return 0; @@ -252,7 +254,7 @@ static void test_PrintDlgA(void) /* Version of Microsoft XPS Document Writer driver shipped before Win7 * reports that it can print multiple copies, but returns 1. */ - ok(pDlg->nCopies == 1234 || broken(pDlg->nCopies == 1), "expected nCopies 1234, got %d\n", pDlg->nCopies); + ok(pDlg->nCopies == 123 || broken(pDlg->nCopies == 1), "expected nCopies 123, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); ok(S1(U1(*dm)).dmCopies == 1, "expected dm->dmCopies 1, got %d\n", S1(U1(*dm)).dmCopies); @@ -269,7 +271,7 @@ static void test_PrintDlgA(void) ok(pDlg->nCopies == 1, "expected nCopies 1, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); - ok(S1(U1(*dm)).dmCopies == 1234, "expected dm->dmCopies 1234, got %d\n", S1(U1(*dm)).dmCopies); + ok(S1(U1(*dm)).dmCopies == 123, "expected dm->dmCopies 123, got %d\n", S1(U1(*dm)).dmCopies); GlobalUnlock(pDlg->hDevMode); GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames);