Changeset 562 for trunk/dll/arccnrs.c

Timestamp:

Mar 15, 2007, 1:13:12 AM (18 years ago)

Author:

Gregg Young

Message:

Fixed arc viewer hang

File:

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

trunk/dll/arccnrs.c

@@ -31 +31 @@
   23 Aug 06 SHL Integrate John Small's switch list title logic
   03 Nov 06 SHL Renames
+  14 Mar 07 SHL ArcObjWndProc/UM_ENTER: delay before starting viewer
 
 ***********************************************************************/
@@ -131 +132 @@
           if (*viewer) {
             ExecOnList((HWND) 0, viewer, WINDOWED | SEPARATE |
-                       ((fViewChild) ? CHILD : 0), NULL, list, NULL);
+                         (fViewChild ? CHILD : 0),
+                       NULL, list, NULL);
           }
           else
@@ -143 +145 @@
       runemf2(SEPARATEKEEP | WINDOWED | MAXIMIZED,
               hwnd, NULL, NULL, "%s %s%s%s", ad->info->test,
-              ((needs_quoting(ad->arcname)) ? "\"" : NullStr),
-              ad->arcname, ((needs_quoting(ad->arcname)) ? "\"" : NullStr));
+              needs_quoting(ad->arcname) ? "\"" : NullStr,
+              ad->arcname,
+              needs_quoting(ad->arcname) ? "\"" : NullStr);
       break;
     }
@@ -234 +237 @@
       ret = (SHORT) stricmp(pai1->szFileName, pai2->szFileName);
     if (ret && (sortFlags & SORT_REVERSE))
-      ret = (ret > 0) ? -1 : 1;
+      ret = ret > 0 ? -1 : 1;
     return ret;
   }
@@ -387 +390 @@
               p,
               info->list,
-              (needs_quoting(arcname)) ? "\"" : NullStr,
-              arcname, (needs_quoting(arcname)) ? "\"" : NullStr, arctemp);
+              needs_quoting(arcname) ? "\"" : NullStr,
+              arcname,
+              needs_quoting(arcname) ? "\"" : NullStr,
+              arctemp);
     }
     else {
@@ -415 +420 @@
             runemf2(SEPARATE | INVISIBLE | FULLSCREEN | BACKGROUND | WAIT,
                     hwndCnr, NULL, NULL, "%s %s%s%s", info->list,
-                    (needs_quoting(arcname)) ? "\"" : NullStr, arcname,
-                    (needs_quoting(arcname)) ? "\"" : NullStr);
+                    needs_quoting(arcname) ? "\"" : NullStr,
+                    arcname,
+                    needs_quoting(arcname) ? "\"" : NullStr);
             oldstdout = fileno(stdout);
             DosError(FERR_DISABLEHARDERR);
@@ -545 +551 @@
             saymsg(MB_ENTER, hwndCnr, DEBUG_STRING,
                    "fname: %s\r\rpp: %s\r\rp: %s\r\rlonename: %s\r\rhighest: %ld\r\rx: %ld\r\rfdate: %s",
-                   (fname) ? fname : "NULL",
-                   (pp) ? pp : "NULL",
-                   (p) ? p : "NULL",
+                   fname ? fname : "NULL",
+                   pp ? pp : "NULL",
+                   p ? p : "NULL",
                    lonename, highest, x, (fdate) ? fdate : "NULL");
 #endif
@@ -574 +580 @@
               pai->pszFileName = pai->szFileName;
               pai->rc.pszIcon = pai->pszFileName;
-              pai->rc.hptrIcon = ((pai->flags & ARCFLAGS_REALDIR) != 0) ?
+              pai->rc.hptrIcon = (pai->flags & ARCFLAGS_REALDIR) != 0 ?
                 hptrDir : hptrFile;
               pai->pszDate = pai->szDate;
