Changeset 1865 for trunk/dll/treecnr.c

Timestamp:

Aug 23, 2015, 10:36:02 PM (10 years ago)

Author:

Steven Levine

Message:

Correct WaitFleshWorkListEmpty typo that could corrupt heap
Protect some read-only strings from overwriting

File:

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

trunk/dll/treecnr.c

@@ -285 +285 @@
 
 VOID ShowTreeRec(HWND hwndCnr,
-                 CHAR *pszDir_,
+                 PCSZ pszDir_,
                  BOOL collapsefirst,
                  BOOL maketop)
@@ -299 +299 @@
   CHAR szDir[CCHMAXPATH];
 
-  DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec pszDir_ %s", pszDir_); // 2015-08-04 SHL FIXME debug
+  DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec pszDir_ \"%s\"", pszDir_); // 2015-08-04 SHL FIXME debug
 
   // already positioned to requested record?
@@ -315 +315 @@
   if (fSwitchTreeOnDirChg)
     DosSleep(200);
-  //WaitFleshWorkListEmpty(0);
 
   // 2015-08-13 SHL add retry logic 2015-08-22 GKY increase retries from 10 to 100 to
@@ -353 +352 @@
                            TRUE);               // noenv
       if (!pciP || (INT)pciP == -1) {
-        DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord(%s) returned %p", szDir, pciP); // 2015-08-04 SHL FIXME debug
+        DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord(\"%s\") returned %p", szDir, pciP); // 2015-08-04 SHL FIXME debug
         WaitFleshWorkListEmpty(szDir);          // 2015-08-19 SHL
         break;                                  // No match
       }
 
-      DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord returned %p %s", pciP, pciP->pszFileName); // 2015-08-04 SHL FIXME debug
+      DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord returned %p \"%s\"", pciP, pciP->pszFileName); // 2015-08-04 SHL FIXME debug
 
       if (!stricmp(pszDir_, pciP->pszFileName)) {
@@ -367 +366 @@
 
       if (~pciP->rc.flRecordAttr & CRA_EXPANDED) {
-        DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec expanding %s", pciP->pszFileName); // 2015-08-04 SHL FIXME debug
+        DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec expanding \"%s\"", pciP->pszFileName); // 2015-08-04 SHL FIXME debug
         WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
         DosSleep(100);                          // 2015-08-13 SHL Let PM catch up
@@ -388 +387 @@
   } // for
 
-  DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec retries %u pci %p pci->pszFileName %s",retries, pci, pci && (INT)pci != -1 ? pci->pszFileName : "(null)"); // 2015-08-04 SHL FIXME debug
+  DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec retries %u pci %p pci->pszFileName \"%s\"",retries, pci, pci && (INT)pci != -1 ? pci->pszFileName : "(null)"); // 2015-08-04 SHL FIXME debug
 
   if (found) {
@@ -431 +430 @@
     pciToSelect = pci;
     if (pciToSelect && (INT) pciToSelect != -1) {
-      DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec %p fTopDir %i maketop %i", pciToSelect, fTopDir, maketop); // 2015-08-04 SHL FIXME debug
-      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED)
+      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED) {
+        // 2015-08-23 SHL FIXME debug
+        DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec WinSendMsg(CM_EXPANDTREE, %p)", pciToSelect); // 2015-08-04 SHL FIXME debug
         WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
-      if (fTopDir || maketop)
+      }
+      if (fTopDir || maketop) {
+        // 2015-08-23 SHL FIXME debug
+        DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec ShowCnrRecord(%p) fTopDir %i maketop %i", pciToSelect, fTopDir, maketop); // 2015-08-04 SHL FIXME debug
         ShowCnrRecord(hwndCnr, (PMINIRECORDCORE)pciToSelect);
+      }
 
       if (!quickbail) {
         WaitFleshWorkListEmpty(pszDir_);        // 2015-08-19 SHL try to ensure contents stable
-        DbgMsg(pszSrcFile, __LINE__, "WinSendMsg(CM_SETRECORDEMPHASIS, CRA_SELECTED | CRA_CURSORED) \"%s\"", pszDir_); // 2015-08-04 SHL FIXME debug
+        DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec WinSendMsg(CM_SETRECORDEMPHASIS, CRA_SELECTED | CRA_CURSORED) pszDir_ \"%s\"", pszDir_); // 2015-08-04 SHL FIXME debug
         WinSendMsg(hwndCnr,
                    CM_SETRECORDEMPHASIS,
@@ -724 +728 @@
         */
         DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME cDirectoriesRestored %u", cDirectoriesRestored); // 2015-08-04 SHL FIXME debug
-        DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME %s)", mp1); // 2015-08-04 SHL FIXME debug
+        DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME \"%s\")", mp1); // 2015-08-04 SHL FIXME debug
 
         if (cDirectoriesRestored > 0)