Changeset 563

Timestamp:

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

Author:

Steven Levine

Message:

Avoid DosStartSession viewer hangs

Location:

trunk/dll

Files:

• arccnrs.c (modified) (6 diffs)
• systemf.c (modified) (7 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 &&

trunk/dll/systemf.c

@@ -1082 +1082 @@
       }
 
-     // printf("%s %d DosStartsession thread 0x%x data\n ",
+      // printf("%s %d DosStartsession thread 0x%x data\n ",
       //       __FILE__, __LINE__,ptib->tib_ordinal); fflush(stdout);   // 10 Mar 07 SHL hang
-     // printf(" %d %d %d %s %s %s %d %d\n %s %x %x\n",
+      // printf(" %d %d %d %s %s %s %d %d\n %s %x %x\n",
       //       sdata.Length , sdata.Related, sdata.FgBg, sdata.PgmName,
-        //     sdata.PgmInputs, sdata.TermQ, sdata.InheritOpt,
-          //   sdata.SessionType, szTermQName,
-       //   hTermQ, hTermQSem); fflush(stdout);
+      //     sdata.PgmInputs, sdata.TermQ, sdata.InheritOpt,
+      //   sdata.SessionType, szTermQName,
+      //   hTermQ, hTermQSem); fflush(stdout);
       ret = DosStartSession(&sdata, &ulSessID, &sessPID);
-      if (type & WAIT) {
-       // printf("%s %d DosStartession thread 0x%x rc = %d sess = %u pid = 0x%x\n",
-       //        __FILE__, __LINE__, ptib->tib_ordinal,ret, ulSessID, sessPID); fflush(stdout); // 10 Mar 07 SHL hang
-      }
-      else {
-       // printf("%s %d DosStartession thread 0x%x nowait rc = %d\n",
-         //      __FILE__, __LINE__, ptib->tib_ordinal,ret); fflush(stdout);    // 10 Mar 07 SHL hang
-      }
+
+      // if (type & WAIT) {
+      // printf("%s %d DosStartession thread 0x%x rc = %d sess = %u pid = 0x%x\n",
+      //        __FILE__, __LINE__, ptib->tib_ordinal,ret, ulSessID, sessPID); fflush(stdout);  // 10 Mar 07 SHL hang
+      // }
+      // else {
+      // printf("%s %d DosStartession thread 0x%x nowait rc = %d\n",
+      //      __FILE__, __LINE__, ptib->tib_ordinal,ret); fflush(stdout);       // 10 Mar 07 SHL hang
+      // }
 
       if (pszDirectory && *pszDirectory)
@@ -1113 +1114 @@
           STATUSDATA sd;
           // Could not create queue - fallback - fixme to be gone?
-         // printf("%s %d waiting wo/termq\n", __FILE__, __LINE__); fflush(stdout);     // 12 Mar 07 SHL hang
+          // printf("%s %d waiting wo/termq\n", __FILE__, __LINE__); fflush(stdout);    // 12 Mar 07 SHL hang
 
           memset(&sd, 0, sizeof(sd));
@@ -1125 +1126 @@
               break;
             if (ctr > 10) {
-           //   printf("%s %d thread 0x%x showing slow sess %u pid 0x%x\n",
-             //        __FILE__, __LINE__,ptib->tib_ordinal,ulSessID,sessPID); fflush(stdout);  // 12 Mar 07 SHL
+              //   printf("%s %d thread 0x%x showing slow sess %u pid 0x%x\n",
+              //        __FILE__, __LINE__,ptib->tib_ordinal,ulSessID,sessPID); fflush(stdout); // 12 Mar 07 SHL
               ShowSession(hwnd, sessPID);       // Show every 2 seconds
               ctr = 0;
@@ -1145 +1146 @@
             else {
               if (ctr == 20) {
-               // printf("%s %d thread 0x%x showing slow sess %u pid 0x%x\n",
+                // printf("%s %d thread 0x%x showing slow sess %u pid 0x%x\n",
                 //       __FILE__, __LINE__,ptib->tib_ordinal,ulSessID,sessPID); fflush(stdout);
                 ShowSession(hwnd, sessPID);             // Show long running session
               }
-             // printf("%s %d thread 0x%x waiting for slow sess %u pid 0x%x\n",
-               //      __FILE__, __LINE__,ptib->tib_ordinal,ulSessID, sessPID); fflush(stdout);
               rc = DosReadQueue(hTermQ, &rq, &ulLength, (PPVOID)&pTermInfo, 0,
                                 DCWW_WAIT, &bPriority, 0);
@@ -1162 +1161 @@
             }
 
-          //  printf("%s %d DosReadQueue thread 0x%x sess %u sessRC %u rq.pid 0x%x rq.data 0x%x\n",
+            //  printf("%s %d DosReadQueue thread 0x%x sess %u sessRC %u rq.pid 0x%x rq.data 0x%x\n",
             //       __FILE__, __LINE__,ptib->tib_ordinal,pTermInfo->usSessID,pTermInfo->usRC,rq.pid, rq.ulData); fflush(stdout);
 
-            // might be looping here if confused about session id - fixme to ensure not possible?
             if (pTermInfo->usSessID == ulSessID)
               break;                    // Our session is done
@@ -1172 +1170 @@
             {
               static ULONG ulLastSessID;
-             // printf("%s %d requeue thread 0x%x our sess %u term sess %u term rc %u\n",
+              // printf("%s %d requeue thread 0x%x our sess %u term sess %u term rc %u\n",
               //       __FILE__, __LINE__,ptib->tib_ordinal,ulSessID,pTermInfo->usSessID,pTermInfo->usRC); fflush(stdout);
               // fixme to be gone when no longer needed for debug?
@@ -1188 +1186 @@
 
           ret = pTermInfo->usRC == 0;           // Set 1 if rc 0 else 0
-         // printf("%s %d thread 0x%x term for sess %u\n",
-           //      __FILE__, __LINE__,ptib->tib_ordinal,ulSessID);fflush(stdout);
+          // printf("%s %d thread 0x%x term for sess %u\n",
+          //      __FILE__, __LINE__,ptib->tib_ordinal,ulSessID);fflush(stdout);
           DosFreeMem(pTermInfo);
         }