Alexandre Julliard : comdlg32/tests: Remove some AbortProc checks that fail on various Windows versions.

Alexandre Julliard julliard at winehq.org
Fri Feb 5 08:42:31 CST 2010


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Feb  5 11:29:27 2010 +0100

comdlg32/tests: Remove some AbortProc checks that fail on various Windows versions.

---

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

diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c
index 61eefa6..f021b01 100644
--- a/dlls/comdlg32/tests/printdlg.c
+++ b/dlls/comdlg32/tests/printdlg.c
@@ -353,25 +353,19 @@ static void test_abort_proc(void)
         goto end;
     }
 
-    ok(abort_proc_called, "AbortProc didn't get called by StartDoc.\n");
-    abort_proc_called = FALSE;
+    /* StartDoc may or may not call abort proc */
 
+    abort_proc_called = FALSE;
     ok(StartPage(print_dc) > 0, "StartPage failed\n");
     ok(!abort_proc_called, "AbortProc got called unexpectedly by StartPage.\n");
     abort_proc_called = FALSE;
 
+    /* following functions sometimes call abort proc too */
     ok(FillRect(print_dc, &rect, (HBRUSH)(COLOR_BACKGROUND + 1)), "FillRect failed\n");
-    ok(!abort_proc_called, "AbortProc got called unexpectedly by StretchBlt.\n");
-    abort_proc_called = FALSE;
-
     ok(EndPage(print_dc) > 0, "EndPage failed\n");
-    ok(!abort_proc_called, "AbortProc got called unexpectedly by EndPage.\n");
-    abort_proc_called = FALSE;
-
     ok(EndDoc(print_dc) > 0, "EndDoc failed\n");
-    ok(!abort_proc_called, "AbortProc got called unexpectedly by EndDoc.\n");
-    abort_proc_called = FALSE;
 
+    abort_proc_called = FALSE;
     ok(DeleteDC(print_dc), "DeleteDC failed\n");
     ok(!abort_proc_called, "AbortProc got called unexpectedly by DeleteDC.\n");
     abort_proc_called = FALSE;




More information about the wine-cvs mailing list