Changeset 1308 for trunk/dll

Timestamp:

Dec 1, 2008, 12:40:08 AM (17 years ago)

Author:

Steven Levine

Message:

FreeCnrItemData: optimize and always NULL pointers
StubbyScanThread: restore else - we want all drives listed
FreeCnrItemData: report double free with Runtime_Error

File:

• trunk/dll/filldir.c (modified) (8 diffs)

trunk/dll/filldir.c

@@ -55 +55 @@
   24 Nov 08 GKY Add StubyScanThread to treecnr scan/rescan drives all on separate threads
   24 Nov 08 GKY Replace 4 pass drive scan code with StubyScanThread multithread scan
+  28 Nov 08 SHL FreeCnrItemData: optimize and always NULL pointers
+  28 Nov 08 SHL StubbyScanThread: add else lost in translation
+  30 Nov 08 SHL StubbyScanThread: restore else - we want all drives listed
+  30 Nov 08 SHL FreeCnrItemData: report double free with Runtime_Error
 
 ***********************************************************************/
@@ -92 +96 @@
 #include "wrappers.h"                   // xDosFindNext
 #include "init.h"                       // GetTidForWindow
-#include "common.h"                     // IncrThreadUsage
+#include "common.h"                     // IncrThreadUsage
 
 VOID StubbyScanThread(VOID * arg);
@@ -109 +113 @@
 CHAR *FM3Tools;
 CHAR *WPProgram;
-volatile INT  StubbyScanCount;
+volatile INT StubbyScanCount;
 
 typedef struct {
-
   PCNRITEM    pci;
-  HWND        hwndCnr;                //hwnd you want the message posted to
+  HWND        hwndCnr;                  // hwnd you want the message posted to
   HWND        hwndDrivesList;
   BOOL        RamDrive;
-
 }
 STUBBYSCAN;
@@ -192 +194 @@
 #  endif
 
