Huw Davies : comdlg32/tests: Skip remaining tests if StartDoc fails.
Alexandre Julliard
julliard at winehq.org
Wed Feb 18 10:15:40 CST 2009
Module: wine
Branch: master
Commit: ecffb8038a1cfd23a070b0f2044176ee9f7cbe7e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecffb8038a1cfd23a070b0f2044176ee9f7cbe7e
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Feb 18 12:42:50 2009 +0000
comdlg32/tests: Skip remaining tests if StartDoc fails.
---
dlls/comdlg32/tests/printdlg.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c
index cb86d62..6f70621 100644
--- a/dlls/comdlg32/tests/printdlg.c
+++ b/dlls/comdlg32/tests/printdlg.c
@@ -298,6 +298,7 @@ static void test_abort_proc(void)
DOCINFOA doc_info = {0};
PRINTDLGA pd = {0};
char filename[MAX_PATH];
+ int job_id;
if (!GetTempFileNameA(".", "prn", 0, filename))
{
@@ -333,7 +334,14 @@ static void test_abort_proc(void)
doc_info.lpszDocName = "Some document";
doc_info.lpszOutput = filename;
- ok(StartDocA(print_dc, &doc_info) > 0, "StartDocA failed\n");
+ job_id = StartDocA(print_dc, &doc_info);
+ ok(job_id > 0, "StartDocA failed ret %d gle %d\n", job_id, GetLastError());
+ if(job_id <= 0)
+ {
+ skip("StartDoc failed\n");
+ goto end;
+ }
+
ok(abort_proc_called, "AbortProc didn't get called by StartDoc.\n");
abort_proc_called = FALSE;
@@ -357,6 +365,7 @@ static void test_abort_proc(void)
ok(!abort_proc_called, "AbortProc got called unexpectedly by DeleteDC.\n");
abort_proc_called = FALSE;
+end:
ok(DeleteFileA(filename), "Failed to delete temporary file\n");
}
More information about the wine-cvs
mailing list