Detlef Riekenberg : comdlg32/tests: Handle result from broken drivers.

Alexandre Julliard julliard at winehq.org
Tue Aug 27 14:47:56 CDT 2013


Module: wine
Branch: master
Commit: 8e56b8332ed180515f03d6fead300a4692e5d375
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8e56b8332ed180515f03d6fead300a4692e5d375

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Mon Aug 26 21:29:30 2013 +0200

comdlg32/tests: Handle result from broken drivers.

---

 dlls/comdlg32/tests/printdlg.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c
index d0b0443..7212dc4 100644
--- a/dlls/comdlg32/tests/printdlg.c
+++ b/dlls/comdlg32/tests/printdlg.c
@@ -257,7 +257,9 @@ static void test_PrintDlgA(void)
         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);
+        /* some broken drivers use always PD_USEDEVMODECOPIES */
+        ok((S1(U1(*dm)).dmCopies == 1) || broken(S1(U1(*dm)).dmCopies == 123),
+            "expected dm->dmCopies 1, got %d\n", S1(U1(*dm)).dmCopies);
         GlobalUnlock(pDlg->hDevMode);
         GlobalFree(pDlg->hDevMode);
         GlobalFree(pDlg->hDevNames);




More information about the wine-cvs mailing list