Changeset 27 for trunk/gui

Timestamp:

Apr 6, 2013, 11:21:51 PM (12 years ago)

Author:

Alex Taylor

Message:

Various minor fixes.

Location:

trunk/gui

Files:

• printer/cupswiz/cupswiz.VRX (modified) (3 diffs)
• shared/PrintUtl.VRS (modified) (5 diffs)
• util/cupsport/cupsport.c (modified) (2 diffs)
• util/cupsport/readme.txt (modified) (2 diffs)

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -142 +142 @@
     END
 
+    /* Make sure CUPSPORT.EXE is installed.
+     */
+    port_exe = SysSearchPath('PATH', 'cupsport.exe')
+    IF port_exe == '' THEN port_exe = STREAM( DIRECTORY() || '\cupsport.exe', 'C', 'QUERY EXISTS') 
+    IF port_exe == '' THEN DO
+        CALL VRMessage VRWindow(), NLSGetMessage( 78, 'CUPSPORT.EXE'), NLSGetMessage( 79 ), 'E'
+        CALL Quit 
+    END
+
+    /* Make sure PRNTOBJ.EXE is installed.
+     */
+    prntobj_exe = SysSearchPath('PATH', 'prntobj.exe')
+    IF prntobj_exe == '' THEN prntobj_exe = STREAM( DIRECTORY() || '\prntobj.exe', 'C', 'QUERY EXISTS') 
+    IF prntobj_exe == '' THEN DO
+        CALL VRMessage VRWindow(), NLSGetMessage( 78, 'PRNTOBJ.EXE'), NLSGetMessage( 79 ), 'E'
+        CALL Quit 
+    END
+
 RETURN
 
@@ -276 +294 @@
     END
 
-    /* Create a new CUPS port. */
-    /* TODO currently this assumes that CUPS.PDR is already installed. */
+    /* Create a new CUPS port. 
+     */
     port_ok = AddPort_CUPS( port_name, host, printer )
     IF port_ok > 1 THEN
@@ -1714 +1732 @@
     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.00'                                  /* 12: Version %1 */
+    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.01'                                  /* 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 */

trunk/gui/shared/PrintUtl.VRS

@@ -126 +126 @@
  *   driver    - The fully-qualified filename of the printerpak driver
  *   newdrvdir - The directory where the files will be copied; must exist
+ *
+ * Returns: 1 on success, 0 on failure
  */
 CopyDriverToSource: PROCEDURE EXPOSE globals.
@@ -324 +326 @@
  *   driverfull - The fully-qualified filename of the printerpak driver
  *   model      - The printer make/model name used by the driver
+ *
+ * Returns: 0 on success, 1 on error
  */
 InstallPrintDriver: PROCEDURE EXPOSE globals.
@@ -330 +334 @@
     ok = 0
     targetdir = globals.!os2dir'\DLL\'driver
