Changeset 11

Timestamp:

Apr 21, 2013, 9:15:05 PM (12 years ago)

Author:

Alex Taylor

Message:

Rewrote PrinterObjectHandle function.

Location:

rxprtutl/trunk

Files:

• objtest.c (added)
• rxprtutl.c (modified) (10 diffs)
• rxprtutl.def (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.0"     // Current version of this library
+#define SZ_VERSION              "0.2.1"     // Current version of this library
 
 #define APPNAME_LEAD_STR        "PM_"
@@ -66 +66 @@
 #define APPNAME_PM_SPOOLER_PORT "PM_SPOOLER_PORT"
 #define APPNAME_PM_PRINT_OBJECT "PM_PrintObject"
+#define APPNAME_PM_ABS_OBJECTS  "PM_Abstract:Objects"
 #define APPNAME_PM_WPS_LOCATION "PM_Workplace:Location"
+
+#define ID_OBJINFO_QUEUENAME    3
+#define ID_OBJINFO_RPQUEUENAME  13
 
 // Values that should be defined in pmsplb.h if it actually existed
@@ -89 +93 @@
 #define US_PORT_MAXZ            64                                   // ...of a port name
 #define US_PRTDEV_MAXZ          9                                    // ...of a print device name
+
+
+// DATA TYPES
+
+/* Structures needed used to parse PM_Abstract:Object data
+ */
+#pragma pack(1)
+typedef struct _Object_Info
+{
+    USHORT cbName;       // Size of szName, including terminator
+    USHORT cbData;       // Number of additional data bytes following szName
+    CHAR   szName[1];    // Name of object type
+} OBJINFO, *POBJINFO;
+
+typedef struct _Object_Tag_Info
+{
+    USHORT usTagFormat;  // Tag data format
+    USHORT usTag;        // Tag ID
+    USHORT cbTag;        // Size of tag data
+} OITAG, *POITAG;
+#pragma pack()
+
+
+// GLOBALS
 
 // List of functions to be registered by RPULoadFuncs
@@ -592 +620 @@
              * of the print device(s) connected to it.
              */
-            rc = SplQueryQueue( NULL, pPInfo->pszPrintDestinationName,
+
+#if 0
+            if ( pPInfo->pszComputerName ) {
+                /* Network printer.  Just display the local information and
+                 * don't try to query the remote queue.
+                 */
+                sprintf( szStemNode, "%s.%u", szStem, ++ulCount );
+                WriteCompoundVariable( szStemNode, "!name",
+                                       pPInfo->pszPrintDestinationName );
+                WriteCompoundVariable( szStemNode, "!description",
+                                       pPInfo->pszDescription );
+                WriteCompoundVariable( szStemNode, "!queue", "");
+                WriteCompoundVariable( szStemNode, "!flags", "");
+                WriteCompoundVariable( szStemNode, "!handle", "");
+
+                WriteCompoundVariable( szStemNode, "!host",
+                                       pPInfo->pszComputerName );
+                continue;
+            }
+#endif
+
+            rc = SplQueryQueue( pPInfo->pszComputerName,
+                                pPInfo->pszPrintDestinationName,
                                 6L, NULL, 0L, &cbNeeded );
             if (( rc != NO_ERROR ) && ( rc != NERR_BufTooSmall )) {
                 WriteErrorCode( rc, "SplQueryQueue");
                 MAKERXSTRING( *prsResult, "0", 1 );
-                goto cleanup;
+                //goto cleanup;
+                continue;
             }
             pbQueue = malloc( cbNeeded );
@@ -603 +654 @@
                 WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "malloc");
                 MAKERXSTRING( *prsResult, "0", 1 );
-                goto cleanup;
+                //goto cleanup;
+                continue;
             }
             cbBuf = cbNeeded;
