Changeset 985 for trunk/dll/systemf.c

Timestamp:

Mar 1, 2008, 2:37:14 AM (17 years ago)

Author:

Gregg Young

Message:

Update sizes dialog (ticket 44); Make max command line length user settable (ticket 199); use xfree for free in most cases (ticket 212); initial code to check for valid ini file (ticket 102); Some additional refactoring and structure rework; Some documentation updates;

File:

• trunk/dll/systemf.c (modified) (12 diffs)

trunk/dll/systemf.c

@@ -20 +20 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Changes to enable user settable command line length
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -37 +40 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   //targetdirectory
 #include "pathutil.h"
 #include "fm3dll.h"
@@ -80 +84 @@
   /* executes the command once for all files in list */
 
-  char path[CCHMAXPATH], commandline[MAXCOMLINESTRG], modpath[CCHMAXPATH], listfile[CCHMAXPATH],
+  char path[CCHMAXPATH], *commandline, modpath[CCHMAXPATH], listfile[CCHMAXPATH],
        *p, *pp, drive, *file, *ext, *dot;
   register int x;
@@ -89 +93 @@
     return -1;
   }
+  commandline = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!commandline)
+    return -1; //already complained
   *listfile = 0;
   bstrip(command);
@@ -590 +597 @@
       ret = WinDlgBox(HWND_DESKTOP, hwnd, CmdLineDlgProc, FM3ModHandle,
                       EXEC_FRAME, &ex);
-      if (ret != 1)
-        return (ret == 0) ? -1 : -2;
+      if (ret != 1) {
+        xfree(commandline);
+        return (ret == 0) ? -1 : -2;
+      }
     }
     else
@@ -673 +682 @@
 
   rc = DosAllocMem((PVOID)&pszPgm,
-                   MAXCOMLINESTRG,
+                   MaxComLineStrg,
                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc) {
@@ -718 +727 @@
       if (temp) {
         rc = DosAllocMem((PVOID)&pszArgs,
-                         MAXCOMLINESTRG * 2,
+                         MaxComLineStrg * 2,
                          PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
         if (rc)
@@ -851 +860 @@
       if (~type & FULLSCREEN)
         type |= WINDOWED;
-      rc = DosAllocMem((PVOID) & pszArgs, MAXCOMLINESTRG * 2,
+      rc = DosAllocMem((PVOID) & pszArgs, MaxComLineStrg * 2,
                        PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
       if (rc) {
@@ -1234 +1243 @@
     ulOptions |= SAF_STARTCHILDAPP;
 
-  executable = xmallocz(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+  executable = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (executable) {
     va_start(parguments, formatstring);
@@ -1241 +1250 @@
     strip_lead_char(" \t", executable);
     if (*executable) {
-      parameters = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+      parameters = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (parameters) {
         p = executable;
@@ -1293 +1302 @@
               strcpy(executable, GetCmdSpec(FALSE));
             }
-            free(temp);
+            xfree(temp);
           }
         }
@@ -1307 +1316 @@
         pgd.swpInitial.hwndInsertBehind = HWND_TOP;
         happ = WinStartApp(hwndNotify, &pgd, NULL, NULL, ulOptions);
-        free(parameters);
+        xfree(parameters);
       }
     }
-    free(executable);
+    xfree(executable);
   }
   return happ;