Changeset 31

Timestamp:

Mar 30, 2016, 12:31:15 PM (9 years ago)

Author:

Alex Taylor

Message:

Fixes to return string handling plus workaround for unexpected DosQuerySysState return data (from SHL).

Location:

rxutilex/trunk

Files:

• rxutilex.c (modified) (88 diffs)
• rxutilex.def (modified) (1 diff)

rxutilex/trunk/rxutilex.c

@@ -104 +104 @@
 #define FL_TIME_LOCALE          2
 
+static const char *PSZ_ZERO = "0";
+static const char *PSZ_ONE = "1";
 
 // List of functions to be registered by Sys2LoadFuncs or dropped by Sys2DropFuncs
@@ -135 +137 @@
 };
 
-
 // FUNCTION DECLARATIONS
 
@@ -174 +175 @@
 RexxFunctionHandler Sys2SyncBuffer;
 
-
 // Private internal functions
-ULONG GetProcess( PSZ pszProgram, PSZ pszFullName, PULONG pulPID, PULONG pulPPID, PULONG pulType, PUSHORT pusPriority, PULONG pulCPU );
-BOOL  SaveResultString( PRXSTRING prsResult, PCH pchBytes, ULONG ulBytes );
-BOOL  WriteStemElement( PSZ pszStem, ULONG ulIndex, PSZ pszValue );
-void  WriteErrorCode( ULONG ulError, PSZ pszContext );
-
+ULONG GetProcess( PCSZ pszProgram, PSZ pszFullName, PULONG pulPID, PULONG pulPPID, PULONG pulType, PUSHORT pusPriority, PULONG pulCPU );        // 2016-02-20 SHL
+BOOL  SaveResultString( PRXSTRING prsResult, PCSZ pchBytes, ULONG ulBytes );    // 2016-02-20 SHL
+BOOL  WriteStemElement( PCSZ pszStem, ULONG ulIndex, PCSZ pszValue );   // 2016-02-20 SHL
+void  WriteErrorCode( ULONG ulError, PCSZ pszContext ); // 2016-02-20 SHL
 
 // MACROS
 #define TIME_SECONDS( timeval )     ( timeval / 32 )
 #define TIME_HUNDREDTHS( timeval )  (( timeval % 32 ) * 100 / 32 )
-
 
 /* ------------------------------------------------------------------------- *
@@ -209 +207 @@
         RexxRegisterFunctionDll( RxFunctionTbl[i], SZ_LIBRARY_NAME, RxFunctionTbl[i] );
 
-    MAKERXSTRING( *prsResult, "", 0 );
+    SaveResultString( prsResult, NULL, 0 );     // 2016-02-20 SHL
     return ( 0 );
 }
@@ -235 +233 @@
         RexxDeregisterFunction( RxFunctionTbl[i] );
 
-    MAKERXSTRING( *prsResult, "", 0 );
+    SaveResultString( prsResult, NULL, 0 );     // 2016-02-20 SHL
     return ( 0 );
 }
@@ -258 +256 @@
     sprintf( szVersion, "%s", SZ_VERSION );
 
-    MAKERXSTRING( *prsResult, szVersion, strlen(szVersion) );
+    SaveResultString( prsResult, szVersion, strlen(szVersion) );        // 2016-02-20 SHL
     return ( 0 );
 }
@@ -317 +315 @@
     DosGetInfoBlocks( &ptib, &ppib );
     ulPType = ppib->pib_ultype;
-    ppib->pib_ultype = 3;
+    ppib->pib_ultype = 3;               // Morph to PM
     hab = WinInitialize( 0 );
     if ( !hab ) {
@@ -328 +326 @@
      * (in the calling process), which is also OK.
      */
-    hmq = WinCreateMsgQueue( hab, 0);
+    hmq = WinCreateMsgQueue( hab, 0 );
+
+    // 2016-02-20 SHL Sync return values with docs
 
     // Place the string on the clipboard as CF_TEXT
@@ -337 +337 @@
 
         ulBytes = argv[0].strlength + 1;
-        ulRC = DosAllocSharedMem( (PVOID) &pszShareMem, NULL, ulBytes,
+        ulRC = DosAllocSharedMem( (PVOID) &pszShareMem,
+                                  NULL,
+                                  ulBytes,
                                   PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_GIVEABLE );
         if ( ulRC == 0 ) {
             memset( pszShareMem, 0, ulBytes );
             strncpy( pszShareMem, argv[0].strptr, ulBytes - 1 );
-            if ( ! WinSetClipbrdData( hab, (ULONG) pszShareMem, CF_TEXT, CFI_POINTER ))
-                WriteErrorCode( ERRORIDERROR(WinGetLastError(hab)), "WinSetClipbrdData");
+            if ( ! WinSetClipbrdData( hab, (ULONG) pszShareMem, CF_TEXT, CFI_POINTER ) ) {
+                WriteErrorCode( ERRORIDERROR(WinGetLastError(hab)), "WinSetClipbrdData" );
+                SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
+            }
             else
-                MAKERXSTRING( *prsResult, "", 0 );
+                SaveResultString( prsResult, PSZ_ONE, 1 );      // Success - 2016-02-20 SHL
         } else {
             WriteErrorCode( ulRC, "DosAllocSharedMem");
-            MAKERXSTRING( *prsResult, "", 0 );
+            SaveResultString( prsResult, PSZ_ZERO, 1 ); // 2016-02-20 SHL
         }
 
         WinCloseClipbrd( hab );
     } else {
-        WriteErrorCode( ulRC, "WinOpenClipbrd");
-        MAKERXSTRING( *prsResult, "", 0 );
+        // 2016-02-20 SHL Report PM error code
+        WriteErrorCode( ERRORIDERROR(WinGetLastError(hab)), "WinOpenClipbrd" );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
     }
 
     if ( hmq != NULLHANDLE ) WinDestroyMsgQueue( hmq );
     if ( fHabTerm ) WinTerminate( hab );
