Changeset 63
- 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:
-
- 2 edited
- cupswiz.VRP (modified) (1 diff)
- cupswiz.VRX (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/printer/cupswiz/cupswiz.VRP
r59 r63 7 7 VRXWindow: __VREMainWindow,1,578,2746,5770,9106 8 8 VRXWindow: __VRESectionListWindow,1,675,11900,4529,3891 9 VRXWindow: __VREToolsWindow,1,1650,9973,547 (削除) 7,1667 (削除ここまで)9 VRXWindow: __VREToolsWindow,1,1650,9973,547(追記) 4,1661 (追記ここまで) 10 10 VRXWindow: __VREWindListWindow,1,5191,11900,2650,3891 11 11 UserFile: 1 -
trunk/gui/printer/cupswiz/cupswiz.VRX
r59 r63 388 388 cups_etc = globals.!cupsdir'\etc' 389 389 IF \VRIsDir( cups_etc'\cups\ppd') THEN 390 cups_etc = globals.!cups (削除) drv (削除ここまで)'\etc'390 cups_etc = globals.!cups(追記) root (追記ここまで)'\etc' 391 391 IF \VRIsDir( cups_etc'\cups\ppd') THEN 392 392 cups_etc = VALUE('ETC',,'OS2ENVIRONMENT') … … 437 437 * to get the exact model name. 438 438 */ 439 (追記) CALL LINEOUT globals.!log1, 'No PPD yet, looking for' cups_etc'\cups\ppd\'globals.!prt_name'.ppd' (追記ここまで) 439 440 cups_ppd = STREAM( cups_etc'\cups\ppd\'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS') 440 globals.!prt_nick = GetNameFromPPD( cups_ppd ) 441 IF cups_ppd <> '' THEN 442 globals.!prt_nick = GetNameFromPPD( cups_ppd ) 443 ELSE 444 CALL LINEOUT globals.!log1, 'PPD not found. Looking for model:' globals.!os2driver'.'globals.!prt_nick 441 445 END 442 446 drv_model = PrinterExistsInDRV( globals.!os2driver, globals.!prt_nick ) … … 1226 1230 CALL LINEOUT globals.!log1, '--[' datestr ']' ||, 1227 1231 COPIES('-', 73 - LENGTH( datestr )) 1232 (追記) (追記ここまで) 1233 (追記) CALL LINEOUT globals.!log1, 'System boot volume:' TRANSLATE( globals.!bootdrv ) (追記ここまで) 1234 (追記) CALL LINEOUT globals.!log1, 'Local CUPS directory:' TRANSLATE( globals.!cupsdir ) (追記ここまで) 1235 (追記) CALL LINEOUT globals.!log1, 'Local driver repository:' TRANSLATE( globals.!repository ) (追記ここまで) 1236 (追記) CALL LINEOUT globals.!log1, '' (追記ここまで) 1237 (追記) (追記ここまで) 1228 1238 RETURN 1229 1239 … … 2001 2011 CALL NLSSetText 'SW_ABOUT', 'Caption', 10 /* 10: Product Information */ 2002 2012 CALL NLSSetText 'DT_ABOUT1', 'Caption', 11 /* 11: eCups Printer Install Utility */ 2003 CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.1 (削除) 3 (削除ここまで)' /* 12: Version %1 */2013 CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.1(追記) 5 (追記ここまで)' /* 12: Version %1 */ 2004 2014 CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2017' /* 13: (C) %1 Alex Taylor */ 2005 2015 CALL NLSSetText 'PB_ABOUT', 'Caption', 2 /* 10: Product Information */
Note:
See TracChangeset
for help on using the changeset viewer.