@@ -638 +644 @@
         sprintf(errstr, GetPString(IDS_ARCERRORINFOTEXT),
                 arcname,
-                (!gotstart) ? GetPString(IDS_NOGOTSTARTTEXT) : NullStr,
-                (!numarcfiles) ? GetPString(IDS_NOARCFILESFOUNDTEXT) :
+                !gotstart ? GetPString(IDS_NOGOTSTARTTEXT) : NullStr,
+                !numarcfiles ? GetPString(IDS_NOARCFILESFOUNDTEXT) :
                 NullStr,
-                (!gotend) ? GetPString(IDS_NOENDOFLISTTEXT) : NullStr);
+                !gotend ? GetPString(IDS_NOENDOFLISTTEXT) : NullStr);
         memset(&ad, 0, sizeof(ARCDUMP));
         ad.info = info;
@@ -943 +949 @@
         if (AcceptOneDrop(mp1, mp2))
           return MRFROM2SHORT(DOR_DROP, DO_MOVE);
-        return MRFROM2SHORT(DOR_NODROP, 0);     /* Drop not valid        */
+        return MRFROM2SHORT(DOR_NODROP, 0);     /* Drop not valid */
       case DM_DROPHELP:
         DropHelp(mp1, mp2, hwnd, GetPString(IDS_ARCCNRFOLDERDROPHELPTEXT));
@@ -1203 +1209 @@
           // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"%s %s %s\r[%s]",dcd->info->extract,dcd->arcname,membername,construct);
           runemf2(SEPARATE | WINDOWED | WAIT |
-                  ((fArcStuffVisible) ? 0 : (BACKGROUND | MINIMIZED)) |
-                  WAIT, dcd->hwndClient, construct, NULL, "%s %s%s%s %s%s%s",
+                    (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
+                    WAIT,
+                  dcd->hwndClient, construct, NULL, "%s %s%s%s %s%s%s",
                   dcd->info->extract,
-                  (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
+                  needs_quoting(dcd->arcname) ? "\"" : NullStr,
                   dcd->arcname,
-                  (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
-                  (needs_quoting(membername)) ? "\"" : NullStr,
-                  membername, (needs_quoting(membername)) ? "\"" : NullStr);
+                  needs_quoting(dcd->arcname) ? "\"" : NullStr,
+                  needs_quoting(membername) ? "\"" : NullStr,
+                  membername,
+                  needs_quoting(membername) ? "\"" : NullStr);
           if (*construct && construct[strlen(construct) - 1] != '\\')
             strcat(construct, "\\");
@@ -1329 +1337 @@
         }
         runemf2(SEPARATE | WINDOWED |
-                ((fArcStuffVisible) ? 0 : (BACKGROUND | MINIMIZED)) |
-                WAIT, dcd->hwndClient, dcd->workdir, NULL, "%s %s%s%s %s%s%s",
-                ((dcd->info->exwdirs) ? dcd->info->exwdirs :
-                 dcd->info->extract),
-                (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
+                  (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
+                  WAIT,
+                dcd->hwndClient, dcd->workdir, NULL, "%s %s%s%s %s%s%s",
+                dcd->info->exwdirs ? dcd->info->exwdirs :
+                                     dcd->info->extract,
+                needs_quoting(dcd->arcname) ? "\"" : NullStr,
                 dcd->arcname,
-                (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
-                (needs_quoting(s)) ? "\"" : NullStr,
-                s, (needs_quoting(s)) ? "\"" : NullStr);
-
+                needs_quoting(dcd->arcname) ? "\"" : NullStr,
+                needs_quoting(s) ? "\"" : NullStr,
+                s,
+                needs_quoting(s) ? "\"" : NullStr);
+
+        // printf("%s %d runemf2 returned\n", __FILE__, __LINE__); fflush(stdout);      // 10 Mar 07 SHL
         if (!dcd->info->exwdirs) {
           p = s;
@@ -1357 +1368 @@
           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 (IsFile(filename) == 1) {
+          if (fViewChild)
+            DosSleep(250);              // Allow unzip session to finish closing 14 Mar 07 SHL
           WinSendMsg(dcd->hwndCnr, UM_ENTER, MPFROMP(filename), MPVOID);
+        }
       }
     }
@@ -1430 +1445 @@
                   strlen(li->list[x]) + 5 > 1024) {
                 runemf2(SEPARATE | WINDOWED |
-                        ((fArcStuffVisible) ? 0 :
-                         (BACKGROUND | MINIMIZED)) |
-                        WAIT, hwnd, NULL, NULL, "%s", szBuffer);
+                          (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
+                          WAIT,
+                        hwnd, NULL, NULL, "%s", szBuffer);
                 *p = 0;
               }
@@ -1500 +1515 @@
               z = x;
               runemf2(SEPARATE | WINDOWED |
-                      ((fArcStuffVisible) ? 0 : (BACKGROUND | MINIMIZED)) |
-                      WAIT, hwnd, NullStr, NULL, "%s", cl);
+                        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
+                        WAIT,
+                      hwnd, NullStr, NULL, "%s", cl);
               *endofit = 0;
             } while (li->list[x]);
