Changeset 1447 for trunk/dll/treecnr.c

Timestamp:

Jul 23, 2009, 11:16:05 PM (16 years ago)

Author:

Gregg Young

Message:

Add an reposition semaphore releases for Tree scan code to avoid hangs; Bypass DosGetMessage for HIMEM builds.

File:

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

trunk/dll/treecnr.c

@@ -857 +857 @@
       DosRequestMutexSem(hmtFillingTreeCnr, SEM_INDEFINITE_WAIT);
       FillTreeCnr(dcd->hwndCnr, dcd->hwndParent);
-      DosReleaseMutexSem(hmtFillingTreeCnr);
       if (fOkayMinimize) {
         PostMsg(dcd->hwndCnr, UM_MINIMIZE, MPVOID, MPVOID);
@@ -1904 +1903 @@
             DosBeep(50, 100);
           if (hwndStatus)
-            WinSetWindowText(hwndStatus, GetPString(IDS_RESCANSUGTEXT));
+            WinSetWindowText(hwndStatus, GetPString(IDS_RESCANSUGTEXT));
+          DosReleaseMutexSem(hmtFillingTreeCnr);
           return 0;
         }
@@ -1923 +1923 @@
               }
             } // for
-            RemoveCnrItems(hwnd, pciP, 1, CMA_FREE | CMA_INVALIDATE);
+            RemoveCnrItems(hwnd, pciP, 1, CMA_FREE | CMA_INVALIDATE);
+            DosReleaseMutexSem(hmtFillingTreeCnr);
             return 0;
           }
@@ -1994 +1995 @@
             UnFlesh(hwnd, pci);
             PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-            PostMsg(hwnd, UM_SETUP2, MPFROMP(pci), MPFROMLONG(status));
+            PostMsg(hwnd, UM_SETUP2, MPFROMP(pci), MPFROMLONG(status));
+            DosReleaseMutexSem(hmtFillingTreeCnr);
             return 0;
           }
@@ -2016 +2018 @@
             if ((shiftstate & (KC_CTRL | KC_ALT)) == (KC_CTRL | KC_ALT)) {
               PostMsg(hwnd,
-                      WM_COMMAND, MPFROM2SHORT(IDM_SHOWALLFILES, 0), MPVOID);
+                      WM_COMMAND, MPFROM2SHORT(IDM_SHOWALLFILES, 0), MPVOID);
+              DosReleaseMutexSem(hmtFillingTreeCnr);
               return 0;
             }
             if ((shiftstate & (KC_CTRL | KC_SHIFT)) == (KC_CTRL | KC_SHIFT)) {
-              OpenObject(pci->pszFileName, Settings, dcd->hwndFrame);
+              OpenObject(pci->pszFileName, Settings, dcd->hwndFrame);
+              DosReleaseMutexSem(hmtFillingTreeCnr);
               return 0;
             }
             if (!(shiftstate & (KC_CTRL | KC_SHIFT))) {
               if (!ParentIsDesktop(hwnd, dcd->hwndParent)) {
-                if (FindDirCnrByName(pci->pszFileName, TRUE))
-                  return 0;
+                if (FindDirCnrByName(pci->pszFileName, TRUE)) {
+                  DosReleaseMutexSem(hmtFillingTreeCnr);
+                  return 0;
+                }
               }
             }
@@ -2048 +2054 @@
               }
               OpenObject(pci->pszFileName, s, dcd->hwndFrame);
+              DosReleaseMutexSem(hmtFillingTreeCnr);
               return 0;
             }