Changeset 24

Timestamp:

Jul 10, 2015, 3:38:28 AM (10 years ago)

Author:

Alex Taylor

Message:

Makefile improvements, some fixes to memory allocation in stem variable handling (from SHL)

Location:

rxutilex/trunk

Files:

• Makefile (modified) (1 diff)
• rxutilex.c (modified) (4 diffs)

rxutilex/trunk/Makefile

@@ -11 +11 @@
 # Set environment variable DEBUG (=anything) to build with debugging symbols
 !ifdef DEBUG
-    CFLAGS = $(CFLAGS) /Ti /Tm
-    LFLAGS = $(LFLAGS) /DEBUG
+CFLAGS = $(CFLAGS) /Ti /Tm
+LFLAGS = $(LFLAGS) /DEBUG
 !endif
 
-$(NAME).dll : $(NAME).obj
+$(NAME).dll : $(NAME).obj Makefile
                 makedesc -D"Extended REXX Utility Functions" -N"Alex Taylor" -V"^#define=SZ_VERSION,rxutilex.c" $(NAME).def
                 $(LINK) $(LFLAGS) $(NAME).obj $(NAME).def $(LIBS) /O:$@
 #                @dllrname.exe $@ CPPOM30=OS2OM30 /Q /R
 
-$(NAME).obj : $(NAME).c $(NAME).def
+$(NAME).obj : $(NAME).c $(NAME).def Makefile
                 $(CC) $(CFLAGS) /C /Ge- $(NAME).c
 

rxutilex/trunk/rxutilex.c

@@ -105 +105 @@
 
 
-// List of functions to be registered by Sys2LoadFuncs
+// List of functions to be registered by Sys2LoadFuncs or dropped by Sys2DropFuncs
+// Drop list starts at index 0, load list starts at index 1
 static PSZ RxFunctionTbl[] = {
+    "Sys2LoadFuncs",                    // Drop only 2015-05-06 sSHL
     "Sys2DropFuncs",
     "Sys2GetClipboardText",
@@ -201 +203 @@
     if ( argc > 0 ) return ( 40 );
     entries = sizeof(RxFunctionTbl) / sizeof(PSZ);
-    for ( i = 0; i < entries; i++ )
+    // 2015-05-06 SHL No need to load self (i.e. Sys2LoadFuncs), but do want to drop self
+    for ( i = 1; i < entries; i++ )
         RexxRegisterFunctionDll( RxFunctionTbl[i], SZ_LIBRARY_NAME, RxFunctionTbl[i] );
 
@@ -2291 +2294 @@
             return ( FALSE );
         }
-        DosFreeMem( prsResult->strptr );
+        // 2015-06-03 SHL dropped DosFreeMem(prsResult->strptr);
+        // 2015-06-03 SHL Pointer not allocated by DosAllocMem
         prsResult->strptr = pchNew;
     }
@@ -2320 +2324 @@
     ULONG    ulRc,
              ulBytes;
-    CHAR     szCompoundName[ US_COMPOUND_MAXZ ],
-            *pchValue;
+    CHAR     szCompoundName[ US_COMPOUND_MAXZ ];
 
     sprintf( szCompoundName, "%s.%d", pszStem, ulIndex );
     if ( pszValue == NULL ) {
-        pchValue = "";
+        pszValue = "";
         ulBytes  = 0;
     } else {
+        // 2015-06-03 SHL Was using DosAllocMem and leaking memory
+        // REXX API does not free this kind of buffer
         ulBytes = strlen( pszValue );
-        ulRc = DosAllocMem( (PVOID) &pchValue, ulBytes + 1, PAG_WRITE | PAG_COMMIT );
-        if ( ulRc != 0 ) {
-            WriteErrorCode( ulRc, "DosAllocMem");
-            return FALSE;
-        }
-        memcpy( pchValue, pszValue, ulBytes );
-    }
+        }
     MAKERXSTRING( shvVar.shvname, szCompoundName, strlen(szCompoundName) );
-    shvVar.shvvalue.strptr    = pchValue;
+    shvVar.shvvalue.strptr    = pszValue;
     shvVar.shvvalue.strlength = ulBytes;
     shvVar.shvnamelen  = RXSTRLEN( shvVar.shvname );