Changeset 74 for trunk/gui

Timestamp:

Jan 3, 2019, 9:04:33 PM (7 years ago)

Author:

Alex Taylor

Message:

Fix parsing problem in certain PPDs causing potential abend

Location:

trunk/gui

Files:

• printer/manager/PRINTOOL.VRP (modified) (1 diff)
• printer/manager/PRINTOOL.VRX (modified) (1 diff)
• shared/PrManUtl.VRS (modified) (2 diffs)

trunk/gui/printer/manager/PRINTOOL.VRP

@@ -6 +6 @@
 RunParameters: /D
 RunDirectory: 
-VRXWindow: __VREMainWindow,1,940,4288,6697,8046
-VRXWindow: __VRESectionListWindow,1,1060,16044,4204,4059
-VRXWindow: __VREToolsWindow,1,1072,14309,5469,1669
-VRXWindow: __VREWindListWindow,1,5288,16044,3505,4059
+VRXWindow: __VREMainWindow,1,952,4288,6697,8046
+VRXWindow: __VRESectionListWindow,1,1072,16044,4204,4059
+VRXWindow: __VREToolsWindow,1,1084,14309,5472,1659
+VRXWindow: __VREWindListWindow,1,5300,16044,3505,4059
 UserFile: 1
 UserWindow: WN_MAIN,1

trunk/gui/printer/manager/PRINTOOL.VRX

@@ -911 +911 @@
 LoadSettings: PROCEDURE EXPOSE globals.
 
-    globals.!version = '0.82'
-    globals.!copyright = '2013-2018'
+    globals.!version = '0.83'
+    globals.!copyright = '2013-2019'
 
     me = VRGet('Application', 'Program')

trunk/gui/shared/PrManUtl.VRS

@@ -649 +649 @@
             line = STRIP( LINEIN( ppd_file ))
             IF LEFT( line, 15 ) == '*ShortNickName:' THEN DO
-            PARSE VAR line . ':' _nick '0D'x .
+                PARSE VAR line . ':' _nick '0D'x .
                 nickname = STRIP( _nick )
+                nickname = STRIP( nickname, 'B', '09'x )
                 nickname = STRIP( nickname, 'B', '"')
+                nickname = TRANSLATE( nickname, ' ', '"')
+                nickname = TRANSLATE( nickname, ' ', "'")
                 LEAVE
             END
@@ -928 +931 @@
          * to our working directory.
          */
-        CALL LINEOUT globals.!log1, 'Converting PPD with:' ppd_exe ppdfile ppd_use
-        ADDRESS CMD '@'ppd_exe ppdfile ppd_use '2>NUL | 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