Changeset 1339 for trunk/dll/arccnrs.c

Timestamp:

Dec 14, 2008, 3:55:04 AM (17 years ago)

Author:

Gregg Young

Message:

Waitchild changes to allow sourcefile and line of actual caller to be passed; use MaxComLineStrg for comannd line string length; allow msg for PostMsg to be passed.

File:

• trunk/dll/arccnrs.c (modified) (7 diffs)

trunk/dll/arccnrs.c

@@ -174 +174 @@
 typedef struct {
 
-  CHAR   filename[CCHMAXPATH];   //file passed as MP1 message parameter (file selected)
   HWND   hwndCnr;                //hwnd you want the message posted to
   HWND   hwndClient;             //hwnd calling this thread; NULL will work
   ULONG  RunFlags;               //runemf2 flags see systemf.h
-  CHAR   *pszDirectory;
-  CHAR   *pszEnvironment;
+  ULONG  msg;                    //Message to post
+  UINT   uiLineNumber;
+  PCSZ   pszSrcFile;
+  CHAR   filename[CCHMAXPATH];   //file passed as MP1 message parameter (file selected)
+  CHAR   *pszDirectory;          //Execution directory
+  CHAR   *pszEnvironment;        //Enviroment -- NULL passes current
+  CHAR   *pszCmdLine;             //Use sprintf to format multipart command line into single string
   CHAR   formatstring[40];       //Usally "%s"
-  CHAR   CmdLine[1024];          //Use sprintf to format multipart command line into single string
 }
 WAITCHILD;
@@ -208 +211 @@
       IncrThreadUsage();
       priority_normal();
-      ret = runemf2(WaitChild->RunFlags, WaitChild->hwndClient, pszSrcFile, __LINE__,
+      ret = runemf2(WaitChild->RunFlags, WaitChild->hwndClient,
+                    WaitChild->pszSrcFile, WaitChild->uiLineNumber,
                     WaitChild->pszDirectory, WaitChild->pszEnvironment,
-                    WaitChild->formatstring, WaitChild->CmdLine);
+                    WaitChild->formatstring, WaitChild->pszCmdLine);
       if (ret != -1) {
         if (IsFile(WaitChild->filename) == 1)
-          PostMsg(WaitChild->hwndCnr, UM_ENTER, MPFROMP(filename), MPVOID);
+          PostMsg(WaitChild->hwndCnr, WaitChild->msg, MPFROMP(filename), MPVOID);
       }
       DecrThreadUsage();
@@ -220 +224 @@
     xfree(WaitChild->pszDirectory, pszSrcFile, __LINE__);
     xfree(WaitChild->pszEnvironment, pszSrcFile, __LINE__);
+    xfree(WaitChild->pszCmdLine, pszSrcFile, __LINE__);
     free(WaitChild);
   } // if WaitChild
@@ -1585 +1590 @@
 
       WaitChild = xmallocz(sizeof(WAITCHILD), pszSrcFile, __LINE__);
+      WaitChild->pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!WaitChild)
         return 0;
@@ -1593 +1599 @@
           return 0;
         }
-        sprintf(WaitChild->CmdLine, "%s %s %s",
-                                    dcd->info->exwdirs ? dcd->info->exwdirs :
-                                    dcd->info->extract,
-                                    BldQuotedFileName(szQuotedArcName, dcd->arcname),
-                                    BldQuotedFileName(szQuotedMemberName, s));
-        /*runemf2(SEPARATE | ASYNCHRONOUS | WAIT |
-                (fArcStuffVisible ? 0 : BACKGROUND),
-                , pszSrcFile, __LINE__, dcd->workdir, NULL,
-                "%s %s %s",
-                dcd->info->exwdirs ? dcd->info->exwdirs :
-                                     dcd->info->extract,
+        sprintf(WaitChild->pszCmdLine, "%s %s %s",
+                dcd->info->exwdirs ? dcd->info->exwdirs :
+                dcd->info->extract,
                 BldQuotedFileName(szQuotedArcName, dcd->arcname),
-                BldQuotedFileName(szQuotedMemberName, s));*/
+                BldQuotedFileName(szQuotedMemberName, s));
         if (!dcd->info->exwdirs) {
           p = s;
@@ -1627 +1625 @@
         WaitChild->RunFlags = SEPARATE | ASYNCHRONOUS | WAIT |
                               (fArcStuffVisible ? 0 : BACKGROUND);
-        WaitChild->hwndClient = dcd->hwndClient;
+        WaitChild->hwndClient = dcd->hwndClient;
+        WaitChild->msg = UM_ENTER;
+        WaitChild->uiLineNumber = __LINE__;
+        WaitChild->pszSrcFile = pszSrcFile;
         WaitChild->pszDirectory = xstrdup(dcd->workdir, pszSrcFile, __LINE__);
         WaitChild->pszEnvironment = NULL;
@@ -1900 +1901 @@
                 }
               }
-              z = x;
-              runemf2(SEPARATE | WINDOWED | WAIT |
-                      (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
-                      hwnd, pszSrcFile, __LINE__,
-                      li->targetpath, NULL, "%s", pszCmdLine);
+              z = x;
+              runemf2(SEPARATE | WINDOWED | WAIT |
+                      (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                      hwnd, pszSrcFile, __LINE__,
+                      li->targetpath, NULL, "%s", pszCmdLine);
               *endofit = 0;
             } while (li->list[x]);