commit d6d0239f733639873bd136e7283f3bab3368fcb3
author Detlef Riekenberg <wine.dev@web.de> Mon Nov 05 22:48:07 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Tue Nov 06 13:02:41 2007 +0100
tree e8bfa63dba852b9df39962cc3c62742b613a4a30
parent efdc116856426808f126e813152846c60bd703ad

winspool: Error check in add_printer_driver() was to strict.

Reported by Dan Sawyer.

dlls/winspool.drv/info.c

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index e560f6a..c4381d4 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -486,18 +486,21 @@
     di3a.pConfigFile      = driver_nt;
     di3a.pDefaultDataType = default_data_type;
 
-    if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a))
+    if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a) ||
+        (GetLastError() ==  ERROR_PRINTER_DRIVER_ALREADY_INSTALLED ))
     {
         di3a.cVersion     = 0;
         di3a.pEnvironment = env_9x;
         di3a.pDriverPath  = driver_9x;
         di3a.pConfigFile  = driver_9x;
-        if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a))
+        if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a) ||
+            (GetLastError() ==  ERROR_PRINTER_DRIVER_ALREADY_INSTALLED ))
         {
             return TRUE;
         }
     }
-    ERR("Failed adding driver %s: %u\n", debugstr_a(di3a.pDriverPath), GetLastError());
+    ERR("Failed adding driver %s (%s): %u\n", debugstr_a(di3a.pDriverPath),
+        debugstr_a(di3a.pEnvironment), GetLastError());
     return FALSE;
 }