Commit 5328782d authored by Ian Pilcher's avatar Ian Pilcher Committed by Alexandre Julliard

Disable /etc/printcap parsing if no PPD file specified.

parent c6eeda46
......@@ -275,6 +275,7 @@ PRINTCAP_LoadPrinters(void) {
void
WINSPOOL_LoadSystemPrinters() {
HKEY hkPPD;
DRIVER_INFO_3A di3a;
di3a.cVersion = 0x400;
di3a.pName = "PS Driver";
......@@ -296,7 +297,15 @@ WINSPOOL_LoadSystemPrinters() {
if (CUPS_LoadPrinters())
return;
#endif
PRINTCAP_LoadPrinters();
/* Check for [ppd] section in config file before parsing /etc/printcap */
if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\ppd",
&hkPPD) == ERROR_SUCCESS)
{
RegCloseKey(hkPPD);
PRINTCAP_LoadPrinters();
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment