Huw Davies : winspool: Update the default settings when deleting the default printer.

Alexandre Julliard julliard at winehq.org
Fri Apr 20 12:49:28 CDT 2012


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

Author: Huw Davies <huw at codeweavers.com>
Date:   Fri Apr 20 11:19:28 2012 +0100

winspool: Update the default settings when deleting the default printer.

---

 dlls/winspool.drv/info.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index a2e3f8b..30dcd86 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -2812,6 +2812,8 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter)
 {
     LPCWSTR lpNameW = get_opened_printer_name(hPrinter);
     HKEY hkeyPrinters, hkey;
+    WCHAR def[MAX_PATH];
+    DWORD size = sizeof( def ) / sizeof( def[0] );
 
     if(!lpNameW) {
         SetLastError(ERROR_INVALID_HANDLE);
@@ -2833,6 +2835,18 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter)
         RegDeleteValueW(hkey, lpNameW);
         RegCloseKey(hkey);
     }
+
+    if (GetDefaultPrinterW( def, &size ) && !strcmpW( def, lpNameW ))
+    {
+        WriteProfileStringW( windowsW, deviceW, NULL );
+        if (!RegCreateKeyW( HKEY_CURRENT_USER, user_default_reg_key, &hkey ))
+        {
+            RegDeleteValueW( hkey, deviceW );
+            RegCloseKey( hkey );
+        }
+        SetDefaultPrinterW( NULL );
+    }
+
     return TRUE;
 }
 




More information about the wine-cvs mailing list