-            rc = SplQueryQueue( NULL, pPInfo->pszPrintDestinationName,
+            rc = SplQueryQueue( pPInfo->pszComputerName, pPInfo->pszPrintDestinationName,
                                 6L, pbQueue, cbBuf, &cbNeeded );
             if ( rc != NO_ERROR ) {
@@ -612 +664 @@
                 MAKERXSTRING( *prsResult, "0", 1 );
                 free( pbQueue );
-                goto cleanup;
+                //goto cleanup;
+                continue;
             }
             pQInfo = (PPRQINFO6) pbQueue;
@@ -713 +766 @@
 
     hObj = PrinterObjectHandle( pszName );
-    if ( !hObj ) return ( 40 );
+    if ( !hObj ) {
+        MAKERXSTRING( *prsResult, "0", 1 );
+        return ( 0 );
+    }
 
     fRC = WinOpenObject( hObj, ulView, TRUE );
@@ -1414 +1470 @@
 HOBJECT PrinterObjectHandle( PSZ pszQueueName )
 {
-    PVOID   pbuf     = NULL;
-    PSZ     psz;
-    CHAR    szValue[ 256 ];
+    PVOID   pbuf = NULL,
+            pdata = NULL;
+    PBYTE   pb,
+            pbEnd,
+            pbGrpEnd;
+    POBJINFO pInfo = NULL;
+    POITAG   pTag = NULL;
+    PSZ     psz,
+            pszName;
+    CHAR    szValue[ 256 ],
+            szObject[ 5 ];
     ULONG   cbTotal  = 0,
-            cbActual = 0;
-    HOBJECT hObj     = 0;
-    BOOL    fRC;
+            cbActual = 0,
+            ulHandle;
+    HOBJECT hObj = 0;
+    BOOL    fFound,
+            fRC;
 
 
@@ -1442 +1508 @@
     }
 
+    fFound = FALSE;
     psz = (PSZ) pbuf;
-    while ( *psz ) {
+    while ( *psz && !fFound ) {
+#if 1
+
+        /* Just checking the queue names associated with the handle in
+         * PM_PrintObject is not reliable, because remote (LAN) printers
+         * will store the name of the _remote_ queue there (which is not
+         * only impossible to map to a local queue name, it may actually
+         * be the same AS a local queue name... for a different printer).
+         *
+         * So what we do here is parse the queue name out of the object
+         * settings (from PM_Abstract:Objects).  We also have to handle
+         * remote printers slightly differently from local ones.
+         *
+         * I am indebted to Henk Kelder's WPTOOLS source code for providing
+         * the basic logic, although the code below is largely original.
+         */
+
+        if ( sscanf( psz, "%u", &ulHandle ) && LOUSHORT( ulHandle )) {
+            sprintf( szObject, "%X", LOUSHORT( ulHandle ));
+            fRC = PrfQueryProfileSize( HINI_USERPROFILE, APPNAME_PM_ABS_OBJECTS,
+                                      szObject, &cbTotal );
+            if ( !fRC || ( cbTotal < 25 ) || ((pdata = malloc( cbTotal )) == NULL )) {
+                psz += strlen( psz ) + 1;
+                continue;
+            }
+            if ( PrfQueryProfileData( HINI_USERPROFILE, APPNAME_PM_ABS_OBJECTS,
+                                      szObject, (PVOID) pdata, &cbTotal ))
+            {
+                BOOL fRemote;
+                pbEnd = (PBYTE) pdata + cbTotal;
+                pszName = (PSZ) pdata + sizeof( ULONG );
+                fRemote = strcmp( pszName, "WPRPrinter") ? FALSE : TRUE;
+                pb = (PBYTE) pszName + strlen( pszName ) + 17;
+                while (( pb < pbEnd ) && !fFound ) {
+                    pInfo = (POBJINFO) pb;
+                    pb += sizeof( OBJINFO ) + strlen( pInfo->szName );
+                    pbGrpEnd = pb + pInfo->cbData;
+                    if ( pbGrpEnd > pbEnd ) pbGrpEnd = pbEnd;
+                    while (( pb < pbGrpEnd ) && !fFound ) {
+                        pTag = (POITAG) pb;
+                        pb += sizeof( OITAG );
+                        /* For network printers, tag ID 3 indicates the name of
+                         * the queue on the remote server.  We want the local
+                         * queue name, which has tag ID 13.
+                         */
+                        if ( fRemote && ( pTag->usTag == ID_OBJINFO_RPQUEUENAME )) {
+                            memcpy( szValue, pb, pTag->cbTag );
+                            if ( !strcmp( szValue, pszQueueName )) {
+                                hObj = (HOBJECT) ulHandle;
+                                fFound = TRUE;
+                            }
+                        }
+                        // For local printers, just look for tag ID 3
+                        else if ( pTag->usTag == ID_OBJINFO_QUEUENAME ) {
+                            memcpy( szValue, pb, pTag->cbTag );
+                            if ( !strcmp( szValue, pszQueueName )) {
+                                hObj = (HOBJECT) ulHandle;
+                                fFound = TRUE;
+                            }
+                        }
+                        pb += pTag->cbTag;
+                    }
+                }
+            }
+            free( pdata );
+        }
+#else
+        /* Old method, do not use (unreliable for the reasons noted above).
+         */
         if ( !PrfQueryProfileString( HINI_USERPROFILE, APPNAME_PM_PRINT_OBJECT,
                                      psz, NULL, szValue, 255 ))
@@ -1453 +1588 @@
             ( sscanf( psz, "%u", (PULONG) &hObj ) == 1 ))
         {
+            fFound = TRUE;
             break;
         }
+#endif
         psz += strlen( psz ) + 1;
     }

rxprtutl/trunk/rxprtutl.def ¶

@@ -1 +1 @@
 LIBRARY     RXPRTUTL INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.2.0#@##1## 13 Apr 2013 23:17:20     REINFORCE::::::@@REXX Printer Management Utilities'
+DESCRIPTION '@#Alex Taylor:0.2.1#@##1## 21 Apr 2013 15:09:29     REINFORCE::::::@@REXX Printer Management Utilities'
 
 EXPORTS     RPULoadFuncs