Huw Davies : winspool.drv: We don' t need to check for the PPD Files key before using /etc/printcap.

[Alexandre Julliard]

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

Author: Huw Davies 
Date:   Tue Jan 30 21:27:11 2007 +0000

winspool.drv: We don't need to check for the PPD Files key before using /etc/printcap.

---

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

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 2b96f45..73bd574 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -1651,15 +1651,8 @@ void WINSPOOL_LoadSystemPrinters(void)
     done = CUPS_LoadPrinters();
 #endif

-    if(!done) { /* If we have any CUPS based printers, skip looking for printcap printers */
-        /* Check for [ppd] section in config file before parsing /etc/printcap */
-        /* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */
-        if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\Wine\Printing\PPD Files",
-                        &hkey) == ERROR_SUCCESS) {
-            RegCloseKey(hkey);
-            PRINTCAP_LoadPrinters();
-        }
-    }
+    if(!done) /* If we have any CUPS based printers, skip looking for printcap printers */
+        PRINTCAP_LoadPrinters();

/* Now enumerate the list again and delete any printers that a still tagged */
     EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num);