[PATCH 0/2] MR3653: localspl: Add support for fallback print processor.

[Piotr Caban (＠piotr)]

It restores support for RAW datatype in printers using wineps print processor.

[PATCH 1/2] localspl: Store fallback print processor in AddPrinterDriver.

[Piotr Caban]

From: Piotr Caban

---
 dlls/localspl/provider.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c
index be4b81091eb..a0776b11fe9 100644
--- a/dlls/localspl/provider.c
+++ b/dlls/localspl/provider.c
@@ -2019,6 +2019,12 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo
     else
         RegSetValueExW(hdrv, L"Previous Names", 0, REG_MULTI_SZ, (const BYTE*)L"", sizeof(L""));

+    if (di.pszPrintProcessor)
+        RegSetValueExW(hdrv, L"Print Processor", 0, REG_SZ, (BYTE*)di.pszPrintProcessor,
+                       (wcslen(di.pszPrintProcessor) + 1) * sizeof(WCHAR));
+    else
+        RegSetValueExW(hdrv, L"Print Processor", 0, REG_SZ, (const BYTE*)L"winprint", sizeof(L"winprint"));
+
     if (level > 5) TRACE("level %lu for Driver %s is incomplete\n", level, debugstr_w(di.pName));

RegCloseKey(hdrv);

[PATCH 2/2] localspl: Try fallback print processor if datatype is not supported.

[Piotr Caban]

From: Piotr Caban

---
 dlls/localspl/provider.c | 74 +++++++++++++++++++++++++++++++---------
 1 file changed, 57 insertions(+), 17 deletions(-)

diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c
index a0776b11fe9..f35931b9bef 100644
--- a/dlls/localspl/provider.c
+++ b/dlls/localspl/provider.c
@@ -277,6 +277,7 @@ typedef struct {
     handle_header_t header;
     printer_info_t *info;
     WCHAR *name;
+    WCHAR *print_proc;
     WCHAR *datatype;
     DEVMODEW *devmode;
     job_info_t *doc;
@@ -1833,6 +1834,8 @@ static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename,
                                    PRINTER_DEFAULTSW *def)
 {
     printer_t *printer;
+    HKEY hroot, hkey;
+    LSTATUS status;

printer = calloc(1, sizeof(*printer));
     if (!printer)
@@ -1860,6 +1863,20 @@ static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename,
     if (def && def->pDevMode)
         printer->devmode = dup_devmode(def->pDevMode);

+    hroot = open_driver_reg(env_arch.envname);
+    if (hroot)
+    {
+        status = RegOpenKeyW(hroot, name, &hkey);
+        RegCloseKey(hroot);
+        if (status == ERROR_SUCCESS)
+        {
+            printer->print_proc = reg_query_value(hkey, L"Print Processor");
+            RegCloseKey(hkey);
+        }
+    }
+    if (!printer->print_proc)
+        printer->print_proc = wcsdup(L"winprint");
+
     return (HANDLE)printer;
 }

@@ -3411,7 +3428,7 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in
 {
     printer_t *printer = (printer_t *)hprinter;
     DOC_INFO_1W *info = (DOC_INFO_1W *)doc_info;
-    BOOL datatype_valid;
+    BOOL datatype_valid = FALSE;
     WCHAR *datatype;
     printproc_t *pp;

@@ -3470,13 +3487,23 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in
     if (!pp)
     {
         WARN("failed to load %s print processor\n", debugstr_w(printer->info->print_proc));
-        pp = print_proc_load(L"winprint");
     }
-    if (!pp)
-        return 0;
+    else
+    {
+        datatype_valid = print_proc_check_datatype(pp, datatype);
+        print_proc_unload(pp);
+    }
+
+    if (!datatype_valid)
+    {
+        pp = print_proc_load(printer->print_proc);
+        if (!pp)
+            return 0;
+
+        datatype_valid = print_proc_check_datatype(pp, datatype);
+        print_proc_unload(pp);
+    }

-    datatype_valid = print_proc_check_datatype(pp, datatype);
-    print_proc_unload(pp);
     if (!datatype_valid)
     {
         TRACE("%s datatype not supported by %s\n", debugstr_w(datatype),
@@ -3728,11 +3755,11 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id)
 {
     printer_t *printer = (printer_t *)hprinter;
     WCHAR output[1024], name[1024], *datatype;
+    BOOL datatype_valid = FALSE, ret = TRUE;
     PRINTPROCESSOROPENDATA pp_data;
     const WCHAR *port_name, *port;
     job_info_t *job;
     printproc_t *pp;
-    BOOL ret = TRUE;
     HANDLE hpp;
     HKEY hkey;

@@ -3775,15 +3802,6 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id)
         RegCloseKey(hkey);
     }

-    pp = print_proc_load(printer->info->print_proc);
-    if (!pp)
-    {
-        WARN("failed to load %s print processor\n", debugstr_w(printer->info->print_proc));
-        pp = print_proc_load(L"winprint");
-    }
-    if (!pp)
-        return FALSE;
-
     if (job->datatype)
         datatype = job->datatype;
     else if (printer->datatype)
@@ -3791,7 +3809,28 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id)
     else
         datatype = printer->info->datatype;

-    if (!print_proc_check_datatype(pp, datatype))
+    pp = print_proc_load(printer->info->print_proc);
+    if (!pp)
+    {
+        WARN("failed to load %s print processor\n", debugstr_w(printer->info->print_proc));
+    }
+    else
+    {
+        datatype_valid = print_proc_check_datatype(pp, datatype);
+        if (!datatype_valid)
+            print_proc_unload(pp);
+    }
+
+    if (!datatype_valid)
+    {
+        pp = print_proc_load(printer->print_proc);
+        if (!pp)
+            return FALSE;
+
+        datatype_valid = print_proc_check_datatype(pp, datatype);
+    }
+
+    if (!datatype_valid)
     {
         WARN("%s datatype not supported by %s\n", debugstr_w(datatype),
                 debugstr_w(printer->info->print_proc));
@@ -3981,6 +4020,7 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter)

release_printer_info(printer->info);
         free(printer->name);
+        free(printer->print_proc);
         free(printer->datatype);
         free(printer->devmode);
         free(printer);

[PATCH 0/2] MR3653: localspl: Add support for fallback print processor. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.