-    ppib->pib_ultype = ulPType;
+    ppib->pib_ultype = ulPType;                 // Restore
 
     return ( 0 );
@@ -373 +378 @@
  *   None.                                                                   *
  *                                                                           *
- * REXX RETURN VALUE: The retrieved clipboard string                         *
+ * REXX RETURN VALUE: The retrieved clipboard string  or "" if fails.        *
  * ------------------------------------------------------------------------- */
 ULONG APIENTRY Sys2GetClipboardText( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
@@ -415 +420 @@
 
         // Read plain text from the clipboard, if available
-        if (( pszClipText = (PSZ) WinQueryClipbrdData( hab, CF_TEXT )) != NULL ) {
-
-            ulBytes = strlen( pszClipText ) + 1;
-            if (( pszLocalText = (PSZ) malloc( ulBytes )) != NULL ) {
+        if (( pszClipText = (PSZ) WinQueryClipbrdData( hab, CF_TEXT ) ) != NULL ) {
+
+            ulBytes = strlen(pszClipText) + 1;
+            if ( ( pszLocalText = (PSZ) malloc( ulBytes ) ) != NULL ) {
                 memset( pszLocalText, 0, ulBytes );
                 strncpy( pszLocalText, pszClipText, ulBytes - 1 );
-                if ( ! SaveResultString( prsResult, pszLocalText, ulBytes - 1 )) {
-                    MAKERXSTRING( *prsResult, "", 0 );
-                }
+                SaveResultString( prsResult, pszLocalText, ulBytes - 1 );       // 2016-02-20 SHL
                 free( pszLocalText );
             } else {
                 WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "malloc");
-                MAKERXSTRING( *prsResult, "", 0 );
+                SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
             }
 
         } else {
             // Either no text exists, or clipboard is not readable
-            MAKERXSTRING( *prsResult, "", 0 );
+            SaveResultString( prsResult, NULL, 0 );     // 2016-02-20 SHL
         }
 
         WinCloseClipbrd( hab );
     } else {
-        WriteErrorCode( ulRC, "WinOpenClipbrd");
-        MAKERXSTRING( *prsResult, "", 0 );
+        // 2016-02-20 SHL Report PM error code
+        WriteErrorCode( ERRORIDERROR(WinGetLastError(hab)), "WinOpenClipbrd" );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
     }
 
@@ -489 +493 @@
 
     // Parse the ID type flag
-    if ( argc >= 2 && RXVALIDSTRING(argv[1]) ) {
+    if ( argc >= 2 && RXVALIDSTRING( argv[1] ) ) {
         strupr( argv[1].strptr );
-        if (strcspn(argv[1].strptr, "HNP") > 0 ) return ( 40 );
+        if ( strcspn(argv[1].strptr, "HNP") > 0 ) return ( 40 );
         switch ( argv[1].strptr[0] ) {
 
@@ -505 +509 @@
                       if ( pszProcName == NULL ) {
                           WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "calloc");
-                          MAKERXSTRING( *prsResult, "0", 1 );
+                          SaveResultString( prsResult, NULL, 0 );       // 2016-02-20 SHL
                           return ( 0 );
                       }
@@ -515 +519 @@
         if ( pszProcName == NULL ) {
             WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "calloc");
-            MAKERXSTRING( *prsResult, "0", 1 );
+            SaveResultString( prsResult, NULL, 0 );     // 2016-02-20 SHL
             return ( 0 );
         }
@@ -524 +528 @@
     rc = GetProcess( pszProcName, szFullName, &ulPID, &ulPPID, &ulType, &usPrty, &ulTime );
     if (( rc != NO_ERROR ) || ( ulPID == 0 )) {
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         return ( 0 );
     }
@@ -532 +536 @@
              TIME_SECONDS( ulTime ) % 60, TIME_HUNDREDTHS( ulTime ), szFullName );
 
-    MAKERXSTRING( *prsResult, szReturn, strlen(szReturn) );
+    SaveResultString( prsResult, szReturn, strlen(szReturn) );  // 2016-02-20 SHL
 
     return ( 0 );
@@ -588 +592 @@
                       if ( pszProcName == NULL ) {
                           WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "calloc");
-                          MAKERXSTRING( *prsResult, "0", 1 );
+                          SaveResultString( prsResult, PSZ_ZERO, 1 );   // 2016-02-20 SHL
                           return ( 0 );
                       }
@@ -598 +602 @@
         if ( pszProcName == NULL ) {
             WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "calloc");
-            MAKERXSTRING( *prsResult, "0", 1 );
+            SaveResultString( prsResult, PSZ_ZERO, 1 ); // 2016-02-20 SHL
             return ( 0 );
         }
@@ -604 +608 @@
     }
 
-    if ( pszProcName != NULL ) {
+    if ( pszProcName ) {
         // Get the process PID
         rc = GetProcess( pszProcName, szFullName, &ulPID, &ulPPID, &ulType, &usPrty, &ulTime );
         if (( rc != NO_ERROR ) || ( ulPID == 0 )) {
-            MAKERXSTRING( *prsResult, "0", 1 );
+            free( pszProcName );
+            SaveResultString( prsResult, PSZ_ZERO, 1 ); // 2016-02-20 SHL
             return ( 0 );
         }
@@ -617 +622 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosKillProcess");
-        MAKERXSTRING( *prsResult, "0", 1 );
-        return ( 0 );
-    }
-
-    MAKERXSTRING( *prsResult, "1", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
+    }
+    else
+        SaveResultString( prsResult, PSZ_ONE, 1 );      // 2016-02-20 SHL
+
+    // 2016-02-20 SHL Avoid leak
+    if ( pszProcName )
+      free( pszProcName );
+
     return ( 0 );
 }
