From 5f98620c052040f3d853c1a7f11a2ca9e6109d04 Mon Sep 17 00:00:00 2001 From: Austin Lund Date: Wed, 27 Oct 2010 10:32:35 +1000 Subject: [PATCH] comdlg32/tests: Fixed up handling of temporary file in printdlg tests. --- dlls/comdlg32/tests/printdlg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index f021b019299..cad080d75e0 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -320,18 +320,14 @@ static void test_abort_proc(void) if (!PrintDlgA(&pd)) { skip("No default printer available.\n"); - ok(DeleteFileA(filename), "Failed to delete temporary file\n"); - return; + goto end; } GlobalFree(pd.hDevMode); GlobalFree(pd.hDevNames); ok(pd.hDC != NULL, "PrintDlg didn't return a DC.\n"); if (!(print_dc = pd.hDC)) - { - ok(DeleteFileA(filename), "Failed to delete temporary file\n"); - return; - } + goto end; ok(SetAbortProc(print_dc, abort_proc) > 0, "SetAbortProc failed\n"); ok(!abort_proc_called, "AbortProc got called unexpectedly by SetAbortProc.\n"); @@ -371,7 +367,9 @@ static void test_abort_proc(void) abort_proc_called = FALSE; end: - ok(DeleteFileA(filename), "Failed to delete temporary file\n"); + SetLastError(0xdeadbeef); + if(!DeleteFileA(filename)) + trace("Failed to delete temporary file (err = %x)\n", GetLastError()); } /* ########################### */