Changeset 74
- 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:
-
- 3 edited
- printer/manager/PRINTOOL.VRP (modified) (1 diff)
- printer/manager/PRINTOOL.VRX (modified) (1 diff)
- shared/PrManUtl.VRS (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/printer/manager/PRINTOOL.VRP
r72 r74 6 6 RunParameters: /D 7 7 RunDirectory: 8 VRXWindow: __VREMainWindow,1,9 (削除) 40 (削除ここまで),4288,6697,80469 VRXWindow: __VRESectionListWindow,1,10 (削除) 60 (削除ここまで),16044,4204,405910 VRXWindow: __VREToolsWindow,1,10 (削除) 72,14309,5469,166 (削除ここまで)911 VRXWindow: __VREWindListWindow,1,5 (削除) 288 (削除ここまで),16044,3505,40598 VRXWindow: __VREMainWindow,1,9(追記) 52 (追記ここまで),4288,6697,8046 9 VRXWindow: __VRESectionListWindow,1,10(追記) 72 (追記ここまで),16044,4204,4059 10 VRXWindow: __VREToolsWindow,1,10(追記) 84,14309,5472,165 (追記ここまで)9 11 VRXWindow: __VREWindListWindow,1,5(追記) 300 (追記ここまで),16044,3505,4059 12 12 UserFile: 1 13 13 UserWindow: WN_MAIN,1 -
trunk/gui/printer/manager/PRINTOOL.VRX
r72 r74 911 911 LoadSettings: PROCEDURE EXPOSE globals. 912 912 913 globals.!version = '0.8 (削除) 2 (削除ここまで)'914 globals.!copyright = '2013-201 (削除) 8 (削除ここまで)'913 globals.!version = '0.8(追記) 3 (追記ここまで)' 914 globals.!copyright = '2013-201(追記) 9 (追記ここまで)' 915 915 916 916 me = VRGet('Application', 'Program') -
trunk/gui/shared/PrManUtl.VRS
r71 r74 649 649 line = STRIP( LINEIN( ppd_file )) 650 650 IF LEFT( line, 15 ) == '*ShortNickName:' THEN DO 651 (削除) (削除ここまで)PARSE VAR line . ':' _nick '0D'x .651 (追記) (追記ここまで)PARSE VAR line . ':' _nick '0D'x . 652 652 nickname = STRIP( _nick ) 653 (追記) nickname = STRIP( nickname, 'B', '09'x ) (追記ここまで) 653 654 nickname = STRIP( nickname, 'B', '"') 655 (追記) nickname = TRANSLATE( nickname, ' ', '"') (追記ここまで) 656 (追記) nickname = TRANSLATE( nickname, ' ', "'") (追記ここまで) 654 657 LEAVE 655 658 END … … 928 931 * to our working directory. 929 932 */ 930 CALL LINEOUT globals.!log1, 'Converting PPD with:' ppd_exe (削除) ppdfile ppd_use (削除ここまで)931 ADDRESS CMD '@'ppd_exe (削除) ppdfile ppd_use ' (削除ここまで)2>NUL | RXQUEUE' nq933 CALL LINEOUT globals.!log1, 'Converting PPD with:' ppd_exe (追記) '"'ppdfile'" "'ppd_use'"' (追記ここまで) 934 ADDRESS CMD '@'ppd_exe (追記) '"'ppdfile'" "'ppd_use'" (追記ここまで)2>NUL | RXQUEUE' nq 932 935 DO QUEUED() 933 936 PULL output
Note:
See TracChangeset
for help on using the changeset viewer.