Changeset 989 for trunk/dll/misc.c

Timestamp:

Mar 2, 2008, 12:34:12 AM (17 years ago)

Author:

Gregg Young

Message:

Refactor fm3dll.h to create command.h; broken ini is now replaced with backup or new ini as available; more variable command line ledth changes

File:

• trunk/dll/misc.c (modified) (3 diffs)

trunk/dll/misc.c

@@ -57 +57 @@
 #include "fm3dlg.h"
 #include "fm3str.h"
-#include "pathutil.h"              // BldQuotedFileName
+#include "pathutil.h"               // BldQuotedFileName
 #include "errutil.h"                // Dos_Error...
 #include "strutil.h"                // GetPString
+#include "command.h"                // LINKCMDS
 #include "fm3dll.h"
 
@@ -962 +963 @@
 {
   EXECARGS ex;
-  CHAR cl[1001], path[CCHMAXPATH], *p;
+  CHAR path[CCHMAXPATH], *p;
+  PSZ pszCmdLine;
   APIRET ret;
   static INT lastflags = 0;
@@ -980 +982 @@
   else
     *path = 0;
-  *cl = 0;
-  BldQuotedFileName(cl, filename);
-  memset(&ex, 0, sizeof(ex));
-  ex.flags = lastflags;
-  ex.commandline = cl;
-  *ex.path = 0;
-  *ex.environment = 0;
-  ret = WinDlgBox(HWND_DESKTOP, hwnd, CmdLineDlgProc, FM3ModHandle,
-                  EXEC_FRAME, &ex);
-  if (ret == 1) {
-    lastflags = ex.flags;
-    return runemf2(ex.flags, hwnd, pszSrcFile, __LINE__, path,
-                   *ex.environment ? ex.environment : NULL,
-                   "%s", cl) != -1;
-  }
-  else if (ret != 0)
-    return -1;
+  pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (pszCmdLine) {
+    BldQuotedFileName(pszCmdLine, filename);
+    memset(&ex, 0, sizeof(ex));
+    ex.flags = lastflags;
+    ex.commandline = pszCmdLine;
+    *ex.path = 0;
+    *ex.environment = 0;
+    ret = WinDlgBox(HWND_DESKTOP, hwnd, CmdLineDlgProc, FM3ModHandle,
+                    EXEC_FRAME, &ex);
+    if (ret == 1) {
+      lastflags = ex.flags;
+      return runemf2(ex.flags, hwnd, pszSrcFile, __LINE__, path,
+                     *ex.environment ? ex.environment : NULL,
+                     "%s", pszCmdLine) != -1;
+    }
+    else if (ret != 0)
+      return -1;
+    xfree(pszCmdLine);
+  }
   return 0;
 }