@@ -683 +692 @@
     pBuf = (QSPTRREC *) malloc( UL_SSBUFSIZE );
 #else
-    pBuf = (QSPTRREC *) malloc( UL_SSBUFSIZE ); // 2015-04-23 SHL
+    pBuf = (QSPTRREC *) malloc( UL_SSBUFSIZE ); // 2015-04-23 SHL
 #endif
 
     if ( pBuf == NULL ) {
         WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "malloc");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         return ( 0 );
     }
@@ -697 +706 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosQProcStatus");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         return ( 0 );
     }
@@ -705 +714 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosQuerySysState");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         return ( 0 );
     }
@@ -712 +721 @@
     // Now get the list of processes
     ulCount = 0;
-#   if 1 // 2015-06-12 SHL FIXME to know if can occur
-    if ( pBuf->pProcRec == NULL ) {
-        WriteErrorCode( rc, "pBuf->pProcRec NULL");
-        MAKERXSTRING( *prsResult, "", 0 );
+#   if 1 // 2016-02-25 SHL FIXME debug bad pointer
+    // 2016-02-26 SHL FIXME to be gone when sure this can not occur
+    if ( (ULONG)pBuf->pProcRec < 0x10000 ) {
+        sprintf( szName, "rxutilex#%u pBuf->pProcRec 0x%x < 0x10000",
+                 __LINE__, (ULONG)pBuf->pProcRec );
+        WriteErrorCode( ERROR_INVALID_ADDRESS, szName );
+        SaveResultString( prsResult, NULL, 0 );
+        free( pBuf );
         return ( 0 );
     }
 #   endif
 
-    // 2015-06-12 SHL pThrdRec can be 0 - probably when process starting or dieing
     for (pPrec = pBuf->pProcRec;
          ;
-         pPrec = pPrec->pThrdRec ?
-                   (QSPREC *)(pPrec->pThrdRec + pPrec->cTCB) :
-                   pPrec + 1
+         pPrec = (QSPREC *)(pPrec->pThrdRec + pPrec->cTCB)
         )
 
     {
-#       if 1
-        // 2015-06-19 SHL FIXME to be gone if proven that never can occur
-        if ((ULONG)pPrec < 0x10000) {
-            fprintf(stderr, "* rxutilex#%u ulCount %u pPrec %p\n", __LINE__, ulCount, pPrec);
-            break;                      // Avoid death
+#       if 0 // 2015-06-19 SHL FIXME debug bad pointer
+        // 2016-02-26 SHL FIMXE to be gone when sure no longer needed
+        if ( (ULONG)pPrec < 0x10000 ) {
+            sprintf( szName, "rxutilex#%u pPrec 0x%x < 0x10000",
+                     __LINE__, (ULONG)pPrec );
+            WriteErrorCode( ERROR_INVALID_ADDRESS, szName );
+            SaveResultString( prsResult, NULL, 0 );
+            free( pBuf );
+            return ( 0 );
         }
 #       endif
 
-        // 2015-06-19 SHL FIXME debug was trapping here if pThrdRec NULL
-        if (pPrec->RecType != QS_PROCESS)
-            break;
-
-#       if 1
-        /* Avoid death if no threads
-           This is undocumented but probably occurs if called while process
-           is starting or terminating
-           2015-07-31 SHL
-        */
-        if (!pPrec->cTCB)
-          fprintf(stderr, "* rxutilex#%u ulCount %u pBuf %p pPrec %p pPrec->pThrdRec %p pPrec->cTCB %u\n", __LINE__, ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->cTCB);
-        // 2015-07-31 SHL FIXME debug
-        if ((ULONG)(pPrec->pThrdRec) < 0x10000) {
-          fprintf(stderr, "* rxutilex#%u ulCount %u pBuf %p pPrec %p pPrec->pThrdRec %p pPrec->cTCB %u\n", __LINE__, ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->cTCB);
-          break;                        // Avoid death
+        // Check for documented end marker - RecType not QS_PROCESS
+        if ( pPrec->RecType != QS_PROCESS ) {
+#           if 0 // 2016-02-26 SHL FIXME debug
+            fprintf( stderr,
+                     "* rxutilex#%u RecType != QS_PROCESS "
+                     "ulCount %u pBuf %p pPrec %p ->RecType %x ->pThrdRec %p ->pid %u ->ppid %u ->type %u ->stat %u ->hmte %x ->cTCB %u\n",
+                     __LINE__, ulCount, pBuf, pPrec, pPrec->RecType, pPrec->pThrdRec,
+                     pPrec->pid, pPrec->ppid,
+                     pPrec->type, pPrec->stat, pPrec->hMte, pPrec->cTCB );
+#           endif
+            break;                      // Must be end of list
+        }
+
+        // Check for alternate end marker - pThredRec NULL
+        // This appears to be an undocumented end marker
+        // Might be a defect - testing says only RecType is non-zero
+        // 2015-06-12 SHL pThrdRec can be 0 - probably when process starting or dieing
+        if ( (PVOID)pPrec->pThrdRec == NULL ) {
+#           if 0 // 2016-02-26 SHL FIXME debug
+            fprintf( stderr,
+                     "* rxutilex#%u pThrdRec NULL "
+                     "ulCount %u pBuf %p pPrec %p ->pThrdRec %p ->pid %u ->ppid %u ->type %u ->stat %u ->hmte %x ->cTCB %u\n",
+                     __LINE__, ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->pid, pPrec->ppid,
+                     pPrec->type, pPrec->stat, pPrec->hMte, pPrec->cTCB );
+#           endif
+            break;                      // Must be end of list
+        }
+
+#       if 1 // 2015-07-31 SHL FIXME debug bad pointer
+        // 2016-02-26 SHL FIXME to be gone when sure can not occur
+        if ( (ULONG)(pPrec->pThrdRec) < 0x10000 ) {
+            sprintf( szName,
+                     "rxutilex#%u pPrec < 0x10000 "
+                     "ulCount %u pBuf %p pPrec %p ->pThrdRec %p ->pid %u ->ppid %u ->type %u ->stat %u ->hmte %x ->cTCB %u\n",
+                     __LINE__, ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->pid, pPrec->ppid,
+                     pPrec->type, pPrec->stat, pPrec->hMte, pPrec->cTCB );
+            WriteErrorCode( ERROR_INVALID_ADDRESS, szName );
+            SaveResultString( prsResult, NULL, 0 );
+            free( pBuf );
+            return ( 0 );
+        }
+#       endif
+#       if 1 // 2016-02-26 SHL FIXME debug bad count
+        // 2016-02-26 SHL FIXME to be gone when sure can not occur
+        // This is probably occurs only when pThrdRec NULL too which is already checked
+        if ( !pPrec->cTCB ) {
+            sprintf( szName, "rxutilex#%u cTCB 0 ulCount %u pBuf %p pPrec %p ->pid %u ->type %u ->stat %u\n",
+                     __LINE__, ulCount, pBuf, pPrec, pPrec->pid, pPrec->type, pPrec->stat );
+            WriteErrorCode( ERROR_INVALID_DATA, szName );
+            SaveResultString( prsResult, NULL, 0 );
+            free( pBuf );
+            return ( 0 );
         }
 #       endif
@@ -784 +834 @@
         WriteStemElement( szStem, ulCount, szPInfo );
 
-#       if 1    // 2015-07-31 SHL FIXME debug
-        // 2015-07-31 SHL FIXME debug
-        if (!pPrec->cTCB) {
-          fprintf(stderr, "* rxutilex: szPInfo %s\n", szPInfo);
-          fprintf(stderr, "* rxutilex: ulCount %u pBuf %p pPrec %p pPrec->pThrdRec %p pPrec->cTCB %u\n", ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->cTCB);
-          fprintf(stderr, "* rxutilex: next RecType %x\n", (pPrec + 1)->RecType);
-    }
-        // 2015-07-31 SHL FIXME debug
-        if ((ULONG)pPrec->pThrdRec < 0x10000 || !pPrec->cTCB) {
-          fprintf(stderr, "* rxutilex: szPInfo %s\n", szPInfo);
-          fprintf(stderr, "* rxutilex: ulCount %u pBuf %p pPrec %p pPrec->pThrdRec %p pPrec->cTCB %u\n", ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->cTCB);
-          fprintf(stderr, "* rxutilex: next RecType %x\n", (pPrec + 1)->RecType);
-          break;                // Avoid death
+#       if 0 // 2015-07-31 SHL FIXME debug bad count
+        // 2016-02-26 SHL FIXME to be gone when sure no longer needed
+        if ( !pPrec->cTCB ) {
+            sprintf( szName, "rxutilex#%u: cTCB 0 "
+                     "ulCount %u pBuf %p pPrec %p ->pThrdRec %p ->pid %u\n",
+                     __LINE__, ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->pid );
+            WriteErrorCode( ERROR_INVALID_DATA, szName );
+            SaveResultString( prsResult, NULL, 0 );
+            free( pBuf );
+            return ( 0 );
+        }
+#       endif
+#       if 0    // 2015-07-31 SHL FIXME debug bad pointer
+        // 2016-02-26 SHL FIXME to be gone when sure no longer needed
+        if ( (ULONG)pPrec->pThrdRec < 0x10000 ) {
+            sprintf( szName,
+                     "rxutilex#%u: pBuf->pThrdRec < 0x10000 "
+                     "ulCount %u pBuf %p pPrec %p ->pThrdRec %p ->pid %u ->cTCB %u\n",
+                     __LINE__, ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->pid, pPrec->cTCB );
+            WriteErrorCode( rc, szName );
+            SaveResultString( prsResult, NULL, 0 );
+            free( pBuf );
+            return ( 0 );
         }
 #       endif
     } // for
 
-    // Create the "0" stem element with the number of processes found
+    // Create the stem.0 element with the number of processes found
     sprintf( szNumber, "%d", ulCount );
     WriteStemElement( szStem, 0, szNumber );
 
     // And also return the number of processes as the REXX return string
-    MAKERXSTRING( *prsResult, szNumber, strlen(szNumber) );
+    SaveResultString( prsResult, szNumber, strlen(szNumber) );  // 2016-02-20 SHL
 
     free( pBuf );
@@ -842 +902 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosQuerySysInfo");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
         return ( 0 );
     }
@@ -851 +911 @@
 
     // Return the memory size as the REXX return string
-    MAKERXSTRING( *prsResult, szMemSize, strlen(szMemSize) );
+    SaveResultString( prsResult, szMemSize, strlen(szMemSize) );        // 2016-02-20 SHL
 
     return ( 0 );
@@ -886 +946 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosQuerySysInfo");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
         return ( 0 );
     }
@@ -892 +952 @@
 
     // Return the PID as the REXX return string
-    MAKERXSTRING( *prsResult, szPID, strlen(szPID) );
+    SaveResultString( prsResult, szPID, strlen(szPID) );          // 2016-02-20 SHL
 
     return ( 0 );
@@ -926 +986 @@
     if ( pszOldModule == NULL ) {
         WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "calloc");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
         return ( 0 );
     }
@@ -937 +997 @@
             if ( pszNewModule == NULL ) {
                 WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "calloc");
-                MAKERXSTRING( *prsResult, "0", 1 );
+                SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
                 return ( 0 );
             }