@@ -1601 +1617 @@
                                        && !li->info->exwdirs)) ? li->info->
                     extract : li->info->exwdirs,
-                    (needs_quoting(li->arcname)) ? "\"" : NullStr,
+                    needs_quoting(li->arcname) ? "\"" : NullStr,
                     li->arcname,
-                    (needs_quoting(li->arcname)) ? "\"" : NullStr);
+                    needs_quoting(li->arcname) ? "\"" : NullStr);
             endofit = &cl[strlen(cl)];
             z = 0;
@@ -1624 +1640 @@
               z = x;
               runemf2(SEPARATE | WINDOWED |
-                      (fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED)) |
-                      WAIT, hwnd, li->targetpath, NULL, "%s", cl);
+                        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
+                        WAIT,
+                      hwnd, li->targetpath, NULL, "%s", cl);
               *endofit = 0;
             } while (li->list[x]);
@@ -1751 +1768 @@
                   runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, NULL,
                           NULL, "%sFM2PLAY.EXE /@$FM2PLAY.$$$",
-                          (fAddUtils) ? "UTILS\\" : NullStr);
+                          fAddUtils ? "UTILS\\" : NullStr);
                 }
               }
@@ -1848 +1865 @@
                     sprintf(fullname, "%s%s%s", dcd->directory,
                             (dcd->directory[strlen(dcd->directory) - 1] ==
-                             '\\') ? NullStr : "\\", p);
+                               '\\') ? NullStr : "\\",
+                            p);
                     if (IsFile(fullname) != -1)
                       if (AddToList(fullname, &list2, &numfiles, &numalloced))
@@ -2109 +2127 @@
                 *tb ? " / " : NullStr,
                 tb,
-                (*dcd->mask.szMask) ? " (" : NullStr,
-                (*dcd->mask.szMask) ? dcd->mask.szMask : NullStr,
-                (*dcd->mask.szMask) ? ")" : NullStr, dcd->arcname);
+                *dcd->mask.szMask ? " (" : NullStr,
+                *dcd->mask.szMask ? dcd->mask.szMask : NullStr,
+                *dcd->mask.szMask ? ")" : NullStr, dcd->arcname);
         WinSetWindowText(hwndStatus, s);
         if (!ParentIsDesktop(hwnd, dcd->hwndParent)) {
@@ -2376 +2394 @@
           ULONG wmsg;
 
-          wmsg = (SHORT1FROMMP(mp1) == 0) ? UM_FILESMENU : UM_VIEWSMENU;
+          wmsg = SHORT1FROMMP(mp1) == 0 ? UM_FILESMENU : UM_VIEWSMENU;
           PortholeInit((HWND) WinSendMsg(dcd->hwndClient,
                                          wmsg, MPVOID, MPVOID), mp1, mp2);
@@ -2408 +2426 @@
       case IDM_VIEWSMENU:
         WinCheckMenuItem((HWND) mp2,
-                         IDM_MINIICONS, ((dcd->flWindowAttr & CV_MINI) != 0));
+                         IDM_MINIICONS, (dcd->flWindowAttr & CV_MINI) != 0);
         WinEnableMenuItem((HWND) mp2,
                           IDM_RESELECT, (dcd->lastselection != NULL));
