Changeset 1896

Timestamp:

Aug 14, 2022, 9:12:03 PM (3 years ago)

Author:

Gregg Young

Message:

Attempt to fix tree container corruption and rare trap when both switch on focaus change and switch on directory change are enabled.

Location:

trunk/dll

Files:

• findrec.c (modified) (1 diff)
• treecnr.c (modified) (8 diffs)

trunk/dll/findrec.c

@@ -66 +66 @@
   pci = WinSendMsg(hwndCnr,
                    CM_SEARCHSTRING, MPFROMP(&srch), MPFROMP(pciParent));
-  while (pci && (INT) pci != -1) {
+  while (pci && (INT) pci != -1 && pci->pszFileName) {
     if (!noenv || (pci->flags & (RECFLAGS_ENV | RECFLAGS_UNDERENV)) == 0) {
       // CNRITEM for file/directory

trunk/dll/treecnr.c

@@ -724 +724 @@
       Fortify_BecomeOwner(mp1);
 #     endif
+      xDosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
       dcd = INSTDATA(hwnd);
       if (dcd) {
@@ -749 +750 @@
       }
       free((CHAR *)mp1);
+      xDosReleaseMutexSem(hmtxFM2Globals);
     }
     return 0;
@@ -835 +837 @@
       CHAR **list = (CHAR **) mp1;
 
+      xDosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
       while (list[numentries])
         numentries++;
       if (numentries)
         UpdateCnrList(dcd->hwndCnr, list, numentries, TRUE, dcd);
+      xDosReleaseMutexSem(hmtxFM2Globals);
     }
     return 0;
@@ -901 +905 @@
       ULONG type;
 
+      xDosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
       strcpy(s, GetPString(IDS_TREETEXT));
       memset(&cnri, 0, sizeof(CNRINFO));
@@ -909 +914 @@
       if (cnri.cRecords) {
         sprintf(s, GetPString(IDS_NUMDRIVESTEXT), cnri.cRecords);
-        if (pci && (INT) pci != -1) { 
-          if (!(driveflags[toupper(*pci->pszFileName) - 'A'] &
-                DRIVE_REMOVABLE) ||
-              driveserial[toupper(*pci->pszFileName) - 'A'] != -1) {
+        if (pci && (INT) pci != -1 && pci->pszFileName) {
+            if (driveserial[toupper(*pci->pszFileName) - 'A'] != -1
+                || !(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_REMOVABLE)) {
             memset(&volser, 0, sizeof(volser));
             DosError(FERR_DISABLEHARDERR);
@@ -995 +999 @@
       if (dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent))
         WinSetWindowText(hwndStatus, s);
+      xDosReleaseMutexSem(hmtxFM2Globals);
     }
     return 0;
@@ -1004 +1009 @@
       Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
+      xDosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
       RemoveCnrItems(dcd->hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
       WinSendMsg(dcd->hwndCnr,
@@ -1019 +1025 @@
                  MPVOID, MPFROM2SHORT(0, CMA_ERASE | CMA_REPOSITION));
       PostMsg(dcd->hwndCnr, UM_RESCAN, MPVOID, MPVOID);
+      xDosReleaseMutexSem(hmtxFM2Globals);
     }
     return 0;