Pedro Araujo Chaves Jr : winspool.drv: Fallback to the first found printer as default printer.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jul 5 13:31:26 CDT 2007


Module: wine
Branch: master
Commit: ffbd30dd88157299807f4b8c3f3363768b75ecae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ffbd30dd88157299807f4b8c3f3363768b75ecae

Author: Pedro Araujo Chaves Jr <inckie at gmail.com>
Date:   Wed Jul  4 20:22:15 2007 -0300

winspool.drv: Fallback to the first found printer as default printer.

---

 dlls/winspool.drv/info.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 19b70be..bc0f400 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -416,7 +416,7 @@ static void *cupshandle;
 static BOOL CUPS_LoadPrinters(void)
 {
     int	                  i, nrofdests;
-    BOOL                  hadprinter = FALSE;
+    BOOL                  hadprinter = FALSE, haddefault = FALSE;
     cups_dest_t          *dests;
     PRINTER_INFO_2A       pinfo2a;
     char   *port,*devline;
@@ -494,9 +494,13 @@ static BOOL CUPS_LoadPrinters(void)
 	HeapFree(GetProcessHeap(),0,port);
 
         hadprinter = TRUE;
-        if (dests[i].is_default)
+        if (dests[i].is_default) {
             WINSPOOL_SetDefaultPrinter(dests[i].name, dests[i].name, TRUE);
+            haddefault = TRUE;
+        }
     }
+    if (hadprinter & !haddefault)
+        WINSPOOL_SetDefaultPrinter(dests[0].name, dests[0].name, TRUE);
     RegCloseKey(hkeyPrinters);
     return hadprinter;
 }




More information about the wine-cvs mailing list