Changeset 21

Timestamp:

Feb 25, 2013, 6:33:09 AM (13 years ago)

Author:

Alex Taylor

Message:

Some fixes to the ImportPPD routine.

Location:

trunk/gui/printer/cupswiz

Files:

• cupswiz.VRP (modified) (1 diff)
• cupswiz.VRX (modified) (9 diffs)

trunk/gui/printer/cupswiz/cupswiz.VRP

@@ -7 +7 @@
 VRXWindow: __VREMainWindow,1,614,2554,5770,9106
 VRXWindow: __VRESectionListWindow,1,675,11804,4529,3891
-VRXWindow: __VREToolsWindow,1,1686,9877,4965,1663
+VRXWindow: __VREToolsWindow,1,1686,9877,4971,1667
 VRXWindow: __VREWindListWindow,1,5228,11804,2650,3891
 UserFile: 1

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -236 +236 @@
      */
 
-    result = InstallPrintDriver( prnt_drv, driver_path, printer_model )
-    CALL LINEOUT globals.!log1, 'InstallPrintDriver(' prnt_drv',' driver_path',' printer_model ') RC =' result
-
-    IF result == 0 THEN
-        result = CreatePrinterObject( prnt_drv, printer_model,,
-                                      port_name, queue_name, printer_title )
-    CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv',' printer_model,
-                                ',' port_name',' queue_name',' printer_title,
-                                ') RC =' result
-
-    IF result <> 0 THEN
+    ok = InstallPrintDriver( prnt_drv, driver_path, printer_model )
+    CALL LINEOUT globals.!log1, 'InstallPrintDriver(' prnt_drv',' driver_path',' printer_model ') RC =' ok
+
+    IF ok == 0 THEN DO
+        ok = CreatePrinterObject( prnt_drv, printer_model,,
+                                  port_name, queue_name, printer_title )
+        CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv',' printer_model,
+                                    ',' port_name',' queue_name',' printer_title ') RC =' ok
+    END
+
+    IF ok <> 0 THEN
         CALL DeletePort port_name
     ELSE IF port_ok == 1 THEN DO
@@ -254 +254 @@
     END
 
-RETURN result
+RETURN ok
 
 /*:VRX         CreatePrinter
@@ -278 +278 @@
             IF ok <> 0 THEN DO
                 CALL LINEOUT globals.!log1, 'PPD import failed:' ok
-                CALL VRMessage VRWindow(), NLSGetMessage( 69 ),,        /* 69: The printer parameters could not ... PPD file. */
-                               NLSGetMessage( 70 ), 'W'                 /* 70: Error importing PPD file */
-                CALL PromptForPMName
-                /* RETURN 1                RC=1  PPD import failed **/
+                buttons.1 = NLSGetMessage( 2 )                          /*  2: OK */
+                buttons.2 = NLSGetMessage( 3 )                          /*  3: Cancel */
+                buttons.0 = 2
+                ok = VRMessage( VRWindow(), NLSGetMessage( 69 ),,       /* 69: The printer parameters could not ... PPD file. */
+                                NLSGetMessage( 70 ), 'W',,              /* 70: Error importing PPD file */
+                                'buttons.', 1, 2 )
+                IF ok == 1 THEN
+                    CALL PromptForPMName
+                ELSE
+                    RETURN 1                /* RC=1  PPD import failed **/
             END
         END
@@ -769 +775 @@
      * to our working directory.
      */
-    ADDRESS CMD '@'ppd_exe ppdfile ppd_use '2>NUL 1| RXQUEUE' nq
+    CALL LINEOUT globals.!log1, 'Converting PPD with:' ppd_exe ppdfile ppd_use
+    ADDRESS CMD '@'ppd_exe ppdfile ppd_use '2>NUL | RXQUEUE' nq
     DO QUEUED()
         PULL output
@@ -777 +784 @@
     CALL LINEOUT globals.!log2
 
+    IF VRFileExists( ppd_use ) == 0 THEN DO
+        CALL LINEOUT globals.!log1, 'Hmm,' ppd_use 'was not created.  Copying manually.'
+        CALL VRCopyFile ppdfile, ppd_use
+    END
+
     /* Next we strip out some problematic lines used which are often encountered
      * in (e.g.) CUPS-based PPD files.
@@ -785 +797 @@
      */
     count = 0
-    ADDRESS CMD '@'pin_exe 'ppd' ppddir drv_out '2>NUL 1| RXQUEUE' nq
+    ADDRESS CMD '@'pin_exe 'ppd' ppddir drv_out '2>NUL | RXQUEUE' nq
     DO QUEUED()
         PARSE PULL output
@@ -863 +875 @@
      */
     target = VRParseFilePath( driver_path, 'DP')
-    ok = VRCopyFile( workdir'\OUT\*', target )
+    CALL LINEOUT globals.!log1, 'Copying files from' workdir'\OUT to' target 
+    ADDRESS CMD '@UNLOCK' target'\'driver'.DRV 2>NUL 1>NUL'
+    ok = VRCopyFile( workdir'\OUT\'driver'.DRV', target'\'driver'.DRV')
+    IF ok == 1 THEN
+        ok = VRCopyFile( workdir'\OUT\AUXPRINT.PAK', target'\AUXPRINT.PAK')
     IF ok == 1 THEN DO
         /* Copy the updated files to \OS2\DLL\<driver>, replacing any
@@ -873 +889 @@
             CALL VRCopyFile workdir'\OUT\AUXPRINT.PAK',,
                             globals.!os2dir'\DLL\'driver'\AUXPRINT.PAK'
+            ADDRESS CMD '@UNLOCK' workdir'\OUT\'driver'.DRV 2>NUL 1>NUL'
             CALL VRCopyFile workdir'\OUT\'driver'.DRV',,
                             globals.!os2dir'\DLL\'driver'\'driver'.DRV'
         END
     END
-    IF ok == 0 THEN
+    IF ok == 0 THEN DO
+        CALL LINEOUT globals.!log1, VRError()
         RETURN 3                        /*** RC=3  Failed to copy driver files ***/
+    END
 
     CALL LINEOUT globals.!log1, newprinters.0 'printers imported successfully.'
@@ -1619 +1638 @@
     CALL NLSSetText 'SW_ABOUT',  'Caption', 10                                          /* 10: Product Information */
     CALL NLSSetText 'DT_ABOUT1', 'Caption', 11                                          /* 11: eCups Printer Install Utility */
-    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '0.97'                                  /* 12: Version %1 */
-    CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010, 2012'                            /* 13: (C) %1 Alex Taylor */
+    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '0.98'                                  /* 12: Version %1 */
+    CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010, 2013'                            /* 13: (C) %1 Alex Taylor */
     CALL NLSSetText 'PB_ABOUT',  'Caption', 2                                           /* 10: Product Information */