diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 0ab75bec..a7dd7cc5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "30c33c2f982fc8c0ef6d97683c6581ebddd46814" + echo "4febd9d880abe22e77a3d8283de245a691cf2b7f" } # Show version information diff --git a/patches/winspool.drv-ClosePrinter/0001-winspool.drv-Add-more-tracing-to-ClosePrinter.patch b/patches/winspool.drv-ClosePrinter/0001-winspool.drv-Add-more-tracing-to-ClosePrinter.patch index 932c6810..86990d31 100644 --- a/patches/winspool.drv-ClosePrinter/0001-winspool.drv-Add-more-tracing-to-ClosePrinter.patch +++ b/patches/winspool.drv-ClosePrinter/0001-winspool.drv-Add-more-tracing-to-ClosePrinter.patch @@ -1,4 +1,4 @@ -From 1791ceee2e4f4c677ef65aef8dd79c85fb06d947 Mon Sep 17 00:00:00 2001 +From 4aa49cd10f1cd190f088e009898cf70d19057b00 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 30 Jul 2022 18:08:00 +1000 Subject: [PATCH] winspool.drv: Add more tracing to ClosePrinter @@ -8,19 +8,14 @@ Subject: [PATCH] winspool.drv: Add more tracing to ClosePrinter 1 file changed, 3 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c -index 5a74cb29bd9..fe6782daf40 100644 +index 656477553ba..5a59916b0e2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c -@@ -2925,15 +2925,18 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) - LIST_FOR_EACH_SAFE(cursor, cursor2, &printer->queue->jobs) - { - job_t *job = LIST_ENTRY(cursor, job_t, entry); -+ TRACE("Scheduling Job: %p\n", job); - ScheduleJob(hPrinter, job->job_id); - } - free(printer->queue); - } - +@@ -2751,10 +2751,13 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) + if(printer) + { + TRACE("closing %s\n", debugstr_w(printer->name)); ++ if (printer->backend_printer) { + TRACE("Closing Bankend printer\n"); backend->fpClosePrinter(printer->backend_printer); @@ -31,5 +26,5 @@ index 5a74cb29bd9..fe6782daf40 100644 printer_handles[i - 1] = NULL; LeaveCriticalSection(&printer_handles_cs); -- -2.35.1 +2.38.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index 2530c7d4..75858c18 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -30c33c2f982fc8c0ef6d97683c6581ebddd46814 +4febd9d880abe22e77a3d8283de245a691cf2b7f