Changeset 1268 for trunk/dll/arccnrs.c

Timestamp:

Oct 31, 2008, 4:19:47 AM (17 years ago)

Author:

Gregg Young

Message:

Added a thread to monitor completion of unarchive to send message to open viewer fix memory allocate/free issues. It appears that it fixes ticket 58

File:

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

trunk/dll/arccnrs.c

@@ -158 +158 @@
 ULONGLONG ullDATFileSpaceNeeded;
 
+typedef struct {
+
+  CHAR filename[CCHMAXPATH];
+  HWND hwndCnr;
+}
+WAITCHILD;
+
+VOID WaitChildThread(VOID * arg)
+{
+  WAITCHILD *WaitChild;
+  ULONG clPosted;
+  HAB thab;
+  CHAR *filename;
+
+  DosError(FERR_DISABLEHARDERR);
+
+# ifdef FORTIFY
+  Fortify_EnterScope();
+#  endif
+
+  WaitChild = (WAITCHILD *) arg;
+  if (WaitChild) {
+    filename = xstrdup(WaitChild->filename, pszSrcFile, __LINE__);
+    thab = WinInitialize(0);
+    if (thab) {
+      IncrThreadUsage();
+      priority_normal();
+      DosWaitEventSem(hWaitChildSem, SEM_INDEFINITE_WAIT);
+      priority_bumped();
+      DosResetEventSem(hWaitChildSem, &clPosted);
+      if (IsFile(WaitChild->filename) == 1)
+        PostMsg(WaitChild->hwndCnr, UM_ENTER, MPFROMP(filename), MPVOID);
+      DecrThreadUsage();
+      WinTerminate(thab);
+    }
+    free(WaitChild);
+  } // if WaitChild
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+#  endif
+  _endthread();
+}
+
 static MRESULT EXPENTRY ArcErrProc(HWND hwnd, ULONG msg, MPARAM mp1,
                                    MPARAM mp2)
