Changeset 6 for rxprtutl/trunk/rxprtutl.c

Timestamp:

Apr 4, 2013, 11:27:12 PM (12 years ago)

Author:

Alex Taylor

Message:

Fix printer object creation logic (WinCreateObject not actually required)

File:

• rxprtutl/trunk/rxprtutl.c (modified) (9 diffs)

rxprtutl/trunk/rxprtutl.c

@@ -1031 +1031 @@
  *   5. The printer object title (i.e. human-readable name).  If             *
  *      not specified, the physical name will be used.            (OPTIONAL) *
- *   6. The printer's WPS object ID (max length 225).             (OPTIONAL) *
  *                                                                           *
  * REXX RETURN VALUE:                                                        *
@@ -1041 +1040 @@
     PRQINFO3  qinfo         = {0};
     ULONG     cbBuf         = 0;
-    BOOL      fNewD         = FALSE,
-              fNewQ         = FALSE;
+    BOOL      fNewD         = FALSE;
     PSZ       pszQueueName  = NULL,
               pszDeviceName = NULL,
               pszPortName   = NULL,
               pszModel      = NULL,
-              pszTitle      = NULL,
-              pszOID        = NULL;
-    CHAR      szSetup[ US_SS_MAXZ ] = {0};
+              pszTitle      = NULL;
+//            pszOID        = NULL;
+//  CHAR      szSetup[ US_SS_MAXZ ] = {0};
     SPLERR    rc;
 
@@ -1057 +1055 @@
 
     // Validate the REXX arguments
-    if (( argc < 3 ) || ( argc > 6 )  || ( ! RXVALIDSTRING( argv[0] )) ||
+    if (( argc < 3 ) || ( argc > 5 )  || ( ! RXVALIDSTRING( argv[0] )) ||
         ( ! RXVALIDSTRING( argv[1] )) || ( ! RXVALIDSTRING( argv[2] )))
         return ( 40 );
@@ -1064 +1062 @@
     if (( argc > 4 ) && ( ! RXVALIDSTRING( argv[4] )))
         return ( 40 );
-    if (( argc > 5 ) && ( ! RXVALIDSTRING( argv[5] )))
-        return ( 40 );
+//  if (( argc > 5 ) && ( ! RXVALIDSTRING( argv[5] )))
+//      return ( 40 );
 
     pszQueueName  = argv[0].strptr;
@@ -1072 +1070 @@
     if ( argc > 3 ) pszModel = argv[3].strptr;
     pszTitle = ( argc > 4 ) ? argv[4].strptr : pszDeviceName;
-    if ( argc > 5 ) pszOID = argv[5].strptr;
+//  if ( argc > 5 ) pszOID = argv[5].strptr;
 
     // Find out if device exists already
@@ -1111 +1109 @@
         qinfo.pszPrinters = pszDeviceName;
         qinfo.pszDriverName = pszModel ? pszModel : "IBMNULL";
-        qinfo.pDriverData = NULL;
+        //qinfo.pDriverData = NULL;
         rc = SplCreateQueue( NULL, 3, &qinfo, sizeof( qinfo ));
         if ( rc != NO_ERROR ) {
@@ -1119 +1117 @@
             return ( 0 );
         }
-        fNewQ = TRUE;
     }
     else if ( rc != NO_ERROR ) {
@@ -1128 +1125 @@
     }
 
-    if ( pszOID )
-        sprintf( szSetup, "TAKEDEFAULTS=YES;OBJECTID=%.225s;", pszOID );
-    else
-        sprintf( szSetup, "TAKEDEFAULTS=YES;");
+/* Actually, this doesn't seem to be necessary...
+
+    sprintf( szSetup, "QUEUENAME=%s;TAKEDEFAULTS=YES;", pszQueueName);        // TODO verify length
+    if ( pszOID ) {
+        strncat( szSetup, "OBJECTID=", US_SS_MAXZ-1 );
+        strncat( szSetup, pszOID, US_SS_MAXZ-1 );
+        strncat( szSetup, ";", US_SS_MAXZ-1 );
+    }
     if ( WinCreateObject("WPPrinter", pszTitle, szSetup,
                          "<WP_DESKTOP>", CO_FAILIFEXISTS ) == NULLHANDLE )
@@ -1141 +1142 @@
         return ( 0 );
     }
-
+*/
     return ( 0 );
 }