Changeset 49 for trunk/pin/src

Timestamp:

Dec 17, 2014, 1:36:21 PM (11 years ago)

Author:

Alex Taylor

Message:

Updates for v0.50:
Moved much of the PPD-import logic into a shared function.
Automatically reimport previously-imported PPDs when updating to a new version of a known PostScript driver.
Ask if the user wants to update the active copy of a driver when the repository version is updated.
Fixed error in locating cupswiz.exe when the desktop object doesn't exist.
Fixed broken update of PRDESC.LST when upgrading to a new version of a known PostScript driver.

File:

• trunk/pin/src/conv_ppd.c (modified) (5 diffs)

trunk/pin/src/conv_ppd.c

@@ -103 +103 @@
 #include <ctype.h>
 #ifndef __KLIBC__
-        #include <builtin.h>
+#include <builtin.h>
 #else
-        typedef INT      *PINT;
-        #define strcmpi strcmp
+typedef INT      *PINT;
+#define strcmpi strcmp
 #endif
 
@@ -809 +809 @@
         if( str == NULL || *str == 0 ) return;
 
-        while( (*str) !=0 ) str++;  // find the end of the string
+    while( (*str) !=0 ) str++;  // find the end of the string
         str--; // get to last character (step over 0)
         while( isblank(*str) ) str--; // see if the character is blank, keep backstepping
@@ -1217 +1217 @@
   if (desPpd.desItems.iResDpi == 0)
   {
+#if 0
     desPpd.desItems.iResDpi = 300;
+#else
+    desPpd.desItems.iResDpi = 1440;  // workaround for WordPro printing problem
+#endif
   }
 
@@ -1381 +1385 @@
          i = SkipBlank(px);
          px += i;
-         desPpd.desPage.iCustomPageSizeMinHeight = atoi(px);
+         desPpd.desPage.iCustomPageSizeMinHeight = (SHORT)atoi(px); // ALT
          i = MovePast( px, ' ' );
          px += i;
-         desPpd.desPage.iCustomPageSizeMaxHeight = atoi(px);
+         desPpd.desPage.iCustomPageSizeMaxHeight = (SHORT)atoi(px); // ALT
        }
      }
@@ -2362 +2366 @@
       if(stricmp(pCompare,"Resolution")==0)
       {
-        ULONG uiResStr;
-        // we are in resolution processing
-        uiResStr = uiStrLen + MovePast( pbPrBuffer + uiStrLen, ':' );
-        uiResStr += SkipBlank( pbPrBuffer + uiResStr );
-        if(strnicmp(pbPrBuffer+uiResStr,"\"\"",2)==0)
-        {
-                // we found a empty resolution string so skip this one
-                bSkipEntry = TRUE;
-        }       
+        ULONG uiResStr;
+        // we are in resolution processing
+        uiResStr = uiStrLen + MovePast( pbPrBuffer + uiStrLen, ':' );
+        uiResStr += SkipBlank( pbPrBuffer + uiResStr );
+        if(strnicmp(pbPrBuffer+uiResStr,"\"\"",2)==0)
+        {
+            // we found a empty resolution string so skip this one
+            bSkipEntry = TRUE;
+        }
       }