Changeset 7 for rxprtutl/trunk/rxprtutl.c

Timestamp:

Apr 5, 2013, 5:29:49 AM (12 years ago)

Author:

Alex Taylor

Message:

Added RPUPrinterDelete function.

File:

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

rxprtutl/trunk/rxprtutl.c

@@ -104 +104 @@
     "RPUPortSet",
     "RPUPrinterCreate",
+    "RPUPrinterDelete",
     "RPUPrinterQuery",
     "RPUVersion"
@@ -124 +125 @@
 RexxFunctionHandler RPUPortSet;
 RexxFunctionHandler RPUPrinterCreate;
+RexxFunctionHandler RPUPrinterDelete;
 RexxFunctionHandler RPUPrinterQuery;
 RexxFunctionHandler RPUQueueDefault;
@@ -1015 +1017 @@
  * been installed already.                                                   *
  *                                                                           *
- * The WPS object is created with default settings, other than those which   *
- * are specified here.                                                       *
- *                                                                           *
- * This function will not create a LAN printer object.  Use the function     *
- * RPUPrinterCreateRemote (not yet implemented) for that purpose.            *
+ * The WPS object is created with default settings (other than those which   *
+ * are specified here).  It will be assigned an object-ID automatically.     *
+ *                                                                           *
+ * This function will not create a remote (LAN) printer object.              *
  *                                                                           *
  * REXX ARGUMENTS:                                                           *
@@ -1027 +1028 @@
  *   4. The default printer driver.model to be associated with               *
  *      the device.  If specified, this must be installed in the             *
- *      system already.  If NOT specified, IBMNULL will be assumed           *
- *      if the specified printer device does not already exist.   (OPTIONAL) *
+ *      system already.  If not specified, and the named printer             *
+ *      device does not already exist, IBMNULL will be assumed.   (OPTIONAL) *
  *   5. The printer object title (i.e. human-readable name).  If             *
  *      not specified, the physical name will be used.            (OPTIONAL) *
@@ -1046 +1047 @@
               pszModel      = NULL,
               pszTitle      = NULL;
-//            pszOID        = NULL;
-//  CHAR      szSetup[ US_SS_MAXZ ] = {0};
     SPLERR    rc;
 
@@ -1062 +1061 @@
     if (( argc > 4 ) && ( ! RXVALIDSTRING( argv[4] )))
         return ( 40 );
-//  if (( argc > 5 ) && ( ! RXVALIDSTRING( argv[5] )))
-//      return ( 40 );
 
     pszQueueName  = argv[0].strptr;
@@ -1070 +1067 @@
     if ( argc > 3 ) pszModel = argv[3].strptr;
     pszTitle = ( argc > 4 ) ? argv[4].strptr : pszDeviceName;
-//  if ( argc > 5 ) pszOID = argv[5].strptr;
 
     // Find out if device exists already
@@ -1078 +1074 @@
         // Nope, create it now
         devinfo.pszPrinterName = pszDeviceName;
-        devinfo.pszUserName = NULL;
-        devinfo.pszLogAddr  = pszPortName;
-        devinfo.pszComment  = pszTitle;
-        devinfo.pszDrivers  = pszModel ? pszModel : "IBMNULL";
-        devinfo.usTimeOut   = 45;
+        devinfo.pszUserName    = NULL;
+        devinfo.pszLogAddr     = pszPortName;
+        devinfo.pszComment     = pszTitle;
+        devinfo.pszDrivers     = pszModel ? pszModel : "IBMNULL";
+        devinfo.usTimeOut      = 45;
         rc = SplCreateDevice( NULL, 3, &devinfo, sizeof( devinfo ));
         if ( rc != NO_ERROR ) {
@@ -1102 +1098 @@
 
         // Nope, create it now
-        qinfo.pszName = pszQueueName;
-        qinfo.uPriority = PRQ_DEF_PRIORITY;
-        qinfo.fsType = PRQ3_TYPE_RAW;
-        qinfo.pszPrProc = "PMPRINT";
-        qinfo.pszComment = pszTitle;
-        qinfo.pszPrinters = pszDeviceName;
+        qinfo.pszName       = pszQueueName;
+        qinfo.uPriority     = PRQ_DEF_PRIORITY;
+        qinfo.fsType        = PRQ3_TYPE_RAW;
+        qinfo.pszPrProc     = "PMPRINT";
+        qinfo.pszComment    = pszTitle;
+        qinfo.pszPrinters   = pszDeviceName;
         qinfo.pszDriverName = pszModel ? pszModel : "IBMNULL";
-        //qinfo.pDriverData = NULL;
         rc = SplCreateQueue( NULL, 3, &qinfo, sizeof( qinfo ));
         if ( rc != NO_ERROR ) {
             WriteErrorCode( rc, "SplCreateQueue");
             MAKERXSTRING( *prsResult, "0", 1 );
-            if ( fNewD );   // TODO delete device
+            if ( fNewD ) SplDeleteDevice( NULL, pszDeviceName );
             return ( 0 );
         }
@@ -1121 +1116 @@
         WriteErrorCode( rc, "SplQueryQueue");
         MAKERXSTRING( *prsResult, "0", 1 );
-        if ( fNewD );   // TODO delete device
+        if ( fNewD ) SplDeleteDevice( NULL, pszDeviceName );
         return ( 0 );
     }
 
