Changeset 12 for rxprtutl/trunk/rxprtutl.c

Timestamp:

Apr 22, 2013, 12:18:17 AM (12 years ago)

Author:

Alex Taylor

Message:

RPUEnumPrinters: Do not attempt to read the remote printer queue of LAN printers.
RPUPrinterQuery: Return additional job flags.

File:

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

rxprtutl/trunk/rxprtutl.c

@@ -523 +523 @@
     PSZ          pszToken;
     HOBJECT      hObj;                  // printer WPS object handle
-    ULONG        flType     = SPL_PR_QUEUE | SPL_PR_DIRECT_DEVICE,
+    ULONG        flType     = SPL_PR_QUEUE | SPL_PR_DIRECT_DEVICE | SPL_PR_LOCAL_ONLY,
                  cbBuf      = 0,
                  cTotal     = 0,
@@ -631 +631 @@
                 WriteCompoundVariable( szStemNode, "!description",
                                        pPInfo->pszDescription );
-                WriteCompoundVariable( szStemNode, "!queue", "");
+                WriteCompoundVariable( szStemNode, "!queue",
+                                       pPInfo->pszPrintDestinationName);
                 WriteCompoundVariable( szStemNode, "!flags", "");
                 WriteCompoundVariable( szStemNode, "!handle", "");
-
                 WriteCompoundVariable( szStemNode, "!host",
                                        pPInfo->pszComputerName );
@@ -1279 +1279 @@
  *   (stem).i.!port         Name of the port the printer is using            *
  *   (stem).i.!driver       List of the drivers used by this printer         *
- * TODO:                                                                     *
- *   (stem).i.!flags        Zero or more of the following flags (any order): *
+ *   (stem).i.!jobflags     Zero or more of the following flags (any order): *
  *                            E  A printer error has occurred                *
- *                            H  Printer destination is paused               *
+ *                            H  Printer destination is paused (held)        *
  *                            I  Intervention required                       *
  *                            N  Printer has raised a notification alert     *
  *                            O  Printer is offline                          *
  *                            P  Printer is out of paper                     *
- *                            X  Printer is not processing/paused            *
  *                                                                           *
  * REXX ARGUMENTS:                                                           *
@@ -1303 +1301 @@
               cbNeeded   = 0;
     PSZ       pszDeviceName;
-    CHAR      szStem[ US_STEM_MAXZ ];   // compound variable stem name
+    CHAR      szFlags[ 8 ] = {0},
+              szStem[ US_STEM_MAXZ ];   // compound variable stem name
     SPLERR    rc;
 
@@ -1349 +1348 @@
         WriteCompoundVariable( szStem, "!description", pInfo->pszComment );
         WriteCompoundVariable( szStem, "!drivers", pInfo->pszDrivers );
+        if ( pInfo->fsStatus & PRJ_ERROR  )      strcat( szFlags, "E");
+        if ( pInfo->fsStatus & PRJ_DESTPAUSED )  strcat( szFlags, "H");
+        if ( pInfo->fsStatus & PRJ_INTERV )      strcat( szFlags, "I");
+        if ( pInfo->fsStatus & PRJ_NOTIFY )      strcat( szFlags, "N");
+        if ( pInfo->fsStatus & PRJ_DESTOFFLINE ) strcat( szFlags, "O");
+        if ( pInfo->fsStatus & PRJ_DESTNOPAPER ) strcat( szFlags, "P");
+        WriteCompoundVariable( szStem, "!jobflags", szFlags );
         MAKERXSTRING( *prsResult, "1", 1 );
     }