-    IF ( VRFileExists( targetdir'\'driver'.DRV') == 0 ) THEN DO
+    targetdrv = targetdir'\'driver'.DRV'
+    IF ( VRFileExists( targetdrv ) == 0 ) THEN DO
         CALL VRMkDir targetdir
-        ok = CopyDriverToSource( driverfull, targetdir )
-        IF ok == 1 THEN ok = 0
-    END
-    IF VRGetIni('PM_DEVICE_DRIVERS', driver, 'USER', 'NoClose') <> driverfull THEN
-        CALL VRSetIni 'PM_DEVICE_DRIVERS', driver, driverfull||'00'x, 'USER'
-    CALL VRSetIni 'PM_SPOOLER_DD', driver'.'model, driver'.DRV;;;'||'00'x, 'SYSTEM'
+        r = CopyDriverToSource( driverfull, targetdir )
+        IF r <> 1 THEN ok = 1
+    END
+    IF ok == 0 THEN DO
+        IF VRGetIni('PM_DEVICE_DRIVERS', driver, 'USER') <> targetdrv THEN
+            CALL VRSetIni 'PM_DEVICE_DRIVERS', driver, targetdrv||'00'x, 'USER'
+        CALL VRSetIni 'PM_SPOOLER_DD', driver'.'model, driver'.DRV;;;'||'00'x, 'SYSTEM'
+    END
 RETURN ok
 
@@ -345 +352 @@
 /* Create the specified printer using SysCreateObject (this should create the
  * queue automatically).
- */
-CreatePrinterObject: PROCEDURE
+ *
+ * Returns: 0 on success or non-zero return code on error.
+ */
+CreatePrinterObject: PROCEDURE EXPOSE globals.
     PARSE ARG driver, model, portname, queuename, printername
 
+    CALL LINEOUT globals.!log1, 'Creating new printer:' printername '('queuename')'
+    ADDRESS CMD '@prntobj' queuename portname '"'driver'.'model'" "'printername'" >>' globals.!log2
+/*
     oid = '<WPPO_'queuename'>'
     setup = 'PORTNAME='portname';PRINTDRIVER='driver'.'model';QUEUENAME='queuename';TAKEDEFAULTS=YES'
-
+    CALL LINEOUT globals.!log1, 'Creating printer object "'printername'" with setup string "'setup';OBJECTID='oid';"'
     ok = SysCreateObject('WPPrinter', printername, '<WP_DESKTOP>', setup';OBJECTID='oid';', 'F')
     IF ok == 1 THEN
         CALL SysMoveObject oid, '<WP_PRINTERSFOLDER>'
-    ELSE
+    ELSE DO
+        CALL LINEOUT globals.!log1, ' - creation failed, trying again without object-ID ...'
         ok = SysCreateObject('WPPrinter', printername, '<WP_DESKTOP>', setup';', 'F')
+    END
     IF ok == 1 THEN ok = 0
-
-RETURN ok
+    ELSE DO
+        CALL LINEOUT globals.!log1, ' - unable to create object!'
+        ok = 1
+    END
+    CALL LINEOUT globals.!log1
+*/
+
+RETURN rc
 
 
@@ -515 +535 @@
             WHEN LEFT( line, 18 ) == '*StpResolutionMap:' THEN NOP
             WHEN LEFT( line, 14 ) == '*OPOptionHints'     THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*de.'               THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*es.'               THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*fr.'               THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*it.'               THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*ja.'               THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*ko.'               THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*nl.'               THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*pt.'               THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*sv.'               THEN NOP
+            WHEN LEFT( line, 7 ) ==  '*zh_CN.'            THEN NOP
+            WHEN LEFT( line, 7 ) ==  '*zh_TW.'            THEN NOP
             WHEN LEFT( line, 9  ) == '*Foomatic'          THEN DO
                 line = STRIP( line )

trunk/gui/util/cupsport/cupsport.c

@@ -49 +49 @@
 #define TYPE_LONG_WAIT   2
 #define BIDI_SET_PORTDRV 0x19
-
-#pragma import ( PrtSet,, "PMSPL", 604 )
-extern ULONG APIENTRY PrtSet( PSZ pszComputerName, PSZ pszDeviceName, ULONG ulType, ULONG ulCommand, PVOID pInData, ULONG cbInData );
 
 
@@ -126 +123 @@
     strncpy( settings.szHost, pszHostName, STR_LEN_HOSTNAME );
     strncpy( settings.szQueue, pszPrinterName, STR_LEN_QUEUENAME );
-#if 1
     ulRC = pfn_CupsSet( pszPortName, TYPE_LONG_WAIT, BIDI_SET_PORTDRV,
                         &settings, sizeof( settings ));
-#else
-    ulRC = PrtSet( NULL, pszPortName, TYPE_LONG_WAIT, BIDI_SET_PORTDRV,
-                   &settings, sizeof( settings ));
-#endif
     if ( ulRC ) {
         printf("Failed to update port settings, RC=0x%X.\n", ulRC );

trunk/gui/util/cupsport/readme.txt

@@ -7 +7 @@
 BUILDING
 
-  No makefile at the moment, sorry.  Just compile cupsport.c directly, e.g.: 
-    icc cupsport.c
-  Built using IBM VACPP 3.08; 3.65 will probably work as well.  Not tested 
-  with GCC or OW, but they might be OK too.
+  No makefile at the moment, sorry.  Use BUILDICC.CMD to compile using IBM
+  VACPP 3.08; 3.65 will probably work as well.  
+
+  Not tested with GCC or OW, but they should be fine for building with as
+  long as you know how.
 
 
@@ -22 +23 @@
   from an application.
 
-  Without these updates, the created WPS printer object may not be useable 
+  Without these updates, the created WPS printer object may not be usable 
   for printing until after the WPS is restarted, as the CUPS port fails to
   get initialized properly.  (You can tell when this happens if the printer