-  StubbyScan = (STUBBYSCAN *) arg;
-  if (StubbyScan &&StubbyScan->pci && StubbyScan->pci->pszFileName && StubbyScan->hwndCnr) {
+  StubbyScan = (STUBBYSCAN *)arg;
+  if (StubbyScan && StubbyScan->pci && StubbyScan->pci->pszFileName && StubbyScan->hwndCnr) {
     thab = WinInitialize(0);
     if (thab) {
       hmq = WinCreateMsgQueue(thab, 0);
       if (hmq) {
-        IncrThreadUsage();
-        priority_normal();
-        StubbyScanCount ++;
-        ret = Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
-        if (ret == 0 && !StubbyScan->RamDrive) {
-          if (WinIsWindow((HAB)0, StubbyScan->hwndCnr))
-            WinSendMsg(StubbyScan->hwndCnr,
-                       CM_INVALIDATERECORD,
-                       MPFROMP(&StubbyScan->pci),
-                       MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
-        }
-        if (WinIsWindow((HAB)0, StubbyScan->hwndDrivesList))
-          WinSendMsg(StubbyScan->hwndDrivesList,
-                     LM_INSERTITEM,
-                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                     MPFROMP(StubbyScan->pci->pszFileName));
-        StubbyScanCount --;
-        WinDestroyMsgQueue(hmq);
+        IncrThreadUsage();
+        priority_normal();
+        StubbyScanCount++;
+        ret = Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
+        if (ret == 0 && !StubbyScan->RamDrive) {
+          if (WinIsWindow((HAB)0, StubbyScan->hwndCnr))
+            WinSendMsg(StubbyScan->hwndCnr,
+                       CM_INVALIDATERECORD,
+                       MPFROMP(&StubbyScan->pci),
+                       MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
+        }
+        if (WinIsWindow((HAB)0, StubbyScan->hwndDrivesList)) {
+          WinSendMsg(StubbyScan->hwndDrivesList,
+                     LM_INSERTITEM,
+                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                     MPFROMP(StubbyScan->pci->pszFileName));
+        }
+        StubbyScanCount--;
+        WinDestroyMsgQueue(hmq);
       }
       DecrThreadUsage();
@@ -1550 +1553 @@
     STUBBYSCAN *StubbyScan;
     HWND hwndDrivesList = WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
-                                          MAIN_DRIVELIST);
+                                          MAIN_DRIVELIST);
 
     //AddDrive = TRUE;
     pci = (PCNRITEM) WinSendMsg(hwndCnr,
-                                CM_QUERYRECORD,
-                                MPVOID,
-                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+                                CM_QUERYRECORD,
+                                MPVOID,
+                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
 
     while (pci && (INT)pci != -1) {
       StubbyScan = xmallocz(sizeof(STUBBYSCAN), pszSrcFile, __LINE__);
       if (!StubbyScan)
-        break;
+        break;
       StubbyScan->pci = pci;
       StubbyScan->hwndCnr = hwndCnr;
@@ -1567 +1570 @@
       StubbyScan->RamDrive = FALSE;
       pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
-                                      CM_QUERYRECORD,
-                                      MPFROMP(pci),
-                                      MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+                                      CM_QUERYRECORD,
+                                      MPFROMP(pci),
+                                      MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
       if (~pci->flags & RECFLAGS_ENV) {
-        ULONG drvNum = toupper(*pci->pszFileName) - 'A';        // 0..25
-        if (drvNum == ulCurDriveNum || drvNum >= 2) {
-          ULONG flags = driveflags[drvNum];     // Speed up
-          if (~flags & DRIVE_INVALID &&
-              ~flags & DRIVE_NOPRESCAN &&
-              (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE))
-          {
-            if (DRIVE_RAMDISK)
-              StubbyScan->RamDrive = TRUE;
-            rc = _beginthread(StubbyScanThread, NULL, 65536, StubbyScan);
-            if (rc == -1)
-              Runtime_Error(pszSrcFile, __LINE__,
-                            GetPString(IDS_COULDNTSTARTTHREADTEXT));
-          } // if drive for scanning
-          else
-            WinSendMsg(hwndDrivesList,
-                       LM_INSERTITEM,
-                       MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                       MPFROMP(pci->pszFileName));
-        }
-        else {
-          WinSendMsg(hwndCnr,
-                     CM_INVALIDATERECORD,
-                     MPFROMP(&pci),
-                     MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
-          WinSendMsg(hwndDrivesList,
-                     LM_INSERTITEM,
-                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                     MPFROMP(pci->pszFileName));
-        }
+        ULONG drvNum = toupper(*pci->pszFileName) - 'A';        // 0..25
+        if (drvNum == ulCurDriveNum || drvNum >= 2) {
+          ULONG flags = driveflags[drvNum];     // Speed up
+          if (~flags & DRIVE_INVALID &&
+              ~flags & DRIVE_NOPRESCAN &&
+              (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE))
+          {
+            if (DRIVE_RAMDISK)
+              StubbyScan->RamDrive = TRUE;
+            rc = _beginthread(StubbyScanThread, NULL, 65536, StubbyScan);
+            if (rc == -1)
+              Runtime_Error(pszSrcFile, __LINE__,
+                            GetPString(IDS_COULDNTSTARTTHREADTEXT));
+          } // if drive for scanning
+          else
+            WinSendMsg(hwndDrivesList,
+                       LM_INSERTITEM,
+                       MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                       MPFROMP(pci->pszFileName));
+        }
+        else {
+          WinSendMsg(hwndCnr,
+                     CM_INVALIDATERECORD,
+                     MPFROMP(&pci),
+                     MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
+          WinSendMsg(hwndDrivesList,
+                     LM_INSERTITEM,
+                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                     MPFROMP(pci->pszFileName));
+        }
       }
       pci = pciNext;
@@ -1739 +1742 @@
 VOID FreeCnrItemData(PCNRITEM pci)
 {
-  PSZ psz;
-  // DbgMsg(pszSrcFile, __LINE__, "FreeCnrItemData %p", pci);
-
-  if (pci->pszSubject && pci->pszSubject != NullStr) {
-    psz = pci->pszSubject;
+  if (pci->pszSubject) {
+    if (pci->pszSubject != NullStr)
+      free(pci->pszSubject);
     pci->pszSubject = NULL;             // Catch illegal references
-    free(psz);
   }
 
   // 08 Sep 08 SHL Remove excess logic
-  if (pci->pszLongName && pci->pszLongName != NullStr) {
-    psz = pci->pszLongName;
+  if (pci->pszLongName) {
+    if (pci->pszLongName != NullStr)
+      free(pci->pszLongName);
     pci->pszLongName = NULL;            // Catch illegal references
-    free(psz);
   }
 
   // Bypass free if pszDisplayName points into pszFileName buffer
   // 05 Sep 08 SHL Correct pointer overlap compare logic
-  if (pci->pszDisplayName != pci->pszFileName &&
-      pci->pszDisplayName &&
-      pci->pszDisplayName != NullStr) {
-    if (!pci->pszFileName ||
-        pci->pszDisplayName < pci->pszFileName ||
-        pci->pszDisplayName >= pci->pszFileName + _msize(pci->pszFileName))
-    {
-      psz = pci->pszDisplayName;
-      pci->pszDisplayName = NULL;       // Catch illegal references
-      free(psz);
-    }
+  if (pci->pszDisplayName) {
+    if (pci->pszDisplayName != NullStr) {
+      if (!pci->pszFileName ||
+          pci->pszDisplayName < pci->pszFileName ||
+          pci->pszDisplayName >= pci->pszFileName + _msize(pci->pszFileName))
+      {
+        free(pci->pszDisplayName);
+      }
+    }
+    pci->pszDisplayName = NULL;         // Catch illegal references
+  }
+
+  if (!pci->pszFileName)
+    Runtime_Error(pszSrcFile, __LINE__, "FreeCnrItemData attempting free %p data twice", pci);
+  else {
+    if (pci->pszFileName != NullStr)
+      free(pci->pszFileName);
+    pci->pszFileName = NULL;            // Catch illegal references
   }
 
   // 08 Sep 08 SHL Remove excess logic
-  if (pci->pszLongName && pci->pszLongName != NullStr) {
-    psz = pci->pszLongName;
+  if (pci->pszLongName) {
+    if (pci->pszLongName != NullStr)
+      free(pci->pszLongName);
     pci->pszLongName = NULL;            // Catch illegal references
-    free(psz);
-  }
-
-  if (pci->pszFileName && pci->pszFileName != NullStr) {
-    psz = pci->pszFileName;
-    pci->pszFileName = NULL;            // Catch illegal references
-    free(psz);
-  }
-
-  if (pci->pszFmtFileSize && pci->pszFmtFileSize != NullStr) {
-    psz = pci->pszFmtFileSize;
+  }
+
+  if (pci->pszFmtFileSize) {
+    if (pci->pszFmtFileSize != NullStr)
+      free(pci->pszFmtFileSize);
     pci->pszFmtFileSize = NULL;         // Catch illegal references
-    free(psz);
   }
 }
@@ -1872 +1873 @@
           Dos_Error(MB_ENTER, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
                     "DosQueryMem failed pci %p pciLast %p", pci, pciLast);
-        FreeCnrItemData(pci);
+        FreeCnrItemData(pci);
         pciLast = pci;
         pci = (PCNRITEM)pci->rc.preccNextRecord;