Changeset 9990 for trunk/src

Timestamp:

Apr 8, 2003, 2:43:29 PM (22 years ago)

Author:

sandervl

Message:

KSO: Corrected default printer init. It was crashing with big printer setups and not handling multiple drivers per device correctly

File:

• trunk/src/comdlg32/initcomdlg32.cpp (modified) (3 diffs)

trunk/src/comdlg32/initcomdlg32.cpp

@@ -1 @@
-/* $Id: initcomdlg32.cpp,v 1.4 2002-10-29 15:37:07 sandervl Exp $ */
+/* $Id: initcomdlg32.cpp,v 1.5 2003-04-08 12:43:29 sandervl Exp $ */
 /*
  * DLL entry point
@@ -54 +54 @@
    switch (fdwReason)
    {
-   case DLL_PROCESS_ATTACH:
-   {
-       //Write default printer name to win.ini
-       char achDefPrnName[256];
-       if(PrfQueryProfileString(HINI_PROFILE, "PM_SPOOLER", "PRINTER", "", achDefPrnName,
-                                 sizeof(achDefPrnName)) > 1) 
-       {
-            int len = strlen(achDefPrnName);
-            if(achDefPrnName[len-1] == ';') {
-                achDefPrnName[len-1] = 0;
+    case DLL_PROCESS_ATTACH:
+    {
+        /*
+         * Find default printer and write name to win.ini
+         * Format: queuename,driver,portname
+         */
+        char szWinDefPrn[256];
+        szWinDefPrn[0] = '\0';
+
+        /*
+         * OS/2 stores the default printer as a combination of printerdevice and queue.
+         *
+         *   Printer Device is related to one port. It may have multiple printer
+         *       drivers because the port may serve multiple queues with different drivers.
+         *   The Ports are related to multiple queues.
+         *
+         * So we take the default default printer+queue combination and finds the
+         */
+        char szDefPrnDev[20];
+        char szDefPrnQue[20];
+        if (PrfQueryProfileString(HINI_PROFILE, "PM_SPOOLER", "PRINTER", "",
+                                  szDefPrnDev, sizeof(szDefPrnDev)) > 1
+            &&  PrfQueryProfileString(HINI_PROFILE, "PM_SPOOLER", "QUEUE", "",
+                                      szDefPrnQue, sizeof(szDefPrnQue)) > 1
+            &&  szDefPrnDev[0]
+            &&  szDefPrnQue[0]
+           )
+        {
+            char *psz;
+            /* remove everything beyond the first ';' */
+            if ((psz = strchr(szDefPrnDev, ';')) != NULL)
+                *psz = '\0';
+            if ((psz = strchr(szDefPrnQue, ';')) != NULL)
+                *psz = '\0';
+
+            /*
+             * Now we must lookup the port name from the device settings.
+             *  This is a string of this form:
+             *      <port>;<driver1>[,<driver2>;<queue1>[,<queue2>];?;?;
+             */
+            ULONG   cb = 0;
+            if (PrfQueryProfileSize(HINI_SYSTEMPROFILE, "PM_SPOOLER_PRINTER", szDefPrnDev, &cb)
+                &&  cb > 0)
+            {
+                char *pszBufD = (char*)malloc(cb + 1);
+                if (pszBufD
+                    &&  PrfQueryProfileString(HINI_SYSTEMPROFILE, "PM_SPOOLER_PRINTER", szDefPrnDev,
+                                              NULL, pszBufD, cb + 1)
+                    > 1
+                   )
+                {
+                    /*
+                     * Now get the Default printer driver for the queue.
+                     *  This is stored as a ';' separated list of drivers, the first one is the default.
+                     */
+                    if (PrfQueryProfileSize(HINI_SYSTEMPROFILE, "PM_SPOOLER_QUEUE_DD", szDefPrnQue, &cb)
+                        &&  cb > 0)
+                    {
+                        char *pszBufQ = (char*)malloc(cb + 1);
+                        if (pszBufQ
+                            &&  PrfQueryProfileString(HINI_SYSTEMPROFILE, "PM_SPOOLER_QUEUE_DD", szDefPrnQue,
+                                                      NULL, pszBufQ, cb + 1)
+                            > 1
+                           )
+                        {
+                            /*
+                             * We got everything now. just find the parts we need.
+                             *  First printer driver from QUEUE_DD
+                             *  Port name of the device.
+                             */
+                            if ((psz = strchr(pszBufQ, ';')) != NULL)
+                                *psz = '\0';
+                            if ((psz = strchr(pszBufQ, ',')) != NULL) //paranoia! in case comman separated list of some kind.
+                                *psz = '\0';
+                            if ((psz = strchr(pszBufD, ';')) != NULL)
+                                *psz = '\0';
+                            if ((psz = strchr(pszBufD, ',')) != NULL) //paranoia in case comman separated list of some kind.
+                                *psz = '\0';
+
+                            /*
+                             * Now make default printer string for the win.ini.
+                             */
+                            strcpy(szWinDefPrn, szDefPrnQue);
+                            strcat(strcat(szWinDefPrn, ","), pszBufQ);
+                            strcat(strcat(szWinDefPrn, ","), pszBufD);
+                            dprintf(("LibMainComdlg32: Successfully found default printer.'%s'", szWinDefPrn));
+                            free(pszBufQ);
+                        }
+                    }
+                    else
+                    {
+                        /* OS/2 the device may exist though the default queue is destroyed.
+                         * it may still exist even if there are no queues on the system at all!
+                         */
+                        dprintf(("LibMainComdlg32: no queue driver entry for '%s'.", szDefPrnQue));
+                    }
+
+                    free(pszBufD);
+                }
             }
-            strcat(achDefPrnName, ",");
-            WriteProfileStringA("windows", "device", achDefPrnName);
-       }
-       return COMDLG32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
-   }
+            else
+            {
+                /* OS/2 doesn't remove the default settings if the default queue/printer is deleted. */
+                dprintf(("LibMainComdlg32: can't find device settings for '%s'.", szDefPrnDev));
+            }
+        }
+        else
+        {
+            dprintf(("LibMainComdlg32: no default printer? szDefPrnDev='%s' szDefPrnQue='%s'.", szDefPrnDev, szDefPrnQue));
+        }
+
+        //Now get real printer name the one that will be used in DC calls
+        WriteProfileStringA("windows", "device", szWinDefPrn);
+
+        return COMDLG32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
+    }
 
    case DLL_THREAD_ATTACH:
@@ -105 +205 @@
          if(dllHandle == 0)
              return 0UL;
- 
+
          break;
       case 1 :