winspool: Return a failure code in ClosePrinter.

Signed-off-by: Detlef Riekenberg <wine.dev@web.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winspool: Return a failure code in ClosePrinter.
b611acc7 · Detlef Riekenberg · Alexandre Julliard · 72dd8baf · b611acc7
Commit b611acc7 authored Nov 01, 2016 by Detlef Riekenberg Committed by Alexandre Julliard Nov 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

info.c dlls/winspool.drv/info.c +9 -7

No files found.
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -3315,7 +3315,6 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter)
 {
    UINT_PTR i = (UINT_PTR)hPrinter;
    opened_printer_t *printer = NULL;
-    BOOL ret = FALSE;

    TRACE("(%p)\n", hPrinter);

@@ -3331,10 +3330,6 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter)

        TRACE("closing %s (doc: %p)\n", debugstr_w(printer->name), printer->doc);

-        if (printer->backend_printer) {
-            backend->fpClosePrinter(printer->backend_printer);
-        }
-
        if(printer->doc)
            EndDocPrinter(hPrinter);

@@ -3348,12 +3343,19 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter)
            HeapFree(GetProcessHeap(), 0, printer->queue);
        }

+        if (printer->backend_printer) {
+            backend->fpClosePrinter(printer->backend_printer);
+        }
+
        free_printer_entry( printer );
        printer_handles[i - 1] = NULL;
-        ret = TRUE;
+        LeaveCriticalSection(&printer_handles_cs);
+        return TRUE;
    }
+
    LeaveCriticalSection(&printer_handles_cs);
-    return ret;
+    SetLastError(ERROR_INVALID_HANDLE);
+    return FALSE;
 }

 /*****************************************************************************