Changeset 10593 for trunk/src

Timestamp:

Apr 30, 2004, 3:25:59 PM (21 years ago)

Author:

sandervl

Message:

drawSingleLinePoint: wrong pen style checks

File:

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

trunk/src/comdlg32/printdlg.c

@@ -135 +135 @@
 
 
-#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
@@ -255 +219 @@
     INT i;
     LPPRINTER_INFO_2A pi;
-#ifdef __WIN32OS2__
-    char substName[260];
-#endif
 
     EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &needed, &num);
@@ -264 +225 @@
                   &num);
 
-#ifndef __WIN32OS2__
     for(i = 0; i < num; i++) {
         SendDlgItemMessageA(hDlg, id, CB_ADDSTRING, 0,
@@ -270 +230 @@
     }
     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",
@@ -294 +239 @@
         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)
@@ -1193 +1131 @@
 
         if (lppd->Flags & PD_USEDEVMODECOPIESANDCOLLATE) {
+#ifdef __WIN32OS2__
+            EnableWindow(GetDlgItem(hDlg, chx2), FALSE);
+            EnableWindow(GetDlgItem(hDlg, ico3), FALSE);
+            ShowWindow(GetDlgItem(hDlg, chx2), SW_HIDE);
+#else
           /* if printer doesn't support it: no Collate */
             if (!(lpdm->dmFields & DM_COLLATE)) {
@@ -1198 +1141 @@
                 EnableWindow(GetDlgItem(hDlg, ico3), FALSE);
             }
+#endif
         }
 
@@ -1356 +1300 @@
 
         if (lppd->Flags & PD_USEDEVMODECOPIESANDCOLLATE) {
+#ifdef __WIN32OS2__
+            EnableWindow(GetDlgItem(hDlg, chx2), FALSE);
+            EnableWindow(GetDlgItem(hDlg, ico3), FALSE);
+            ShowWindow(GetDlgItem(hDlg, chx2), SW_HIDE);
+#else
           /* if printer doesn't support it: no Collate */
             if (!(lpdm->dmFields & DM_COLLATE)) {
@@ -1361 +1310 @@
                 EnableWindow(GetDlgItem(hDlg, ico3), FALSE);
             }
+#endif
         }
 
@@ -1507 +1457 @@
         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);
@@ -1516 +1463 @@
         char name[200];
         BOOL ret = PRINTDLG_GetDefaultPrinterNameA(name, sizeof(name));
-#ifdef __WIN32OS2__
-        PrnNameToQueue(name, name);
-#endif
         if (ret)
             PRINTDLG_ChangePrinterA(hDlg, name, PrintStructures);
@@ -1808 +1752 @@
 
     case edt3:
+#ifndef __WIN32OS2__
         if(HIWORD(wParam) == EN_CHANGE) {
             INT copies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
@@ -1815 +1760 @@
                 EnableWindow(GetDlgItem(hDlg, chx2), TRUE);
         }
+#endif
         break;
 
@@ -1842 +1788 @@
 
          GetDlgItemTextA(hDlg, PrinterComboID, PrinterName, 255);
-#ifdef __WIN32OS2__
-         PrnNameToQueue(PrinterName, PrinterName);
-#endif
          if (!OpenPrinterA(PrinterName, &hPrinter, NULL)) {
              FIXME(" Call to OpenPrinter did not succeed!\n");
@@ -1891 +1834 @@
              char   PrinterName[256];
              GetDlgItemTextA(hDlg, LOWORD(wParam), PrinterName, 255);
-#ifdef __WIN32OS2__
-             PrnNameToQueue(PrinterName, PrinterName);
-#endif
              PRINTDLG_ChangePrinterA(hDlg, PrinterName, PrintStructures);
          }
@@ -1998 +1938 @@
 
     case edt3:
+#ifndef __WIN32OS2__
         if(HIWORD(wParam) == EN_CHANGE) {
             INT copies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
@@ -2005 +1946 @@
                 EnableWindow(GetDlgItem(hDlg, chx2), TRUE);
         }
+#endif
         break;
 
@@ -2137 +2079 @@
         res = PRINTDLG_WMInitDialog(hDlg, wParam, PrintStructures);
 
-        if(PrintStructures->dlg.lpPrintDlg->Flags & PD_ENABLEPRINTHOOK)
+        if(PrintStructures->dlg.lpPrintDlg->Flags & PD_ENABLEPRINTHOOK) {
             res = PrintStructures->dlg.lpPrintDlg->lpfnPrintHook(
                 hDlg, uMsg, wParam, (LPARAM)PrintStructures->dlg.lpPrintDlg
             );
+#ifdef __WIN32OS2__
+            EnableWindow(GetDlgItem(hDlg, chx2), FALSE);
+            EnableWindow(GetDlgItem(hDlg, ico3), FALSE);
+            ShowWindow(GetDlgItem(hDlg, chx2), SW_HIDE);
+#endif
+        }
         return res;
     }
@@ -2182 +2130 @@
 
         if(PrintStructures->dlg.lpPrintDlg->Flags & PD_ENABLEPRINTHOOK)
+        {
             res = PrintStructures->dlg.lpPrintDlg->lpfnPrintHook(
                 hDlg, uMsg, wParam, (LPARAM)PrintStructures->dlg.lpPrintDlg
             );
+#ifdef __WIN32OS2__
+            EnableWindow(GetDlgItem(hDlg, chx2), FALSE);
+            EnableWindow(GetDlgItem(hDlg, ico3), FALSE);
+            ShowWindow(GetDlgItem(hDlg, chx2), SW_HIDE);
+#endif
+        }
         return res;
     }