Changeset 15

Timestamp:

Sep 18, 2013, 1:36:17 AM (12 years ago)

Author:

Alex Taylor

Message:

Added new RPUDeviceDelete function.
Replaced malloc() with DosAllocMem() in attempt to avoid occasional errors sometimes seen with repeated calls to RPUEnumModels.

Location:

rxprtutl/trunk

Files:

• rxprtutl.c (modified) (9 diffs)
• rxprtutl.def (modified) (1 diff)
• testlib.cmd (modified) (1 diff)

rxprtutl/trunk/rxprtutl.c

@@ -60 +60 @@
 #define SZ_LIBRARY_NAME         "RXPRTUTL"  // Name of this library
 #define SZ_ERROR_NAME           "RPUERROR"  // REXX variable used to store error codes
-#define SZ_VERSION              "0.2.2"     // Current version of this library
+#define SZ_VERSION              "0.2.4"     // Current version of this library
 
 #define APPNAME_LEAD_STR        "PM_"
@@ -123 +123 @@
 static PSZ RxFunctionTbl[] = {
     "RPUDropFuncs",
+    "RPUDeviceDelete",
     "RPUEnumModels",
     "RPUEnumDrivers",
@@ -149 +150 @@
 RexxFunctionHandler RPUDropFuncs;
 RexxFunctionHandler RPUVersion;
+RexxFunctionHandler RPUDeviceDelete;
 RexxFunctionHandler RPUEnumModels;
 RexxFunctionHandler RPUEnumDrivers;
@@ -260 +262 @@
 
 /* ------------------------------------------------------------------------- *
+ * RPUDeviceDelete                                                           *
+ *                                                                           *
+ * Deletes a local print device which lacks a printer queue.  Can be useful  *
+ * for cleaning up bad or corrupted printer definitions.                     *
+ *                                                                           *
+ * REXX ARGUMENTS:                                                           *
+ *   1. The name of the print device to be deleted.               (REQUIRED) *
+ *                                                                           *
+ * REXX RETURN VALUE:                                                        *
+ *   1 on success, or 0 if an error occurred.                                *
+ * ------------------------------------------------------------------------- */
+ULONG APIENTRY RPUDeviceDelete( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
+{
+    PSZ    pszDeviceName = NULL;
+    SPLERR rc;
+
+
+    // Reset the error indicator
+    WriteErrorCode( 0, NULL );
+
+    // Validate the REXX arguments
+    if (( argc != 1 ) || ( ! RXVALIDSTRING( argv[0] )))
+        return ( 40 );
+
+    pszDeviceName = argv[0].strptr;
+
+    rc = SplDeleteDevice( NULL, pszDeviceName );
+    if ( rc != NO_ERROR ) {
+        WriteErrorCode( rc, "SplDeleteDevice");
+        MAKERXSTRING( *prsResult, "0", 1 );
+        return 0;
+    }
+
+    MAKERXSTRING( *prsResult, "1", 1 );
+    return ( 0 );
+}
+
+
+/* ------------------------------------------------------------------------- *
  * RPUEnumModels                                                             *
  *                                                                           *
@@ -285 +326 @@
            pldt = 0L,                   // number of data types
            i;
-
+    APIRET rc = 0;
 
     // Reset the error indicator
@@ -318 +359 @@
 
     // Now get the actual data
+#if 1
+    rc = DosAllocMem( (PVOID) &aDeviceName, (ULONG) pldn * sizeof( STR32 ), PAG_WRITE | PAG_COMMIT );
+    if ( rc != NO_ERROR ) {
+        WriteErrorCode( rc, "DosAllocMem");
+        MAKERXSTRING( *prsResult, "0", 1 );
+        goto cleanup;
+    }
+    rc = DosAllocMem( (PVOID) &aDeviceDesc, (ULONG) pldn * sizeof( STR64 ), PAG_WRITE | PAG_COMMIT );
+    if ( rc != NO_ERROR ) {
+        WriteErrorCode( rc, "DosAllocMem");
+        MAKERXSTRING( *prsResult, "0", 1 );
+        DosFreeMem( aDeviceName );
+        goto cleanup;
+    }
+    rc = DosAllocMem( (PVOID) &aDataType, (ULONG) pldt * sizeof( STR16 ), PAG_WRITE | PAG_COMMIT );
+    if ( rc != NO_ERROR ) {
+        WriteErrorCode( rc, "DosAllocMem");
+        MAKERXSTRING( *prsResult, "0", 1 );
+        DosFreeMem( aDeviceName );
+        DosFreeMem( aDeviceDesc );
+        goto cleanup;
+    }
+#else
     aDeviceName = malloc( pldn * sizeof( STR32 ));
+    if ( !aDeviceName ) {
+        WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "malloc");
+        MAKERXSTRING( *prsResult, "0", 1 );
+        goto cleanup;
+    }
     aDeviceDesc = malloc( pldn * sizeof( STR64 ));
-    aDataType   = malloc( pldt * sizeof( STR16 ));
-    if ( !aDeviceName || !aDeviceDesc || ! aDataType ) {
+    if ( !aDeviceDesc ) {
         WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "malloc");
         MAKERXSTRING( *prsResult, "0", 1 );
+        free( aDeviceName );
         goto cleanup;
     }
+    aDataType = malloc( pldt * sizeof( STR16 ));
+    if ( !aDataType ) {
+        WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "malloc");
+        MAKERXSTRING( *prsResult, "0", 1 );
+        free( aDeviceName );
+        free( aDeviceDesc );
+        goto cleanup;
+    }
+#endif
     fSuccess = DevQueryDeviceNames( hab, pszDriver, &pldn, aDeviceName,
                                     aDeviceDesc, &pldt, aDataType );
@@ -337 +415 @@
     MAKERXSTRING( *prsResult, "1", 1 );
 
+#if 1
+    DosFreeMem( aDeviceName );
+    DosFreeMem( aDeviceDesc );
+    DosFreeMem( aDataType );
+#else
     free( aDeviceName );
     free( aDeviceDesc );
     free( aDataType );
+#endif
 
 cleanup:
@@ -785 +869 @@
  *      (stem).!driver     The name of the port driver                       *
  *      (stem).!converter  The name of the protocol converter used           *
+ *   TODO                                                                    *
+ *      (stem).!printer    The device name of the printer(s) using this      *
+ *                         port, if any ('' if not in use)                   *
  *                                                                           *
  * REXX RETURN VALUE:                                                        *
@@ -1466 +1553 @@
  * Gets information about the specified printer device.                      *
  *                                                                           *
- *   (stem).i.!description  Printer description (name of WPS object)         *
- *   (stem).i.!port         Name of the port the printer is using            *
- *   (stem).i.!driver       List of the drivers used by this printer         *
- *   (stem).i.!jobflags     Zero or more of the following flags (any order): *
+ *   (stem).!description  Printer description (name of WPS object)           *
+ *   (stem).!port         Name of the port the printer is using              *
+ *   (stem).!driver2      List of the drivers used by this printer           *
+ *   (stem).!jobflags     Zero or more of the following flags (any order):   *
  *                            E  A printer error has occurred                *
  *                            H  Printer destination is paused (held)        *

rxprtutl/trunk/rxprtutl.def

@@ -1 +1 @@
 LIBRARY     RXPRTUTL INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.2.2#@##1## 3 May 2013 12:46:17      REINFORCE::::::@@REXX Printer Management Utilities'
+DESCRIPTION '@#Alex Taylor:0.2.4#@##1## 8 Sep 2013 20:30:22      REINFORCE::::::@@REXX Printer Management Utilities'
 
 EXPORTS     RPULoadFuncs
 RPUDropFuncs
 RPUVersion
+RPUDeviceDelete
 RPUEnumModels
 RPUEnumDrivers

rxprtutl/trunk/testlib.cmd

@@ -74 +74 @@
 */
 
+
+rc = RPUEnumModels(test_driver_file, 'models.')
+IF rc == 0 THEN SAY RPUERROR
+ELSE DO
+    SAY models.0 'models found in driver' test_driver_file
+DROP models.
+
 CALL RPUDropFuncs
 RETURN 0