@@ -2425 +2443 @@
          * add switchlist entries to end of pulldown menu
          */
-        SetupWinList((HWND) mp2,
-                     (hwndMain) ? hwndMain : (HWND) 0, dcd->hwndFrame);
+        SetupWinList((HWND)mp2,
+                     hwndMain ? hwndMain : (HWND)0, dcd->hwndFrame);
         break;
       }
@@ -2515 +2533 @@
 
       case IDM_FOLDERAFTEREXTRACT:
-        fFolderAfterExtract = (fFolderAfterExtract) ? FALSE : TRUE;
+        fFolderAfterExtract = fFolderAfterExtract ? FALSE : TRUE;
         PrfWriteProfileData(fmprof, appname, "FolderAfterExtract",
                             &fFolderAfterExtract, sizeof(BOOL));
@@ -2685 +2703 @@
         if (dcd->info->extract)
           runemf2(SEPARATE | WINDOWED |
-                  ((fArcStuffVisible) ? 0 : (BACKGROUND | MINIMIZED)),
+                    (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
                   hwnd, dcd->directory, NULL, "%s %s%s%s",
                   dcd->info->extract,
-                  (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
+                  needs_quoting(dcd->arcname) ? "\"" : NullStr,
                   dcd->arcname,
-                  (needs_quoting(dcd->arcname)) ? "\"" : NullStr);
+                  needs_quoting(dcd->arcname) ? "\"" : NullStr);
         if (SHORT1FROMMP(mp1) == IDM_ARCEXTRACTEXIT)
           PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -2699 +2717 @@
         if (dcd->info->exwdirs)
           runemf2(SEPARATE | WINDOWED |
-                  ((fArcStuffVisible) ? 0 : (BACKGROUND | MINIMIZED)),
+                    (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
                   hwnd, dcd->directory, NULL, "%s %s%s%s",
                   dcd->info->exwdirs,
-                  (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
+                  needs_quoting(dcd->arcname) ? "\"" : NullStr,
                   dcd->arcname,
-                  (needs_quoting(dcd->arcname)) ? "\"" : NullStr);
+                  needs_quoting(dcd->arcname) ? "\"" : NullStr);
         if (SHORT1FROMMP(mp1) == IDM_ARCEXTRACTWDIRSEXIT)
           PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -2773 +2791 @@
           runemf2(SEPARATEKEEP | WINDOWED | MAXIMIZED,
                   hwnd, NULL, NULL, "%s %s%s%s", dcd->info->test,
-                  (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
+                  needs_quoting(dcd->arcname) ? "\"" : NullStr,
                   dcd->arcname,
-                  (needs_quoting(dcd->arcname)) ? "\"" : NullStr);
+                  needs_quoting(dcd->arcname) ? "\"" : NullStr);
         break;
 
@@ -2920 +2938 @@
 
           pDInfo = ((PCNRDRAGINFO) mp2)->pDragInfo;
-          DrgAccessDraginfo(pDInfo);    /* Access DRAGINFO       */
-          DrgFreeDraginfo(pDInfo);      /* Free DRAGINFO         */
+          DrgAccessDraginfo(pDInfo);    /* Access DRAGINFO */
+          DrgFreeDraginfo(pDInfo);      /* Free DRAGINFO */
         }
         return 0;
@@ -2929 +2947 @@
         if (mp2) {
 
-          PDRAGITEM pDItem;     /* Pointer to DRAGITEM   */
-          PDRAGINFO pDInfo;     /* Pointer to DRAGINFO   */
+          PDRAGITEM pDItem;     /* Pointer to DRAGITEM */
+          PDRAGINFO pDInfo;     /* Pointer to DRAGINFO */
           PARCITEM pci;
 
@@ -2937 +2955 @@
             pci = NULL;
           pDInfo = ((PCNRDRAGINFO) mp2)->pDragInfo;
-          DrgAccessDraginfo(pDInfo);    /* Access DRAGINFO       */
+          DrgAccessDraginfo(pDInfo);    /* Access DRAGINFO */
           if (*dcd->arcname) {
             if ((driveflags[toupper(*dcd->arcname) - 'A'] &
@@ -2949 +2967 @@
             return MRFROM2SHORT(DOR_NODROP, 0);
           }
-          pDItem = DrgQueryDragitemPtr(pDInfo,  /* Access DRAGITEM       */
-                                       0);      /* Index to DRAGITEM     */
+          pDItem = DrgQueryDragitemPtr(pDInfo,  /* Access DRAGITEM */
+                                       0);      /* Index to DRAGITEM */
           if (DrgVerifyRMF(pDItem,      /* Check valid rendering */
-                           DRM_OS2FILE, /* mechanisms and data   */
+                           DRM_OS2FILE, /* mechanisms and data */
                            NULL) && !(pDItem->fsControl & DC_PREPARE)) {
             DrgFreeDraginfo(pDInfo);    /* Free DRAGINFO         */
-            return (MRFROM2SHORT(DOR_DROP,      /* Return okay to drop   */
-                                 ((fCopyDefault) ? DO_COPY : DO_MOVE)));
-          }
-          DrgFreeDraginfo(pDInfo);      /* Free DRAGINFO         */
-        }
-        return (MRFROM2SHORT(DOR_NEVERDROP, 0));        /* Drop not valid        */
+            return MRFROM2SHORT(DOR_DROP,       /* Return okay to drop */
+                                fCopyDefault ? DO_COPY : DO_MOVE);
+          }
+          DrgFreeDraginfo(pDInfo);      /* Free DRAGINFO */
+        }
+        return (MRFROM2SHORT(DOR_NEVERDROP, 0));        /* Drop not valid */
 
       case CN_INITDRAG:
@@ -3011 +3029 @@
           DosBeep(50, 100);             // fixme to know why beep?
           if (li) {
-            li->type = (li->type == DO_MOVE) ? IDM_ARCHIVEM : IDM_ARCHIVE;
+            li->type = li->type == DO_MOVE ? IDM_ARCHIVEM : IDM_ARCHIVE;
             strcpy(li->targetpath, dcd->arcname);
             if (!li->list ||
@@ -3065 +3083 @@
           CHAR s[CCHMAXPATHCOMP + 91], tf[81], tb[81];
 
-          pci = (PARCITEM) ((pre) ? pre->pRecord : NULL);
+          pci = (PARCITEM)(pre ? pre->pRecord : NULL);
           if (!pci) {
             if (!ParentIsDesktop(hwnd, dcd->hwndParent)) {
@@ -3188 +3206 @@
     break;
   }
-  return (dcd && dcd->oldproc) ? dcd->oldproc(hwnd, msg, mp1, mp2) :
-    PFNWPCnr(hwnd, msg, mp1, mp2);
+  return dcd && dcd->oldproc ? dcd->oldproc(hwnd, msg, mp1, mp2) :
+                               PFNWPCnr(hwnd, msg, mp1, mp2);
 }
 
@@ -3305 +3323 @@
               DRIVE_NOTWRITEABLE)))
           save_dir2(dcd->directory);
-        dcd->hwndParent = (hwndParent) ? hwndParent : HWND_DESKTOP;
+        dcd->hwndParent = hwndParent ? hwndParent : HWND_DESKTOP;
         dcd->hwndFrame = hwndFrame;
         dcd->hwndClient = hwndClient;
-        dcd->amextracted = ((flags & 1) != 0);
-        dcd->dontclose = ((flags & 4) != 0);
+        dcd->amextracted = (flags & 1) != 0;
+        dcd->dontclose = (flags & 4) != 0;
         dcd->info = info;
         dcd->sortFlags = DefArcSortFlags;