Changeset 9570 for trunk/src

Timestamp:

Dec 30, 2002, 8:04:54 PM (23 years ago)

Author:

sandervl

Message:

AH: Added string check to PRINTDLG_SetUpPrinterListComboA

File:

• trunk/src/comdlg32/printdlg.c (modified) (13 diffs)

trunk/src/comdlg32/printdlg.c

@@ -134 +134 @@
 #define MAX_COPIES 9999
 
+
+#ifdef __WIN32OS2__
+/***********************************************************************
+ *   PrnNameToQueue
+ *
+ * Odin helper function that gets Queue Name from Printer Name
+ *
+ * Returns TRUE on success else FALSE
+ */
+
+BOOL PrnNameToQueue(char* PrnName, char* QueueName) 
+{
+ BOOL rc = FALSE;
+
+  if (PrnName && QueueName)
+  {
+    LPPRINTER_INFO_2A pi;
+    DWORD needed, num;
+    INT i;
+
+    EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &needed, &num);
+    pi = HeapAlloc(GetProcessHeap(), 0, needed);
+    EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, (LPBYTE)pi, needed, &needed,
+                  &num);
+
+    for(i = 0; i < num; i++)
+       if (!strcmp(pi[i].pComment, PrnName)) 
+       {
+         strcpy(QueueName, pi[i].pPrinterName);
+         rc = TRUE; 
+       }
+    HeapFree(GetProcessHeap(), 0, pi);
+  }
+  return rc;
+}
+#endif
+
 /***********************************************************************
  *    PRINTDLG_GetDefaultPrinterName
@@ -218 +255 @@
     INT i;
     LPPRINTER_INFO_2A pi;
+#ifdef __WIN32OS2__
+    char substName[260];
+#endif
+
     EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &needed, &num);
     pi = HeapAlloc(GetProcessHeap(), 0, needed);
@@ -223 +264 @@
                   &num);
 
+#ifndef __WIN32OS2__
     for(i = 0; i < num; i++) {
         SendDlgItemMessageA(hDlg, id, CB_ADDSTRING, 0,
@@ -228 +270 @@
     }
     HeapFree(GetProcessHeap(), 0, pi);
+#else
+    substName[0] = 0;
+
+    for(i = 0; i < num; i++)
+    {
+        SendDlgItemMessageA(hDlg, id, CB_ADDSTRING, 0,
+                            (LPARAM)pi[i].pComment );
+        if (!name || !strcmp(pi[i].pPrinterName, name))
+           strcpy(substName, pi[i].pComment);
+    }
+#endif
+
     if(!name ||
        (i = SendDlgItemMessageA(hDlg, id, CB_FINDSTRINGEXACT, -1,
+#ifndef __WIN32OS2__
                                 (LPARAM)name)) == CB_ERR) {
-
+#else
+                                (LPARAM)substName)) == CB_ERR) {
+#endif
         char buf[260];
         FIXME("Can't find '%s' in printer list so trying to find default\n",
@@ -237 +294 @@
         if(!PRINTDLG_GetDefaultPrinterNameA(buf, sizeof(buf)))
             return num;
+#ifndef __WIN32OS2__
         i = SendDlgItemMessageA(hDlg, id, CB_FINDSTRINGEXACT, -1, (LPARAM)buf);
+#else
+        for(i = 0; i < num; i++)
+           if (!strcmp(pi[i].pComment, buf))
+              break;
+        HeapFree(GetProcessHeap(), 0, pi);
+#endif
+
         if(i == CB_ERR)
             FIXME("Can't find default printer in printer list\n");
@@ -1035 +1100 @@
         return FALSE;
     }
+#ifndef __WIN32OS2__
     ClosePrinter(hprn);
+#endif
 
     PRINTDLG_UpdatePrinterInfoTextsA(hDlg, PrintStructures->lpPrinterInfo);
@@ -1044 +1111 @@
     }
 
+#ifdef __WIN32OS2__
+    dmSize = DocumentPropertiesA(0, hprn, name, NULL, NULL, 0);
+#else
     dmSize = DocumentPropertiesA(0, 0, name, NULL, NULL, 0);
+#endif
     if(dmSize == -1) {
         ERR("DocumentProperties fails on %s\n", debugstr_a(name));
@@ -1050 +1121 @@
     }
     PrintStructures->lpDevMode = HeapAlloc(GetProcessHeap(), 0, dmSize);
+
+#ifdef __WIN32OS2__
+    dmSize = DocumentPropertiesA(0, hprn, name, PrintStructures->lpDevMode, NULL,
+#else
     dmSize = DocumentPropertiesA(0, 0, name, PrintStructures->lpDevMode, NULL,
+#endif
                                  DM_OUT_BUFFER);
+
     if(lppd->hDevMode && (lpdm = GlobalLock(lppd->hDevMode)) &&
                           !strcmp(lpdm->dmDeviceName,
                                   PrintStructures->lpDevMode->dmDeviceName)) {
       /* Supplied devicemode matches current printer so try to use it */
+#ifdef __WIN32OS2__
+        DocumentPropertiesA(0, hprn, name, PrintStructures->lpDevMode, lpdm,
+#else
         DocumentPropertiesA(0, 0, name, PrintStructures->lpDevMode, lpdm,
+#endif
                             DM_OUT_BUFFER | DM_IN_BUFFER);
     }
+#ifdef __WIN32OS2__
+    ClosePrinter(hprn);
+#endif
     if(lpdm)
         GlobalUnlock(lppd->hDevMode);
@@ -1423 +1507 @@
         name = HeapAlloc(GetProcessHeap(),0,256);
         if (GetDlgItemTextA(hDlg, comboID, name, 255))
+#ifdef __WIN32OS2__
+            PrnNameToQueue(name, name);
+#endif
             PRINTDLG_ChangePrinterA(hDlg, name, PrintStructures);
         HeapFree(GetProcessHeap(),0,name);
@@ -1429 +1516 @@
         char name[200];
         BOOL ret = PRINTDLG_GetDefaultPrinterNameA(name, sizeof(name));
-
+#ifdef __WIN32OS2__
+        PrnNameToQueue(name, name);
+#endif
         if (ret)
             PRINTDLG_ChangePrinterA(hDlg, name, PrintStructures);
@@ -1745 +1834 @@
 
          GetDlgItemTextA(hDlg, PrinterComboID, PrinterName, 255);
+#ifdef __WIN32OS2__
+         PrnNameToQueue(PrinterName, PrinterName);
+#endif
          if (!OpenPrinterA(PrinterName, &hPrinter, NULL)) {
              FIXME(" Call to OpenPrinter did not succeed!\n");
@@ -1785 +1877 @@
              char   PrinterName[256];
              GetDlgItemTextA(hDlg, LOWORD(wParam), PrinterName, 255);
+#ifdef __WIN32OS2__
+             PrnNameToQueue(PrinterName, PrinterName);
+#endif
              PRINTDLG_ChangePrinterA(hDlg, PrinterName, PrintStructures);
          }
@@ -3581 +3676 @@
         return E_NOTIMPL;
 }
+