@@ -593 +636 @@
           }
           else {
-            runemf2(SEPARATE | INVISIBLE | FULLSCREEN | BACKGROUND | WAIT,
+            runemf2(SEPARATE | INVISIBLE | MINIMIZED | BACKGROUND | WAIT,
                     hwndCnr, pszSrcFile, __LINE__, NULL, NULL,
                     "%s %s",
@@ -1384 +1427 @@
           }
           // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"%s %s %s\r[%s]",dcd->info->extract,dcd->arcname,membername,construct);
-          runemf2(SEPARATE | WINDOWED | WAIT |
+          runemf2(SEPARATE | WINDOWED | ASYNCHRONOUS | WAIT |
                   (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
                   dcd->hwndClient, pszSrcFile, __LINE__, construct, NULL,
@@ -1503 +1546 @@
     if (dcd) {
 
-      CHAR *s = (CHAR *) mp1, *p, *pp, filename[CCHMAXPATH];
-
+      CHAR *s = (CHAR *) mp1, *p, *pp; // filename[CCHMAXPATH];
+      WAITCHILD *WaitChild;
+      APIRET rc;
+
+      WaitChild = xmallocz(sizeof(WAITCHILD), pszSrcFile, __LINE__);
+      if (!WaitChild)
+        return 0;
       if (s) {
         if (!dcd->info->extract) {
@@ -1511 +1559 @@
           return 0;
         }
-        runemf2(SEPARATE | WINDOWED | WAIT |
-                (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+        runemf2(SEPARATE | ASYNCHRONOUS | WAIT |
+                (fArcStuffVisible ? 0 : BACKGROUND),
                 dcd->hwndClient, pszSrcFile, __LINE__, dcd->workdir, NULL,
                 "%s %s %s",
@@ -1530 +1578 @@
             memmove(s, p + 1, strlen(p + 1));
         }
-        sprintf(filename, "%s\\%s", dcd->workdir, s);
-        p = filename;
+        sprintf(WaitChild->filename, "%s\\%s", dcd->workdir, s);
+        p = WaitChild->filename;
         while (*p) {
           if (*p == '/')
@@ -1537 +1585 @@
           p++;
         }
-        // printf("%s %d UM_ENTER %s %s\n",__FILE__, __LINE__,filename, s); fflush(stdout);     // 10 Mar 07 SHL hang
-        free(s);
-        if (IsFile(filename) == 1) {
-#if 1 // 06 Oct 07 SHL fixme to be gone - set to 0 for ticket #58 testing
+        //printf("%s %d UM_ENTER %s %x\n",__FILE__, __LINE__,WaitChild->filename, dcd->hwndCnr); fflush(stdout);        // 10 Mar 07 SHL hang
+        free(s);
+        WaitChild->hwndCnr = dcd->hwndCnr;
+        rc = _beginthread(WaitChildThread, NULL, 65536, WaitChild);
+        if (rc == -1)
+          Runtime_Error(pszSrcFile, __LINE__,
+                        GetPString(IDS_COULDNTSTARTTHREADTEXT));
+        //if (IsFile(filename) == 1) {
+#if 0 // 06 Oct 07 SHL fixme to be gone - set to 0 for ticket #58 testing
           if (fViewChild && fArcStuffVisible)
             DosSleep(100);  // Allow unzip session to finish closing 14 Mar 07 SHL
 #endif
-          WinSendMsg(dcd->hwndCnr, UM_ENTER, MPFROMP(filename), MPVOID);
-        }
+          //DosWaitEventSem(hWaitChildSem, SEM_INDEFINITE_WAIT);
+          //WinSendMsg(WaitChild->hwndCnr, UM_ENTER, MPFROMP(WaitChild->filename), MPVOID);
+
       }
     }
@@ -1610 +1664 @@
               if (!li->list[x] || strlen(szBuffer) +
                   strlen(li->list[x]) + 5 > MaxComLineStrg) {
-                runemf2(SEPARATE | WINDOWED |
-                        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
-                        WAIT, hwnd, pszSrcFile, __LINE__,
+                runemf2(SEPARATE | WINDOWED | ASYNCHRONOUS |
+                        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                        hwnd, pszSrcFile, __LINE__,
                         NULL, NULL, "%s", szBuffer);
                 *p = 0;
@@ -1676 +1730 @@
               }
               z = x;
-              runemf2(SEPARATE | WINDOWED | WAIT |
+              runemf2(SEPARATE | WINDOWED | ASYNCHRONOUS | WAIT |
                       (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
                       hwnd, pszSrcFile, __LINE__, NullStr, NULL, "%s", pszCmdLine);
@@ -1802 +1856 @@
               }
               z = x;
-              runemf2(SEPARATE | WINDOWED |
-                      (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
-                      WAIT, hwnd, pszSrcFile, __LINE__,
+              runemf2(SEPARATE | WINDOWED | ASYNCHRONOUS |
+                      (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                      hwnd, pszSrcFile, __LINE__,
                       li->targetpath, NULL, "%s", pszCmdLine);
               *endofit = 0;
@@ -2554 +2608 @@
 
   case UM_ENTER:
-    if (WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID))
+    if (WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID)) {
+      free(mp1);
       return 0;
+    }
     SetShiftState();
     if (dcd && (CHAR *) mp1) {
@@ -2561 +2617 @@
       SWP swp;
       CHAR *filename = mp1;
-
-      if (IsFile(filename) != 1)
-        return 0;
+      printf("%s %d UM_ENTER %s\n",__FILE__, __LINE__, filename); fflush(stdout);
+      if (IsFile(filename) != 1) {
+        free(mp1);
+        return 0;
+      }
       WinQueryWindowPos(dcd->hwndFrame, &swp);
       DefaultViewKeys(hwnd, dcd->hwndFrame, dcd->hwndParent, &swp, filename);
@@ -2569 +2627 @@
         UnHilite(hwnd, FALSE, &dcd->lastselection, 0);
     }
+    free(mp1);
     return 0;
 
@@ -2913 +2972 @@
       case IDM_ARCEXTRACT:
         if (dcd->info->extract)
-          runemf2(SEPARATE | WINDOWED |
+          runemf2(SEPARATE | WINDOWED | ASYNCHRONOUS |
                   (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
                   hwnd, pszSrcFile, __LINE__,
@@ -2925 +2984 @@
       case IDM_ARCEXTRACTWDIRS:
         if (dcd->info->exwdirs)
-          runemf2(SEPARATE | WINDOWED |
+          runemf2(SEPARATE | WINDOWED | ASYNCHRONOUS |
                   (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
                   hwnd, pszSrcFile, __LINE__,