commit f85b02b6adaa3e37b071c431551904edd4572800
author Detlef Riekenberg <wine.dev@web.de> Fri Jan 05 01:09:13 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Sat Jan 06 11:41:04 2007 +0100
tree 55c0f574eaf8eabe5cc6419b51d9911f7158b16e
parent 58d1e2fa4daf2cba3556c469e21249513f6a0226

winspool: Start support for XcvMonitor and XcvPort in OpenPrinter.

dlls/winspool.drv/info.c

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 201d3df..6bd2c92 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -116,6 +116,7 @@
 typedef struct {
     LPWSTR name;
     LPWSTR printername;
+    monitor_t *pm;
     jobqueue_t *queue;
     started_doc_t *doc;
 } opened_printer_t;
@@ -234,6 +235,8 @@
 static const WCHAR devicesW[] = {'d','e','v','i','c','e','s',0};
 static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0};
 static const WCHAR emptyStringW[] = {0};
+static const WCHAR XcvMonitorW[] = {',','X','c','v','M','o','n','i','t','o','r',' ',0};
+static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0};
 
 static const WCHAR May_Delete_Value[] = {'W','i','n','e','M','a','y','D','e','l','e','t','e','M','e',0};
 
@@ -1154,7 +1157,7 @@
  * On failure, NULL is returned
  */
 
-static monitor_t * monitor_load_by_port(LPWSTR portname)
+static monitor_t * monitor_load_by_port(LPCWSTR portname)
 {
     HKEY    hroot;
     HKEY    hport;
@@ -1375,6 +1378,7 @@
     LPCWSTR printername;
     HKEY    hkeyPrinters;
     HKEY    hkeyPrinter;
+    DWORD   len;
 
     servername = get_servername_from_name(name);
     if (servername) {
@@ -1446,23 +1450,53 @@
     }
 
     if (printername) {
-
-        /* Does the Printer exist? */
-        if (RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) {
-            ERR("Can't create Printers key\n");
-            handle = 0;
-            goto end;
+        len = sizeof(XcvMonitorW)/sizeof(WCHAR) - 1;
+        if (strncmpW(printername, XcvMonitorW, len) == 0) {
+            /* OpenPrinter(",XcvMonitor " detected */
+            TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len]));
+            printer->pm = monitor_load(&printername[len], NULL);
+            if (printer->pm == NULL) {
+                SetLastError(ERROR_INVALID_PARAMETER);
+                handle = 0;
+                goto end;
+            }
         }
-        if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) {
-            WARN("Printer not found in Registry: '%s'\n", debugstr_w(printername));
+        else
+        {
+            len = sizeof(XcvPortW)/sizeof(WCHAR) - 1;
+            if (strncmpW( printername, XcvPortW, len) == 0) {
+                /* OpenPrinter(",XcvPort " detected */
+                TRACE(",XcvPort: %s\n", debugstr_w(&printername[len]));
+                printer->pm = monitor_load_by_port(&printername[len]);
+                if (printer->pm == NULL) {
+                    SetLastError(ERROR_INVALID_PARAMETER);
+                    handle = 0;
+                    goto end;
+                }
+            }
+        }
+
+        if (printer->pm) {
+            FIXME("pm->pfnXcvOpenPort not implemented\n");
+        }
+        else
+        {
+            /* Does the Printer exist? */
+            if (RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) {
+                ERR("Can't create Printers key\n");
+                handle = 0;
+                goto end;
+            }
+            if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) {
+                WARN("Printer not found in Registry: '%s'\n", debugstr_w(printername));
+                RegCloseKey(hkeyPrinters);
+                SetLastError(ERROR_INVALID_PRINTER_NAME);
+                handle = 0;
+                goto end;
+            }
+            RegCloseKey(hkeyPrinter);
             RegCloseKey(hkeyPrinters);
-            SetLastError(ERROR_INVALID_PRINTER_NAME);
-            handle = 0;
-            goto end;
         }
-        RegCloseKey(hkeyPrinter);
-        RegCloseKey(hkeyPrinters);
-
     }
     else
     {
@@ -1489,6 +1523,7 @@
     LeaveCriticalSection(&printer_handles_cs);
     if (!handle && printer) {
         /* Something failed: Free all resources */
+        monitor_unload(printer->pm);
         HeapFree(GetProcessHeap(), 0, printer->printername);
         HeapFree(GetProcessHeap(), 0, printer->name);
         if (!queue) HeapFree(GetProcessHeap(), 0, printer->queue);
@@ -1916,8 +1951,6 @@
  *
  * BUGS
  *|  Printer-Object not supported
- *|  XcvMonitor not supported
- *|  XcvPort not supported
  *|  pDefaults is ignored
  *
  */
@@ -2879,6 +2912,7 @@
             }
             HeapFree(GetProcessHeap(), 0, printer->queue);
         }
+        monitor_unload(printer->pm);
         HeapFree(GetProcessHeap(), 0, printer->printername);
         HeapFree(GetProcessHeap(), 0, printer->name);
         HeapFree(GetProcessHeap(), 0, printer);