Changeset 563 for trunk/dll/arccnrs.c

Timestamp:

Mar 15, 2007, 6:21:34 AM (18 years ago)

Author:

Steven Levine

Message:

Avoid DosStartSession viewer hangs

File:

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

trunk/dll/arccnrs.c

@@ -132 +132 @@
           if (*viewer) {
             ExecOnList((HWND) 0, viewer, WINDOWED | SEPARATE |
-                         (fViewChild ? CHILD : 0),
+                         (fViewChild ? CHILD : 0),
                        NULL, list, NULL);
           }
@@ -379 +379 @@
     DosError(FERR_DISABLEHARDERR);
     if (!DosQAppType(s, &apptype) &&
-        ((apptype & FAPPTYP_DOS) ||
-         (apptype & FAPPTYP_WINDOWSREAL) ||
-         (apptype & FAPPTYP_WINDOWSPROT) || (apptype & 0x1000))) {
+        (apptype & FAPPTYP_DOS ||
+         apptype & FAPPTYP_WINDOWSREAL ||
+         apptype & FAPPTYP_WINDOWSPROT ||
+         apptype & FAPPTYP_WINDOWSPROT31)) {
       p = GetCmdSpec(TRUE);
       runemf2(SEPARATE | INVISIBLE | MINIMIZED | BACKGROUND | WAIT,
@@ -1347 +1348 @@
                 needs_quoting(s) ? "\"" : NullStr,
                 s,
-                needs_quoting(s) ? "\"" : NullStr);
+                needs_quoting(s) ? "\"" : NullStr);
 
         // printf("%s %d runemf2 returned\n", __FILE__, __LINE__); fflush(stdout);      // 10 Mar 07 SHL
@@ -2157 +2158 @@
         }
       }
-      if ((dcd->arcfilled &&
-           !dcd->totalfiles) || !IsArcThere(hwnd, dcd->arcname))
+      if ((dcd->arcfilled && !dcd->totalfiles) ||
+          !IsArcThere(hwnd, dcd->arcname))
         PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
     }
@@ -2526 +2527 @@
           hwndActive = WinQueryFocus(HWND_DESKTOP);
           WinSetFocus(HWND_DESKTOP,
-                      ((hwndActive == hwnd) ?
-                       WinWindowFromID(dcd->hwndClient, ARC_EXTRACTDIR) :
-                       hwnd));
+                      hwndActive == hwnd ?
+                        WinWindowFromID(dcd->hwndClient, ARC_EXTRACTDIR) :
+                        hwnd);
         }
         break;
@@ -2674 +2675 @@
               (!fExternalCollector && !strcmp(realappname, FM3Str)))
             GetNextWindowPos(dcd->hwndParent, &swp, NULL, NULL);
-          hwndC = StartCollector((fExternalCollector ||
-                                  strcmp(realappname, FM3Str)) ?
-                                 HWND_DESKTOP : dcd->hwndParent, 4);
+          hwndC = StartCollector(fExternalCollector ||
+                                   strcmp(realappname, FM3Str) ?
+                                     HWND_DESKTOP : dcd->hwndParent, 4);
           if (hwndC) {
             if (!ParentIsDesktop(hwnd, dcd->hwndParent) && !fAutoTile &&