Changeset 63 for trunk/gui/printer/cupswiz

Timestamp:

Jan 3, 2018, 3:16:38 AM (8 years ago)

Author:

Alex Taylor

Message:

Fix crash when PPD filename cannot be resolved.
Fix broken CUPS directory resolution in PPD lookup.

Location:

trunk/gui/printer/cupswiz

Files:

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

trunk/gui/printer/cupswiz/cupswiz.VRP

@@ -7 +7 @@
 VRXWindow: __VREMainWindow,1,578,2746,5770,9106
 VRXWindow: __VRESectionListWindow,1,675,11900,4529,3891
-VRXWindow: __VREToolsWindow,1,1650,9973,5477,1667
+VRXWindow: __VREToolsWindow,1,1650,9973,5474,1661
 VRXWindow: __VREWindListWindow,1,5191,11900,2650,3891
 UserFile: 1

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -388 +388 @@
     cups_etc = globals.!cupsdir'\etc'
     IF \VRIsDir( cups_etc'\cups\ppd') THEN
-        cups_etc = globals.!cupsdrv'\etc'
+        cups_etc = globals.!cupsroot'\etc'
     IF \VRIsDir( cups_etc'\cups\ppd') THEN
         cups_etc = VALUE('ETC',,'OS2ENVIRONMENT')
@@ -437 +437 @@
                  * to get the exact model name.
                  */
+                CALL LINEOUT globals.!log1, 'No PPD yet, looking for' cups_etc'\cups\ppd\'globals.!prt_name'.ppd'
                 cups_ppd = STREAM( cups_etc'\cups\ppd\'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
-                globals.!prt_nick = GetNameFromPPD( cups_ppd )
+                IF cups_ppd <> '' THEN
+                    globals.!prt_nick = GetNameFromPPD( cups_ppd )
+                ELSE
+                    CALL LINEOUT globals.!log1, 'PPD not found. Looking for model:' globals.!os2driver'.'globals.!prt_nick
             END
             drv_model = PrinterExistsInDRV( globals.!os2driver, globals.!prt_nick )
@@ -1226 +1230 @@
     CALL LINEOUT globals.!log1, '--[' datestr ']' ||,
                  COPIES('-', 73 - LENGTH( datestr ))
+
+    CALL LINEOUT globals.!log1, 'System boot volume:'      TRANSLATE( globals.!bootdrv )
+    CALL LINEOUT globals.!log1, 'Local CUPS directory:'    TRANSLATE( globals.!cupsdir )
+    CALL LINEOUT globals.!log1, 'Local driver repository:' TRANSLATE( globals.!repository )
+    CALL LINEOUT globals.!log1, ''
+
 RETURN
 
@@ -2001 +2011 @@
     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, '1.13'                                  /* 12: Version %1 */
+    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.15'                                  /* 12: Version %1 */
     CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2017'                             /* 13: (C) %1 Alex Taylor */
     CALL NLSSetText 'PB_ABOUT',  'Caption', 2                                           /* 10: Product Information */