@@ -950 +1010 @@
             if ( pszBackup == NULL ) {
                 WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "calloc");
-                MAKERXSTRING( *prsResult, "0", 1 );
+                SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
                 return ( 0 );
             }
@@ -961 +1021 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosReplaceModule");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
         return ( 0 );
     }
 
     // Return 1 on success
-    MAKERXSTRING( *prsResult, "1", 1 );
+    SaveResultString( prsResult, PSZ_ONE, 1 );  // 2016-02-20 SHL
 
     return ( 0 );
@@ -985 +1045 @@
  *      values.  Ignored for integer values.                    (DEFAULT: 2) *
  *                                                                           *
- * REXX RETURN VALUE: The formatted number, or '' on error.                  *
+ * REXX RETURN VALUE: The formatted number, or "" on error.                  *
  * ------------------------------------------------------------------------- */
 ULONG APIENTRY Sys2FormatNumber( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
@@ -1015 +1075 @@
          */
         PSZ pszLang, p;
-        if (( DosScanEnv("LANG", &pszLang ) == NO_ERROR ) &&
-            pszLang && ( strlen( pszLang ) >= 2 ))
+        if ( DosScanEnv( "LANG", &pszLang ) == NO_ERROR &&
+             pszLang &&
+             strlen(pszLang) >= 2 )
         {
             p = strdup( pszLang );
@@ -1091 +1152 @@
     if ( rc != ULS_SUCCESS ) {
         WriteErrorCode( rc, "UniCreateLocaleObject");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         return ( 0 );
     }
@@ -1097 +1158 @@
     if ( rc != ULS_SUCCESS ) {
         WriteErrorCode( rc, "UniQueryLocaleInfo");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         return ( 0 );
      }
@@ -1121 +1182 @@
 
     // Return the formatted number
-    MAKERXSTRING( *prsResult, achNumber, strlen( achNumber ));
+    SaveResultString( prsResult, achNumber, strlen(achNumber) );        // 2016-02-20 SHL
 
     return ( 0 );
@@ -1147 +1208 @@
  *        L = convert to local time using the current TZ (DEFAULT)           *
  *                                                                           *
- * REXX RETURN VALUE: The formatted time string, or '' on error.             *
+ * REXX RETURN VALUE: The formatted time string, or "" on error.             *
  * ------------------------------------------------------------------------- */
 ULONG APIENTRY Sys2FormatTime( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
@@ -1203 +1264 @@
      */
     DosScanEnv("TZ", &pszTZ );
-    pszSetTZ = (PSZ) malloc( strlen( pszTZ ) + 5 );
+    pszSetTZ = (PSZ) malloc( strlen(pszTZ) + 5 );
     if ( pszSetTZ ) {
         sprintf( pszSetTZ, "TZ=%s", pszTZ );
@@ -1217 +1278 @@
         if ( ttSeconds == -1 ) {
             WriteErrorCode( ttSeconds, "time");
-            MAKERXSTRING( *prsResult, "", 0 );
+            SaveResultString( prsResult, NULL, 0 );     // 2016-02-20 SHL
             if ( pszSetTZ ) free( pszSetTZ );
             return 0;
@@ -1227 +1288 @@
         if ( !timeptr ) {
             WriteErrorCode( 1, "gmtime");
-            MAKERXSTRING( *prsResult, "0", 1 );
+            SaveResultString( prsResult, NULL, 0 );     // 2016-02-20 SHL       // 2016-02-20 SHL
             if ( pszSetTZ ) free( pszSetTZ );
             return 0;
@@ -1236 +1297 @@
         if ( !timeptr ) {
             WriteErrorCode( 1, "localtime");
-            MAKERXSTRING( *prsResult, "0", 1 );
+            SaveResultString( prsResult, NULL, 0 );     // 2016-02-20 SHL
             if ( pszSetTZ ) free( pszSetTZ );
             return 0;
@@ -1261 +1322 @@
     if ( stRC == NO_ERROR ) {
         WriteErrorCode( stRC, "strftime");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         if ( pszSetTZ ) free( pszSetTZ );
         return ( 0 );
@@ -1267 +1328 @@
 
     // Return the formatted time string
-    MAKERXSTRING( *prsResult, szTime, strlen(szTime) );
+    SaveResultString( prsResult, szTime, strlen(szTime) );      // 2016-02-20 SHL
 
     if ( pszSetTZ ) free( pszSetTZ );
@@ -1376 +1437 @@
      */
     DosScanEnv("TZ", &pszTZ );
-    pszSetTZ = (PSZ) malloc( strlen( pszTZ ) + 5 );
+    pszSetTZ = (PSZ) malloc( strlen(pszTZ) + 5 );
     sprintf( pszSetTZ, "TZ=%s", pszTZ );
     putenv( pszSetTZ );
@@ -1390 +1451 @@
         if ( timeval == -1 ) {
             WriteErrorCode( timeval, "time");
-            MAKERXSTRING( *prsResult, "0", 1 );
+            SaveResultString( prsResult, PSZ_ZERO, 1 ); // 2016-02-20 SHL
             free( pszSetTZ );
             return 0;
@@ -1407 +1468 @@
         if ( timeval == -1 ) {
             WriteErrorCode( timeval, "mktime");
-            MAKERXSTRING( *prsResult, "0", 1 );
+            SaveResultString( prsResult, PSZ_ZERO, 1 ); // 2016-02-20 SHL
             free( pszSetTZ );
             return 0;
@@ -1419 +1480 @@
     sprintf( szEpochTime, "%d", timeval );
 #endif
-    MAKERXSTRING( *prsResult, szEpochTime, strlen(szEpochTime) );
+    SaveResultString( prsResult, szEpochTime, strlen(szEpochTime) );    // 2016-02-20 SHL
 
     free( pszSetTZ );
@@ -1440 +1501 @@
  *                                                                           *
  * REXX RETURN VALUE:                                                        *
- *   The fully-qualified path of the DLL, if found (or '' if not found).     *
+ *   The fully-qualified path of the DLL, if found (or "" if not found).     *
  * ------------------------------------------------------------------------- */
 ULONG APIENTRY Sys2LocateDLL( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
@@ -1472 +1533 @@
         if ( bLoadedOnly ) {
             // Just return
-            MAKERXSTRING( *prsResult, "", 0 );
+            SaveResultString( prsResult, NULL, 0 );     // 2016-02-20 SHL
             return 0;
         }
@@ -1479 +1540 @@
         if ( rc ) {
             WriteErrorCode( rc, "DosLoadModule");
-            MAKERXSTRING( *prsResult, "", 0 );
+            SaveResultString( prsResult, NULL, 0 );     // 2016-02-20 SHL
             return 0;
         }
@@ -1489 +1550 @@
     if ( rc ) {
         WriteErrorCode( rc, "DosQueryModuleName");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         if ( bUnload ) DosFreeModule( hmod );
         return 0;
@@ -1498 +1559 @@
 
     // Return the full path name
-    if ( ! SaveResultString( prsResult, achModuleName, strlen( achModuleName ))) {
-        MAKERXSTRING( *prsResult, "", 0 );
-    }
+    SaveResultString( prsResult, achModuleName, strlen(achModuleName) );        // 2016-02-20 SHL
 
     return 0;
@@ -1534 +1593 @@
  *                                                                           *
  * REXX RETURN VALUE:                                                        *
- *   A four-byte pipe handle.                                                *
+ *   A four-byte pipe handle or 0 if create fails                            *
  * ------------------------------------------------------------------------- */
 ULONG APIENTRY Sys2CreateNamedPipe( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
@@ -1623 +1682 @@
     if ( pszNPName == NULL ) {
         WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "calloc");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
         return ( 0 );
     }
@@ -1632 +1691 @@
     if (rc) {
         WriteErrorCode( rc, "DosCreateNPipe");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
         return 0;
     }
@@ -1638 +1697 @@
     // Return the handle as the REXX result string
     sprintf( achHandle, "%8X", hp );
-    MAKERXSTRING( *prsResult, achHandle, strlen( achHandle ));
+    SaveResultString( prsResult, achHandle, strlen(achHandle) ); // 2016-02-20 SHL
 
     free( pszNPName );
@@ -1681 +1740 @@
     {
         WriteErrorCode( rc, "DosConnectNPipe");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
         return ( 0 );
     }
 
     // Return 1 on success
-    MAKERXSTRING( *prsResult, "1", 1 );
+    SaveResultString( prsResult, PSZ_ONE, 1 );  // 2016-02-20 SHL
     return ( 0 );
 }
@@ -1718 +1777 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosDisConnectNPipe");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
         return ( 0 );
     }
 
     // Return 1 on success
-    MAKERXSTRING( *prsResult, "1", 1 );
+    SaveResultString( prsResult, PSZ_ONE, 1 );  // 2016-02-20 SHL
     return ( 0 );
 }
@@ -1739 +1798 @@
  *   String of the format "bytes status", where bytes is the number of bytes *
  *   currently waiting in the pipe, and status is one of: DISCONNECTED,      *
- *   LISTENING, CONNECTED, or CLOSING.                                       *
+ *   LISTENING, CONNECTED, or CLOSING or "" if API error                     *
  * ------------------------------------------------------------------------- */
 ULONG APIENTRY Sys2CheckNamedPipe( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
@@ -1759 +1818 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosPeekNPipe");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         return ( 0 );
     }
@@ -1771 +1830 @@
     }
 
-    if ( ! SaveResultString( prsResult, szStatus, strlen( szStatus ))) {
-        MAKERXSTRING( *prsResult, "", 0 );
-    }
+    SaveResultString( prsResult, szStatus, strlen(szStatus) );  // 2016-02-20 SHL
+
     return ( 0 );
 }
@@ -1953 +2011 @@
     if ( pszFile == NULL ) {
         WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "calloc");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         return ( 0 );
     }
@@ -1962 +2020 @@
     if (rc) {
         WriteErrorCode( rc, "DosOpenL");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         free( pszFile );
         return ( 0 );
@@ -1969 +2027 @@
     // Return the handle as the REXX result string
     sprintf( achHandle, "%8X", hf );
-    MAKERXSTRING( *prsResult, achHandle, strlen( achHandle ));
+    SaveResultString( prsResult, achHandle, strlen(achHandle) );        // 2016-02-20 SHL
 
     free( pszFile );
@@ -2004 +2062 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosClose");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
     }
     else {
-        MAKERXSTRING( *prsResult, "1", 1 );
+        SaveResultString( prsResult, PSZ_ONE, 1 );      // 2016-02-20 SHL
     }
 
@@ -2029 +2087 @@
  *                                                                           *
  * REXX RETURN VALUE:                                                        *
- *   The new file position, in bytes.                                        *
+ *   The new file position, in bytes or "" if error                          *
  * ------------------------------------------------------------------------- */
 ULONG APIENTRY Sys2Seek( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
@@ -2067 +2125 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosSetFilePtrL");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         return ( 0 );
     }
@@ -2073 +2131 @@
     // Return the new position as the REXX result string
     sprintf( achActual, "%lld", llActual );
-    MAKERXSTRING( *prsResult, achActual, strlen( achActual ));
+    SaveResultString( prsResult, achActual, strlen(achActual) );        // 2016-02-20 SHL
 
     return ( 0 );
@@ -2117 +2175 @@
     if ( rc || !cbActual ) {
         WriteErrorCode( rc, "DosRead");
-        MAKERXSTRING( *prsResult, "", 0 );
+        SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
         goto cleanup;
     }
-    if ( ! SaveResultString( prsResult, pszData, cbActual )) {
-        MAKERXSTRING( *prsResult, "", 0 );
-    }
+    SaveResultString( prsResult, pszData, cbActual );   // 2016-02-20 SHL
 
 cleanup:
@@ -2164 +2220 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosWrite");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
         return ( 0 );
     }
 
     sprintf( szActual, "%d", cbActual );
-    MAKERXSTRING( *prsResult, szActual, strlen( szActual ));
+    SaveResultString( prsResult, szActual, strlen(szActual) );  // 2016-02-20 SHL
     return ( 0 );
 }
@@ -2203 +2259 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosResetBuffer");
-        MAKERXSTRING( *prsResult, "0", 1 );
+        SaveResultString( prsResult, PSZ_ZERO, 1 );     // 2016-02-20 SHL
     }
     else {
-        MAKERXSTRING( *prsResult, "1", 1 );
+        SaveResultString( prsResult, PSZ_ONE, 1 );      // 2016-02-20 SHL
     }
 
@@ -2239 +2295 @@
  *   0 on success, or a non-zero API return code in the case of an error.    *
  * ------------------------------------------------------------------------- */
-ULONG GetProcess( PSZ pszProgram,
+// 2016-02-20 SHL Rework to avoid traps
+ULONG GetProcess( PCSZ pszProgram,
                   PSZ pszFullName,
                   PULONG pulPID,
@@ -2250 +2307 @@
     QSPTRREC *pBuf;                     // Data returned by DosQProcStatus()
 #else
-    QSPTRREC *pBuf;                     // Data returned by DosQuerySysState()  // 2015-04-23 SHL
+    QSPTRREC *pBuf;                     // Data returned by DosQuerySysState()  // 2015-04-23 SHL
 #endif
     QSPREC *pPrec;                      // Pointer to process information block
@@ -2265 +2322 @@
     APIRET rc;                          // Return code
 
-
     // Use current process when PID is 0 and program name is not specified
     if (( pszProgram == NULL ) && ( *pulPID == 0 )) {
@@ -2279 +2335 @@
     pBuf = (QSPTRREC *) malloc( UL_SSBUFSIZE );
 #else
-    pBuf = (QSPTRREC *) malloc( UL_SSBUFSIZE ); // 2015-04-23 SHL
+    pBuf = (QSPTRREC *) malloc( UL_SSBUFSIZE ); // 2015-04-23 SHL
 #endif
 
@@ -2300 +2356 @@
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosQuerySysState");
+        free( pBuf );
         return ( rc );
     }
-    pPrec = (QSPREC *)(((QSPTRREC*)pBuf) -> pProcRec);  // 2015-04-23 SHL
+    pPrec = (QSPREC *)(((QSPTRREC*)pBuf) -> pProcRec);  // 2015-04-23 SHL
 #endif
 
@@ -2312 +2369 @@
     else if ( *pulPID == 0 ) return 0;
 
+#   if 1 // 2016-02-25 SHL FIXME debug bad pointer
+    // 2016-02-26 SHL FIXME to be gone when sure can not occur
+    if ( (ULONG)pPrec < 0x10000 ) {
+        sprintf( szName, "rxutilex#%u pPrec 0x%x < 0x10000", __LINE__, (ULONG)pPrec );
+        WriteErrorCode( ERROR_INVALID_ADDRESS, szName);
+        free( pBuf );
+        return ( 0 );
+    }
+#   endif
+
     // Now look for the specified process
-    while (( pPrec->RecType == 1 ) && ( !fMatch )) {
+    // List ends with RecType not QS_PROCESS or pThrdRec NULL
+    while ( pPrec->RecType == QS_PROCESS && pPrec->pThrdRec != NULL && !fMatch ) {
 
         if ( pszProgram == NULL ) {
+            // Match by pid
             if ( pPrec->pid == *pulPID ) {
                 fMatch = TRUE;
@@ -2351 +2420 @@
             // Create a copy without the extension
             strcpy( szNoExt, pszCurrent );
-            if (( c = strrchr( szNoExt, '.')) != NULL ) memset( c, 0, strlen(c) );
-            if (( pszCurrent != NULL ) &&
-                (( stricmp(pszCurrent, pszProgram) == 0 ) || ( stricmp(szNoExt, pszProgram) == 0 )))
+            if ( ( c = strrchr( szNoExt, '.') ) != NULL )
+                memset( c, 0, strlen(c) );
+            if ( pszCurrent != NULL &&
+                 ( stricmp(pszCurrent, pszProgram) == 0 || stricmp(szNoExt, pszProgram) == 0 ) )
             {
                 fMatch = TRUE;
@@ -2377 +2447 @@
             }
         }
-        pPrec = (QSPREC *) ( (PBYTE) (pPrec->pThrdRec) + ( pPrec->cTCB * sizeof(QSTREC) ) );
-    }
+        pPrec = (QSPREC *)(pPrec->pThrdRec + pPrec->cTCB);
+
+#       if 1 // 2016-02-25 SHL FIXME debug pointer - can this occur?
+        // 2016-02-26 SHL FIXME to be gone when sure can not occur
+        if ( (ULONG)pPrec < 0x10000 ) {
+            sprintf( szName, "rxutilex#%u pPrec 0x%x < 0x10000", __LINE__, (ULONG)pPrec );
+            WriteErrorCode( ERROR_INVALID_ADDRESS, szName);
+            free( pBuf );
+            return ( 0 );
+        }
+#       endif
+
+    } // while
     if ( !fMatch ) *pulPID = 0;
 
@@ -2390 +2471 @@
  *                                                                           *
  * Writes new string contents to the specified RXSTRING, allocating any      *
- * additional memory that may be required.  If the string to be written has  *
- * zero length, nothing is done.                                             *
- *                                                                           *
- * This function should be used in place of MAKERXSTRING if there is a       *
- * possibility that the string contents could be longer than 256 characters. *
+ * additional memory that may be required.                                   *
  *                                                                           *
  * ARGUMENTS:                                                                *
  *   PRXSTRING prsResult: Pointer to an existing RXSTRING for writing.       *
- *   PCH       pchBytes : The string contents to write to prsResult.         *
- *   ULONG     ulBytes  : The number of bytes in pchBytes to write.          *
+ *   PCH       pchBytes : The string contents to write to prsResult or NULL  *
+ *   ULONG     ulBytes  : The number of bytes in pchBytes to write 0..N.     *
  *                                                                           *
  * RETURNS: BOOL                                                             *
  *   TRUE if prsResult was successfully updated.  FALSE otherwise.           *
  * ------------------------------------------------------------------------- */
-BOOL SaveResultString( PRXSTRING prsResult, PCH pchBytes, ULONG ulBytes )
+BOOL SaveResultString( PRXSTRING prsResult, PCSZ pchBytes, ULONG ulBytes )
 {
     ULONG ulRC;
     PCH   pchNew;
 
-    if ( ulBytes == 0 ) return ( FALSE );
+    // 2016-02-20 SHL Rework for easier usage
+    if (!pchBytes)
+      ulBytes = 0;                              // Sync for caller
     if ( ulBytes > 256 ) {
         // REXX provides 256 bytes by default; allocate more if necessary
@@ -2415 +2494 @@
         if ( ulRC != 0 ) {
             WriteErrorCode( ulRC, "DosAllocMem");
+            prsResult->strlength = 0;           // 2016-02-20 SHL Force result to empty string
             return ( FALSE );
         }
@@ -2421 +2501 @@
         prsResult->strptr = pchNew;
     }
-    memcpy( prsResult->strptr, pchBytes, ulBytes );
+    if (ulBytes)
+      memcpy( prsResult->strptr, pchBytes, ulBytes );
     prsResult->strlength = ulBytes;
 
@@ -2442 +2523 @@
  *   TRUE on success, FALSE on failure.                                      *
  * ------------------------------------------------------------------------- */
-BOOL WriteStemElement( PSZ pszStem, ULONG ulIndex, PSZ pszValue )
+// 2016-02-20 SHL
+BOOL WriteStemElement( PCSZ pszStem, ULONG ulIndex, PCSZ pszValue )
 {
     SHVBLOCK shvVar;                   // REXX shared variable pool block
@@ -2456 +2538 @@
         // 2015-06-03 SHL Was using DosAllocMem and leaking memory
         // REXX API does not free this kind of buffer
-        ulBytes = strlen( pszValue );
+        ulBytes = strlen(pszValue);
     }
     MAKERXSTRING( shvVar.shvname, szCompoundName, strlen(szCompoundName) );
-    shvVar.shvvalue.strptr    = pszValue;
+    shvVar.shvvalue.strptr    = (PCH)pszValue;
     shvVar.shvvalue.strlength = ulBytes;
     shvVar.shvnamelen  = RXSTRLEN( shvVar.shvname );
@@ -2489 +2571 @@
  * RETURNS: N/A                                                              *
  * ------------------------------------------------------------------------- */
-void WriteErrorCode( ULONG ulError, PSZ pszContext )
+void WriteErrorCode( ULONG ulError, PCSZ pszContext )
 {
     SHVBLOCK shvVar;                   // REXX shared variable pool block
@@ -2500 +2582 @@
         sprintf( szErrorText, "%u: %s", ulError, pszContext );
     MAKERXSTRING( shvVar.shvname,  SZ_ERROR_NAME, strlen(SZ_ERROR_NAME) );
-    MAKERXSTRING( shvVar.shvvalue, szErrorText,   strlen(szErrorText) );
+    MAKERXSTRING( shvVar.shvvalue, szErrorText, strlen(szErrorText) );
     shvVar.shvnamelen  = RXSTRLEN( shvVar.shvname );
     shvVar.shvvaluelen = RXSTRLEN( shvVar.shvvalue );
     shvVar.shvcode     = RXSHV_SYSET;
     shvVar.shvnext     = NULL;
+    shvVar.shvret      = 0;             // 2016-02-26 SHL
     ulRc = RexxVariablePool( &shvVar );
-    if ( ulRc > 1 )
-        printf("Unable to set %s: rc = %d, ulRc = %x\n", shvVar.shvname.strptr, shvVar.shvret, ulRc ); /* 2015-04-23 SHL */
-}
-
-
+    // 2016-02-26 SHL Correct if
+    if ( ulRc & ~RXSHV_NEWV )
+        printf("* Unable to set %s: shvret = 0x%x, apiret = 0x%x\n", shvVar.shvname.strptr, (UCHAR)shvVar.shvret, ulRc ); // 2016-02-26 SHL Correct formatting
+}
+

rxutilex/trunk/rxutilex.def

@@ -1 +1 @@
 LIBRARY     RXUTILEX INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.1.3#@##1## 27 Jan 2016 00:26:24     REINFORCE::::::@@Extended REXX Utility Functions'
+DESCRIPTION '@#Alex Taylor:0.1.3#@##1## 30 Mar 2016 18:58:46     REINFORCE::::::@@Extended REXX Utility Functions'
 
 EXPORTS     Sys2LoadFuncs