-/* 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 )
-    {
-        WriteErrorCode( 0, "WinCreateObject");
-        MAKERXSTRING( *prsResult, "0", 1 );
-        if ( fNewD );   // TODO delete device
-        if ( fNewQ );   // TODO delete queue
+    MAKERXSTRING( *prsResult, "1", 1 );
+    return ( 0 );
+}
+
+
+/* ------------------------------------------------------------------------- *
+ * RPUPrinterDelete                                                          *
+ *                                                                           *
+ * Deletes a local printer queue and its associated print device definition. *
+ *                                                                           *
+ * REXX ARGUMENTS:                                                           *
+ *   1. The name of the printer queue to be deleted.              (REQUIRED) *
+ *                                                                           *
+ * REXX RETURN VALUE:                                                        *
+ *   1 on success, or 0 if an error occurred.  (1 will be returned even if   *
+ *   the WPS printer object could not be deleted, so long as the queue and   *
+ *   device were dstroyed successfully.)                                     *
+ * ------------------------------------------------------------------------- */
+ULONG APIENTRY RPUPrinterDelete( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
+{
+    PPRQINFO3 pInfo         = NULL;
+    ULONG     cbBuf         = 0;
+    PSZ       pszQueueName  = NULL,
+              pszDeviceName = NULL;
+    HOBJECT   hObj;
+    SPLERR    rc;
+
+
+    // Reset the error indicator
+    WriteErrorCode( 0, NULL );
+
+    // Validate the REXX arguments
+    if (( argc != 1 ) || ( ! RXVALIDSTRING( argv[0] )))
+        return ( 40 );
+
+    pszQueueName = argv[0].strptr;
+    hObj = PrinterObjectHandle( pszQueueName );
+
+    rc = SplQueryQueue( NULL, pszQueueName, 3, NULL, 0, &cbBuf );
+    if (( rc != NO_ERROR ) && ( rc != NERR_BufTooSmall )) {
+        WriteErrorCode( rc, "SplQueryQueue");
+        MAKERXSTRING( *prsResult, "0", 1 );
         return ( 0 );
     }
-*/
+    pInfo = (PPRQINFO3) malloc( cbBuf );
+    if ( !pInfo ) {
+        WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "malloc");
+        MAKERXSTRING( *prsResult, "0", 1 );
+        return ( 0 );
+    }
+    rc = SplQueryQueue( NULL, pszQueueName, 3, pInfo, cbBuf, &cbBuf );
+    if ( rc != NO_ERROR ) {
+        WriteErrorCode( rc, "SplQueryQueue");
+        MAKERXSTRING( *prsResult, "0", 1 );
+        goto cleanup;
+    }
+    pszDeviceName = strtok( pInfo->pszPrinters, ",");
+    rc = SplDeleteDevice( NULL, pszDeviceName );
+    if ( rc != NO_ERROR ) {
+        WriteErrorCode( rc, "SplDeleteDevice");
+        MAKERXSTRING( *prsResult, "0", 1 );
+        goto cleanup;
+    }
+
+    // Try and destroy the WPS object
+    if ( hObj != NULLHANDLE ) WinDestroyObject( hObj );
+
+    MAKERXSTRING( *prsResult, "1", 1 );
+cleanup:
+    free( pInfo );
     return ( 0 );
 }