Changeset 10598 for trunk/src

Timestamp:

May 6, 2004, 2:40:21 PM (21 years ago)

Author:

sandervl

Message:

Update the hDevNames member of the printer dialog structure whenever the user chooses another printer

File:

• trunk/src/comdlg32/printdlg.c (modified) (1 diff)

trunk/src/comdlg32/printdlg.c

@@ -1084 +1084 @@
         GlobalUnlock(lppd->hDevMode);
 
+#ifdef __WIN32OS2__
+    //Yes, we need to update the device names in the printer dialog structure
+    //Some applications actually rely on that to change when the user chooses
+    //another printer
+    {
+            DEVMODEA *lpdm = PrintStructures->lpDevMode, *lpdmReturn;
+            PRINTER_INFO_2A *pi = PrintStructures->lpPrinterInfo;
+            DRIVER_INFO_3A *di = PrintStructures->lpDriverInfo;
+
+            if (lppd->hDevNames != 0) {
+                WORD locks;
+                if((locks = (GlobalFlags(lppd->hDevNames) & GMEM_LOCKCOUNT))) {
+                    WARN("hDevNames has %d locks on it. Unlocking it now\n", locks);
+                    while(locks--)
+                        GlobalUnlock(lppd->hDevNames);
+                }
+            }
+            PRINTDLG_CreateDevNames(&(lppd->hDevNames),
+                    di->pDriverPath,
+                    pi->pPrinterName,
+                    pi->pPortName
+            );
+    }
+#endif
+
     lpdm = PrintStructures->lpDevMode;  /* use this as a shortcut */