Changeset 1877

Timestamp:

Oct 11, 2015, 11:43:27 PM (10 years ago)

Author:

Gregg Young

Message:

Remove debug code

Location:

trunk/dll

Files:

• arccnrs.c (modified) (4 diffs)
• assoc.c (modified) (1 diff)
• command.c (modified) (1 diff)
• comp.c (modified) (5 diffs)
• copyf.c (modified) (3 diffs)
• defview.c (modified) (1 diff)
• dircnrs.c (modified) (19 diffs)
• draglist.c (modified) (2 diffs)
• eas.c (modified) (3 diffs)
• filldir.c (modified) (14 diffs)
• findrec.c (modified) (2 diffs)
• flesh.c (modified) (20 diffs)
• flesh.h (modified) (1 diff)
• init.c (modified) (6 diffs)
• mainwnd.c (modified) (9 diffs)
• mainwnd2.c (modified) (1 diff)
• mkdir.c (modified) (1 diff)
• notebook.c (modified) (1 diff)
• notify.c (modified) (1 diff)
• seeall.c (modified) (12 diffs)
• strutil.c (modified) (6 diffs)
• systemf.c (modified) (2 diffs)
• treecnr.c (modified) (22 diffs)
• valid.c (modified) (1 diff)
• viewinf.c (modified) (1 diff)
• walkem.c (modified) (2 diffs)
• worker.c (modified) (1 diff)
• wrappers.c (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -502 +502 @@
 static VOID FreeArcItemData(PARCITEM pai)
 {
-  // DbgMsg(pszSrcFile, __LINE__, "FreeArcItemData %p", pai);
   PSZ psz;
 
@@ -547 +546 @@
     }
   }
-
-  // DbgMsg(pszSrcFile, __LINE__, "RemoveArcItems %p %u %s", pai, usCnt, pai->pszFileName);
-
   if (remaining != - 1) {
-    remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&paiFirst), MPFROM2SHORT(usCnt, usFlags));
+    remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&paiFirst),
+                                MPFROM2SHORT(usCnt, usFlags));
     if (remaining == -1) {
-      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x pai %p cnt %u",
+      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,
+                "CM_REMOVERECORD hwnd %x pai %p cnt %u",
                 hwnd, paiFirst, usCnt);
     }
@@ -703 +701 @@
           else {
             rc = 0;
-            //DbgMsg(pszSrcFile, __LINE__, "Number of tries %i", cnter);
             rc = SearchPathForFile(PCSZ_PATH, s, NULL);
             if (!rc) {
@@ -3032 +3029 @@
             stricmp(lastextractpath, dcd->directory)) {
           strcpy(lastextractpath, dcd->directory);
-          //DbgMsg(pszSrcFile, __LINE__, "Extract dir %s", dcd->directory);
           SetDir(dcd->hwndParent, hwnd, dcd->directory, 1);
         }

trunk/dll/assoc.c

@@ -528 +528 @@
           dieafter = TRUE;
         flags &= (~DIEAFTER);
-        //DbgMsg(pszSrcFile, __LINE__, "env %s", info->env);
         rc = ExecOnList(hwnd,
                         info->pszCmdLine,

trunk/dll/command.c

@@ -839 +839 @@
    else
      temp->HotKeyID = 0;
-   //DbgMsg(pszSrcFile, __LINE__, "info %i", temp->HotKeyID);
    return TRUE;
 }

trunk/dll/comp.c

@@ -249 +249 @@
       if (fp) {
         fprintf(fp, "\"%s\"\n", sf->dirname);
-        //DbgMsg(pszSrcFile, __LINE__, "recurse %i", sf->recurse);
         SnapShot(sf->dirname, fp, sf->recurse);
         fclose(fp);
@@ -1663 +1662 @@
       FillDirList(cmp->leftdir, lenl, cmp->includesubdirs,
                   &filesl, &cmp->cmp->totalleft, &numallocl);
-
       if (filesl)
         qsort(filesl, cmp->cmp->totalleft, sizeof(CHAR *), CompNames);
-
       // Build list of all files in right directory
-      //DbgMsg(pszSrcFile, __LINE__, "list file %s", cmp->rightlist);
       if (!*cmp->rightlist) {
         if (fForceLower)
@@ -1730 +1726 @@
             if (cmp->rightdir[strlen(cmp->rightdir) - 1] != '\\')
               lenr++;
-            //DbgMsg(pszSrcFile, __LINE__, "end of file %i", feof(fp));
             while (!feof(fp)) {
               if (!xfgets_bstripcr
@@ -1751 +1746 @@
                       if (p) {
                         p++;
-                        //DbgMsg(pszSrcFile, __LINE__, "DS %ul comma %ul", strchr(p, '/') ? strchr(p, '/') : strchr(p, DateSeparator[0]),  strchr(p, ','));
                         if (((strchr(p, '/') ? strchr(p, '/') : strchr(p, DateSeparator[0])) - strchr(p, ',')) > 5) {
                           CHAR szTemp[30];
@@ -3226 +3220 @@
               strcpy(sf->dirname, cmp->rightdir);
             sf->recurse = WinQueryButtonCheckstate(hwnd, COMP_INCLUDESUBDIRS);
-            //DbgMsg(pszSrcFile, __LINE__, "recurse %i %i", sf->recurse, cmp->includesubdirs);
+
             if (xbeginthread(StartSnapThread,
                              65536,

trunk/dll/copyf.c

@@ -696 +696 @@
   FILESTATUS3 fsi;
 
-  //DbgMsg(pszSrcFile, __LINE__, "error %i ", error);
   DosError(FERR_DISABLEHARDERR);
   rc = DosQueryPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi));
@@ -707 +706 @@
                      GetPString(IDS_READONLYFILEWARNING),
                       filename);
-      //DbgMsg(pszSrcFile, __LINE__, "retrn %x ", retrn);
       ret = retrn;
       if (retrn == SM2_YES || retrn == SM2_DONTASK)
@@ -739 +737 @@
       ret = SM2_NO;
   }
-  //DbgMsg(pszSrcFile, __LINE__, "retrn %x ", ret);
   return ret;
 }

trunk/dll/defview.c

@@ -160 +160 @@
 
   // if identified and not FOURCC_DOS  MPEGs are misidentified as DOS
-  //DbgMsg(pszSrcFile, __LINE__, "FOUCC %x %s %i", mmFormatInfo.fccIOProc,
-  //       mmFormatInfo.szDefaultFormatExt, mmFormatInfo.ulMediaType);
   if (!rc && (mmFormatInfo.fccIOProc != FOURCC_DOS ||
               !stricmp(p, PCSZ_DOTMPG) || !stricmp(p, PCSZ_DOTMPEG))) {

trunk/dll/dircnrs.c

@@ -915 +915 @@
       if (hwndTree) {
         // 2015-08-12 SHL Optimze to update drive tree for only last saved state
-
-#if 0        // 2015-08-13 SHL
-        if (fSwitchTreeOnDirChg)
-          DbgMsg(pszSrcFile, __LINE__, "DirObjWndProc UM_RESCAN cDirectoriesRestored %u", cDirectoriesRestored); // 2015-08-04 SHL FIXME debug
-#endif
         if (fSwitchTreeOnDirChg) {
           // Keep drive tree in sync with directory container
@@ -927 +922 @@
             if (hwndMain) {
               if (TopWindow(hwndMain, (HWND)0) == dcd->hwndFrame) {
-                //DbgMsg(pszSrcFile, __LINE__, "DirObjWndProc UM_RESCAN PostMsg(UM_SHOWME)"); // 2015-08-04 SHL FIXME debug
                 if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
                   free(pszTempDir);
@@ -933 +927 @@
             }
             else {
-              //DbgMsg(pszSrcFile, __LINE__, "DirObjWndProc UM_RESCAN PostMsg(UM_SHOWME)"); // 2015-08-04 SHL FIXME debug
               if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
                 free(pszTempDir);
@@ -1445 +1438 @@
       if (fSwitchTreeOnFocus && hwndTree && dcd && *dcd->directory) {
         PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
-        //DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc WM_SETFOCUS cDirectoriesRestored %u", cDirectoriesRestored); // 2015-08-04 SHL FIXME debug
         if (pszTempDir) {
-          //DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc WM_SETFOCUS PostMsg(UM_SHOWME, %s)", pszTempDir); // 2015-08-04 SHL FIXME debug
           if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
             free(pszTempDir);           // Failed
@@ -1466 +1457 @@
           strcpy(dcd->previous, dcd->directory);
           strcpy(dcd->directory, fullname);
-          // DosEnterCritSec(); // GKY 11-27-08
           dcd->stopflag++;
-          // DosExitCritSec();
-          // DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
           if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) {
             strcpy(dcd->directory, dcd->previous);
-            // DosEnterCritSec(); // GKY 11-27-08
             dcd->stopflag--;
-            // DosExitCritSec();
           }
           else if (*dcd->directory) {
@@ -1490 +1476 @@
   case WM_TIMER:
     // Started/stopped by DirObjWndPro
-    // dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (dcd) {
       commafmt(tb, sizeof(tb), dcd->totalfiles);
       CommaFmtULL(tf, sizeof(tf), dcd->ullTotalBytes, 'K');
       sprintf(s, "%s / %s", tb, tf);
-      // DbgMsg(pszSrcFile, __LINE__, "WM_TIMER %s", s);        // 15 Sep 09 SHL fixme debug
       WinSetDlgItemText(dcd->hwndClient, DIR_TOTALS, s);
     }
@@ -1674 +1658 @@
         }
         else
-          DosSleep(32); // 05 Aug 07 GKY 64
+          DosSleep(32); 
         WinEnableMenuItem(DirCnrMenu, IDM_FINDINTREE, (hwndTree != (HWND) 0));
       }
@@ -1688 +1672 @@
   case UM_SETUP2:
     if (dcd) {
-      // DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc UM_SETUP2 %x", hwnd);
       AdjustCnrColsForPref(hwnd, NULL, &dcd->ds, FALSE);
       SayFilter(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
@@ -1986 +1969 @@
 
           if (pszTempDir) {
-            //DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc IDM_FINDINTREE PostMsg(UM_SHOWME)"); // 2015-08-04 SHL FIXME debug
             if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir),
                             MPFROMLONG(1L)))
@@ -2373 +2355 @@
 
       case IDM_RESCAN:
-        dcd->stopflag++;;
-        // DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
+        dcd->stopflag++;
         if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPVOID)) {
           dcd->stopflag--;
@@ -2509 +2490 @@
           strcpy(dcd->directory, (CHAR *)mp2);
           dcd->stopflag++;
-          //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
           if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) {
             strcpy(dcd->directory, dcd->previous);
@@ -2539 +2519 @@
               strcpy(dcd->directory, tempname2);
               dcd->stopflag++;
-              //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
               if (!PostMsg(dcd->hwndObject,
                            UM_RESCAN, MPVOID, MPFROMLONG(1L))) {
@@ -2567 +2546 @@
             strcpy(dcd->directory, dcd->previous);
             strcpy(dcd->previous, tempname);
-            dcd->stopflag++; ;
-            //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
+            dcd->stopflag++;
             if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) {
               strcpy(dcd->directory, dcd->previous);
@@ -2602 +2580 @@
             strcpy(dcd->directory, newdir);
             dcd->stopflag++;
-            //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
             if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) {
               strcpy(dcd->directory, dcd->previous);
@@ -2878 +2855 @@
                   // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg
                   // 2015-09-26 GKY Waits (WaitFleshWorkListEmpty) in object window
-                  DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
                   if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && AddFleshWorkRequest(hwnd, pci, eFlesh) &&
                       !dcd->suspendview && fTopDir) {
                     PostMsg(dcd->hwndObject, UM_TOPDIR, MPFROMP(pci), MPVOID);
-                    DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
                   }
                 }
@@ -2889 +2864 @@
             }
             else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
-              DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
               if (AddFleshWorkRequest(hwnd, pci, eFlesh) && !dcd->suspendview &&
                   fTopDir) {
@@ -2895 +2869 @@
                 // 2015-09-26 GKY Waits (WaitFleshWorkListEmpty) in object window
                 PostMsg(dcd->hwndObject, UM_TOPDIR, MPFROMP(pci), MPVOID);
-                DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
               }
             }
@@ -3454 +3427 @@
                   strcpy(dcd->directory, pci->pszFileName);
                   dcd->stopflag++;
-                  //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
                   if (!PostMsg(dcd->hwndObject,
                                UM_RESCAN, MPVOID, MPFROMLONG(1))) {
@@ -3498 +3470 @@
               else {
                 dcd->stopflag++;
-                //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
                 if (!PostMsg(dcd->hwndObject,
                              UM_RESCAN, MPVOID, MPFROMLONG(1L))) {

trunk/dll/draglist.c

@@ -373 +373 @@
       ok = ok && pDItem->hstrTargetName;
       if (!ok) {
-        //DbgMsg(pszSrcFile, __LINE__, "DrgAddStrHandle failed at %lu for %s", ulNumfiles, szFile);
         // If we have string handle add overflow, release corrupt DragItem
         // We release 3 more to work around 1st time drag failure reported by Gregg
@@ -488 +487 @@
         ok = ok && pDItem->hstrTargetName;
         if (!ok) {
-          //DbgMsg(pszSrcFile, __LINE__, "DrgAddStrHandle failed at %lu for %s", ulNumfiles, szFile);
           // If we have string handle add overflow, release corrupt DragItem
           // We release 3 more to work around 1st time drag failure reported by Gregg

trunk/dll/eas.c

@@ -1061 +1061 @@
   CHAR *p, *peaval;
 
-  //DbgMsg(pszSrcFile, __LINE__, "SaveEA: entered for %s", filename);
-
   if (!filename || !current)
     return (PVOID)pfealist;             // FIXME to complain
@@ -1217 +1215 @@
         memcmp(current->pfea->szName + current->pfea->cbName + 1,
                pfealist->list[0].szName + pfealist->list[0].cbName + 1,
-               current->pfea->cbValue) == 0)
-    {
-      DbgMsg(pszSrcFile, __LINE__, "SaveEA: %s unchanged", current->pfea->szName);
+               current->pfea->cbValue) == 0) {
+      //DbgMsg(pszSrcFile, __LINE__, "SaveEA: %s unchanged", current->pfea->szName);
       rc = 0;                           // Suppress rewrite
     }
@@ -1225 +1222 @@
       rc = xDosSetPathInfo(filename, FIL_QUERYEASIZE,
                            &eaop, sizeof(eaop), DSPI_WRTTHRU);
-      DbgMsg(pszSrcFile, __LINE__, "SaveEA: %s updated", current->pfea->szName);
+      //DbgMsg(pszSrcFile, __LINE__, "SaveEA: %s updated", current->pfea->szName);
     }
 #else

trunk/dll/filldir.c

@@ -397 +397 @@
           if (pgeaPrev) {
             pgeaPrev->oNextEntryOffset = (PSZ)pgea - (PSZ)pgeaPrev;
-            //DbgMsg(pszSrcFile, __LINE__, "pgea %p oNextEntryOffset %u", pgeaPrev, pgeaPrev->oNextEntryOffset);
           }
           strcpy(pgea->szName, pcsz);
           pgea->cbName = strlen(pgea->szName);
           pgea->oNextEntryOffset = 0;
-          //DbgMsg(pszSrcFile, __LINE__, "pgea %p cbName %u szName %s", pgea, pgea->cbName, pgea->szName);
           offset = sizeof(GEA2) + pgea->cbName; // Calc length including null
           offset = (offset + 3) & ~3;           // Doubleword align
@@ -409 +407 @@
         }
       } // for
-
       pgealist->cbList = (PSZ)pgea - (PSZ)pgealist;
-      //DbgMsg(pszSrcFile, __LINE__, "pgealist %p cbList %u", pgealist, pgealist->cbList);
-
       pfealist = xmallocz(65536, pszSrcFile, __LINE__);
       if (pfealist) {
@@ -429 +424 @@
                     s, pci->pszFileName);
         }
-          //DbgMsg(pszSrcFile, __LINE__, "DosQueryPathInfo %s failed with rc %u ", pci->pszFileName, rc);
         else {
           PFEA2 pfea = eaop.fpFEA2List->list;
@@ -439 +433 @@
                           GetPString(IDS_ERROREATYPETEXT),
                           achValue, pfea->cbName, pfea->szName);
-                //DbgMsg(pszSrcFile, __LINE__, "EA type 0x%x unexpected for %.*s", achValue, pfea->cbName, pfea->szName);
               else {
                 CHAR ch = achValue[pfea->cbValue];
@@ -446 +439 @@
                 pszValue = xstrdup(achValue + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
                 achValue[pfea->cbValue] = ch;
-                //DbgMsg(pszSrcFile, __LINE__, "pfea %p %.*s cbValue %u %s", pfea, pfea->cbName, pfea->szName, pfea->cbValue, pszValue);
                 if (strncmp(pfea->szName, LONGNAME, pfea->cbName) == 0)
                   pci->pszLongName = pszValue;
@@ -454 +446 @@
                   Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
                             GetPString(IDS_ERROREATYPETEXT), pfea, pfea->cbName, pfea->szName);
-                  //DbgMsg(pszSrcFile, __LINE__, "pfea %p EA %.*s unexpected", pfea, pfea->cbName, pfea->szName);
               }
             }
@@ -772 +763 @@
   else {
     pci->pszFmtFileSize = NullStr;
-    //DbgMsg(pszSrcFile, __LINE__, "Bypassed Format size %s", pci->pszDisplayName);
   }
   pci->date.day = pfsa4->fdateLastWrite.day;
@@ -1205 +1195 @@
     while (pci && (INT)pci != -1) {
       if (!pci->pszFileName || !strcmp(pci->pszFileName, NullStr)) {
-        // 2015-08-23 SHL FIXME debug
-        //DbgMsg(pszSrcFile, __LINE__, "ProcessDirectory pci %p pci->pszFileName %p %s",
-        //       pci, pci->pszFileName,
-        //       pci->pszFileName == NullStr ? "NullStr" : "NULL");
         Runtime_Error(pszSrcFile, __LINE__, "pci->pszFileName NULL for %p", pci);
         return;
@@ -1281 +1267 @@
   ULONG startdrive = 3;
   HWND hwndDrivelist;
-
   static BOOL didonce;
   static ULONG ulLastDriveMap;
-
-  //DbgMsg(pszSrcFile, __LINE__, "FillTreeCnr hwndCnr %x hwndParent %x", hwndCnr, hwndParent);   // 2015-08-03 SHL FIXME debug
 
   *szSuggest = 0;
@@ -1708 +1691 @@
       }
     }
-    // DbgMsg(pszSrcFile, __LINE__, "szSuggest %x info %x", *szSuggest, info);
     if (*szSuggest) {
       APIRET rc;
@@ -1768 +1750 @@
   } // if !fDontSuggestAgain
   didonce = TRUE;
-
-  //DbgMsg(pszSrcFile, __LINE__, "FillTreeCnr finished");        // 2015-08-03 SHL FIXME debug
-
 } // FillTreeCnr
 
@@ -1926 +1905 @@
 VOID FreeCnrItem(HWND hwnd, PCNRITEM pci)
 {
-  // DbgMsg(pszSrcFile, __LINE__, "FreeCnrItem hwnd %x pci %p", hwnd, pci);
-
   FreeCnrItemData(pci);
 
@@ -2024 +2001 @@
         if (remaining && --remaining == 0)
           break;
-        if (!bIdlePrioritySet /* && --usTimerCheckCountdown == 0 */) {
+        if (!bIdlePrioritySet) {
           bIdlePrioritySet = !IdleIfNeeded(&itdSleep, 30);
-          // usTimerCheckCountdown = RCI_ITEMS_PER_TIMER_CHECK;
         }
       } // while
@@ -2035 +2011 @@
     }
   }
-
-  // DbgMsg(pszSrcFile, __LINE__, "RemoveCnrItems %p %u %s", pci, usCnt, pci->pszFileName);
-
   if (remaining != - 1) {
     remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pciFirst), MPFROM2SHORT(usCnt, usFlags));

trunk/dll/findrec.c

@@ -66 +66 @@
   pci = WinSendMsg(hwndCnr,
                    CM_SEARCHSTRING, MPFROMP(&srch), MPFROMP(pciParent));
-  //DbgMsg(pszSrcFile, __LINE__,"FindCnrItem pciParent %p pci %p file %s", pciParent,
-  //      pci, file);
   while (pci && (INT) pci != -1) {
     if (!noenv || (pci->flags & (RECFLAGS_ENV | RECFLAGS_UNDERENV)) == 0) {
@@ -158 +156 @@
              MPFROMSHORT(CMA_VERTICAL),
              MPFROMLONG((rclViewport.yTop - (rcl.yTop) - correction)));
-#if 0
-  DbgMsg(pszSrcFile, __LINE__, "RECTLFIRST %i RECTLLAST %i %p",
-         rclFirst.yTop, rclLast.yTop, pmiLast);
-  DbgMsg(pszSrcFile, __LINE__, "TOPPORT %i TOPRCL %i RIGHTRCL %i",
-         rclViewport.yTop , rcl.yTop, rcl.xRight);
-#endif
   WinSendMsg(hwndCnr,
              CM_SCROLLWINDOW,

trunk/dll/flesh.c

@@ -95 +95 @@
 
 static PCSZ pszFleshFocusPath;  // 2015-08-20 SHL
-#if 0
-BOOL fNoFleshDbgMsg;    // 2015-08-09 SHL FIXME to be gone
-#endif
+
 #pragma data_seg(GLOBAL1)
 ULONG NoBrokenNotify;
@@ -200 +198 @@
                 ri.cRecordsInsert = 1;
                 ri.fInvalidateRecord = FALSE;
-#if 0           // 2015-08-03 SHL FIXME debug
-                if (pciL->pszFileName == NullStr)
-                  DbgMsg(pszSrcFile, __LINE__, "Stubby CM_INSERTRECORD pci %p pszFileName \"%s\"", pciL, pciL->pszFileName); // 2015-08-03 SHL FIXME debug
-#endif
                 if (!WinSendMsg(hwndCnr,
                                 CM_INSERTRECORD, MPFROMP(pciL), MPFROMP(&ri)))
@@ -250 +244 @@
     return FALSE;
 
-#if 0  // 2015-08-03 SHL FIXME debug
-  if (!fNoFleshDbgMsg) {
-    DbgMsg(pszSrcFile, __LINE__, "Flesh %s pciParent %p pszFileName %p",
-           pciParent && (INT)pciParent != -1 && pciParent->pszFileName ?
-             pciParent->pszFileName : "(null)",
-           pciParent,
-           pciParent && (INT)pciParent != -1 ? pciParent->pszFileName : (PVOID)-1); // 2015-08-03 SHL FIXME debug
-  }
-#endif
-  // 2015-08-06 SHL allow pciL -1
-  // 2015-08-06 SHL FIXME to not need pszFileName check
   if (!pciParent->fleshed) {
     pciL = (PCNRITEM)WinSendMsg(hwndCnr,
@@ -271 +254 @@
       // 2015-08-06 SHL FIXME to ensure this can not happen
       if (!*pciL->pszFileName || !strcmp(pciL->pszFileName, NullStr))
-        Runtime_Error(pszSrcFile, __LINE__, "Flesh called with pci %p pszFileName (null)", pciL);
-#if 0
-      if (!fNoFleshDbgMsg)
-        DbgMsg(pszSrcFile, __LINE__, "Flesh RemoveCnrItems() pciL %p \"%s\"",
-               pciL,
-               pciL->pszFileName ? pciL->pszFileName : "(null)"); // 2015-08-04 SHL FIXME debug
-      // Assume refernces to pciL already removed from work list
-#endif
+        Runtime_Error(pszSrcFile, __LINE__, "Flesh called with pci %p pszFileName (null)",
+                      pciL);
     }
     dcd = INSTDATA(hwndCnr);
@@ -318 +295 @@
   if (!pciParent || !hwndCnr)
     return;
-#if 0
-  if (!fNoFleshDbgMsg)
-    DbgMsg(pszSrcFile, __LINE__, "UnFlesh pciParent %p pszFileName \"%s\"", pciParent, pciParent->pszFileName ? pciParent->pszFileName : "(null)"); // 2015-08-03 SHL FIXME debug
-#endif
   for (;;) {
     pciL = (PCNRITEM)WinSendMsg(hwndCnr,
@@ -328 +301 @@
                                 MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
     if (!pciL || (INT)pciL == -1)
-      break;                    // Done
-#if 0
-    if (!fNoFleshDbgMsg)
-      DbgMsg(pszSrcFile, __LINE__, "UnFlesh RemoveCnrItems() pciL %p \"%s\"", pciL, pciL->pszFileName ? pciL->pszFileName : "(null)"); // 2015-08-03 SHL FIXME debug
-#endif
+      break;   
     RemoveCnrItems(hwndCnr, pciL, 1, CMA_FREE);
     removed = TRUE;
@@ -383 +352 @@
   static BOOL brokenlan = FALSE, isbroken = FALSE;
 
-  //DbgMsg(pszSrcFile, __LINE__,"Stubby pciParent %p", pciParent);
   if (!pciParent || (INT)pciParent == -1 || !*pciParent->pszFileName
       || pciParent->pszFileName == NullStr || !hwndCnr)
     return FALSE;
-#if 0
-  if (!fNoFleshDbgMsg)
-    DbgMsg(pszSrcFile, __LINE__, "Stubby pciParent %p pszFileName %s", pciParent, pciParent->pszFileName); // 2015-08-03 SHL FIXME debug
-#endif
   // Build wildcard
   len = strlen(pciParent->pszFileName);
@@ -402 +366 @@
   if (!isalpha(*wildcard) || wildcard[1] != ':' || wildcard[2] != '\\') {
     MakeFullName(wildcard);
-    //DbgMsg(pszSrcFile, __LINE__, "Stubby MakeFullName returned %s", wildcard); // 2015-08-19 SHL FIXME debug
   }
   drvNum = toupper(*pciParent->pszFileName) - 'A';
@@ -435 +398 @@
 
   fl = includefiles ? FILE_DIRECTORY : MUST_HAVE_DIRECTORY;
-
-  //DbgMsg(pszSrcFile, __LINE__, "Stubby DosFindFirst(%s)", wildcard); // 2015-08-19 SHL FIXME debug
-
   rc = DosFindFirst(wildcard,
                     &hDir,
@@ -635 +595 @@
             ri.cRecordsInsert = 1;
             ri.fInvalidateRecord = TRUE;
-#if 0        // 2015-08-03 SHL FIXME debug
-            if (pci->pszFileName == NullStr)
-              DbgMsg(pszSrcFile, __LINE__, "Stubby CM_INSERTRECORD %p \"%s\" %.255s", pci, pci->pszFileName, pffb->achName);
-#endif
             if (!WinSendMsg(hwndCnr,
                             CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
               // Assume busy and try again
-              DosSleep(50); //05 Aug 07 GKY 100
+              DosSleep(50); 
               WinSetFocus(HWND_DESKTOP, hwndCnr);
               if (WinIsWindow((HAB)0, hwndCnr)) {
-#if 0
-                if (!fNoFleshDbgMsg) {
-                  // 2015-08-03 SHL FIXME debug
-                  //if (pci->pszFileName == NullStr)
-                  //  DbgMsg(pszSrcFile, __LINE__, "Stubby CM_INSERTRECORD pci %p pszFileName \"%s\"", pci, pci->pszFileName); // 2015-08-03 SHL FIXME debug
-                }
-#endif
                 if (!WinSendMsg(hwndCnr,
                                 CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
@@ -734 +683 @@
     if (!item)
       break;
-    //DbgMsg(pszSrcFile, __LINE__, "DeleteStaleFleshWorkListItems deleting %p %s", pci, pci->pszFileName ? pci->pszFileName : "(null)"); // 2015-08-03 SHL FIXME debug
     List2Delete(&FleshWorkList, item);
     xfree(item, pszSrcFile, __LINE__);
@@ -748 +696 @@
  */
 
-#ifndef AddFleshWorkRequest // 2015-08-03 SHL FIXME debug
+
 BOOL AddFleshWorkRequest(HWND hwndCnr, PCNRITEM pci, FLESHWORKACTION action)
-#else
-BOOL AddFleshWorkRequestDbg(HWND hwndCnr, PCNRITEM pci, FLESHWORKACTION action, PCSZ pszSrcFile_, UINT uSrcLineNo)
-#endif
 {
   PFLESHWORKITEM item = xmallocz(sizeof(FLESHWORKITEM), pszSrcFile, __LINE__);
@@ -762 +707 @@
     return FALSE;
 
-  // 2015-08-03 SHL FIXME debug
-#if 0 // 2015-08-13 SHL FIXME to be gone
-  {
-    static PSZ itemNames[] = {
-            "eStubby", "eFlesh", "eFleshEnv", "eUnFlesh"
-    };
-
-#   ifdef AddFleshWorkRequest
-    if (!pci || (INT)pci == -1) {
-      Runtime_Error(pszSrcFile, __LINE__, "AddFleshWorkRequest called with action %s pci %p by %s:%u",
-             itemNames[item->action],
-             pci,
-             pszSrcFile_, uSrcLineNo);
-    }
-    else if (!pci->pszFileName) {
-      Runtime_Error(pszSrcFile, __LINE__, "AddFleshWorkRequest call with action %s pci %p pszFileName (null) by %s:%u",
-             itemNames[item->action],
-             pci,
-             pszSrcFile_, uSrcLineNo);
-    }
-    else if (!fNoFleshDbgMsg) {
-      DbgMsg(pszSrcFile, __LINE__, "AddFleshWorkRequest called with action %s pci %p pszFileName %s by %s:%u",
-             itemNames[item->action],
-             pci,
-             pci->pszFileName,
-             pszSrcFile_, uSrcLineNo); // 2015-08-03 SHL FIXME debug
-    }
-#else
-    if (!pci || (INT)pci == -1) {
-      Runtime_Error(pszSrcFile, __LINE__, "AddFleshWorkRequest call with action %s pci %p",
-             itemNames[item->action],
-             pci);
-    }
-    else if (!pci->pszFileName) {
-      Runtime_Error(pszSrcFile, __LINE__, "AddFleshWorkRequest called with action %s pci %p pszFileName (null)",
-             itemNames[item->action],
-             pci);
-    }
-    else if (!fNoFleshDbgMsg) {
-      DbgMsg(pszSrcFile, __LINE__, "AddFleshWorkRequest action %s pci %p pszFileName %s",
-             itemNames[item->action],
-             pci,
-             pci->pszFileName); // 2015-08-03 SHL FIXME debug
-    }
-#endif
-  }
-#endif
 
   xDosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
@@ -858 +756 @@
  */
 
-#ifndef WaitFleshWorkListEmpty // 2015-08-03 SHL FIXME debug
+
 VOID WaitFleshWorkListEmpty(PCSZ pszDirName, ULONG ulSleep)
-#else
-VOID WaitFleshWorkListEmptyDbg(PCSZ pszDirName, ULONG ulSleep, PCSZ pszSrcFile_, UINT uSrcLineNo_)
-#endif
 {
   APIRET rc;
@@ -872 +767 @@
   INT rcCount = 0;
 
-  if (tid == 1 || tid == tidFleshWorkListThread) {
-#   ifdef WaitFleshWorkListEmpty
-    Runtime_Error(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called with worklist %sempty by tid %u at %s:%u", IsFleshWorkListEmpty() ? "" : "not ", tid, pszSrcFile_, uSrcLineNo_);
-#   else
+  if (tid == 1 || tid == tidFleshWorkListThread) { // 11 Oct 15 GKY Fixme did we intend to keep this
     Runtime_Error(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called by tid %u", tid);
-#   endif
     return;             // Avoid hang
   }
-#if 0
-  else if (IsFleshWorkListEmpty()) {
-#   ifdef WaitFleshWorkListEmpty
-    DbgMsg(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called with worklist empty at %s:%u", pszSrcFile_, uSrcLineNo_);
-#   else
-    DbgMsg(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called with work list empty");
-#   endif
-  }
-#endif
-
   // Can not wait if call from thread 1 or FleshWorkListThread
   for (waited = FALSE; !IsFleshWorkListEmpty(); waited = TRUE) {
-
-#if 0 // 2015-08-19 SHL FIXME debug
-#   ifdef WaitFleshWorkListEmpty
-    if (!fNoFleshDbgMsg)
-      DbgMsg(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called with work list not empty by %s:%u", pszSrcFile_, uSrcLineNo_); // 2015-08-07 SHL FIXME debug
-#   else
-    if (!fNoFleshDbgMsg)
-      DbgMsg(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called with work list not empty"); // 2015-08-07 SHL FIXME debug
-#   endif
-#endif // 2015-08-19 SHL        FIXME debug
-
     // 2015-08-13 SHL
     if (fAmQuitting)
@@ -965 +835 @@
   if (pszOld)
     xfree((PVOID)pszOld, pszSrcFile, __LINE__);
-  //DbgMsg(pszSrcFile, __LINE__, "SetFleshFocusPath focus path set to %s", pszFleshFocusPath); // 2015-08-03 SHL FIXME debug
-
 }
 
@@ -1025 +893 @@
         if (!item) {
           ULONG ul;
-#if 0
-          if (!fNoFleshDbgMsg)
-            DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread work list empty - waiting"); // 2015-08-03 SHL FIXME debug
-#endif
           xDosWaitEventSem(hevFleshWorkListChanged, SEM_INDEFINITE_WAIT);
           xDosResetEventSem(hevFleshWorkListChanged, &ul);
-#if 0
-          if (!fNoFleshDbgMsg)
-            DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread work hev posted"); // 2015-08-03 SHL FIXME debug
-#endif
           continue;
         }
 
-        if (WinIsWindow((HAB)0, item->hwndCnr)) { 
-#if 0     // 2015-08-07 SHL FIXME debug
-          {
-            static PSZ itemNames[] = {
-                    "eStubby", "eFlesh", "eFleshEnv", "eUnFlesh"
-            };
-
-            PCNRITEM pci = item->pci;
-            if (!fNoFleshDbgMsg) {
-              DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread action %s pci %p pszFileName %s",
-                     itemNames[item->action],
-                     pci,
-                     pci && (INT)pci != -1 ?
-                       (pci->pszFileName ? pci->pszFileName : "(nullname)") :
-                       "(nullpci)"); // 2015-08-03 SHL FIXME debug
-            }
-          }
-#endif
+        if (WinIsWindow((HAB)0, item->hwndCnr)) {
 
           switch (item->action) {
@@ -1065 +908 @@
             break;
           case eStubby:
-            // DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread pci %p pszFileName %s", stubbyArgs->pci, stubbyArgs->pci->pszFileName); // 2015-08-03 SHL FIXME debug
             priority_bumped();
             Stubby(item->hwndCnr, item->pci);
@@ -1093 +935 @@
 
   ProcessDirCount++;
-  // DbgMsg(pszSrcFile, __LINE__, "ProcessDirCount %i FixedVolume %i", ProcessDirCount, FixedVolume);
   if (ProcessDirCount >= FixedVolume) {
     ProcessDirCount = 0;
@@ -1122 +963 @@
   if (rc)
     return FALSE;                       // Give up
-#if 0
-   /*DbgMsg is time consuming
-     define FM2_NO_FLESH_DBGMSG to suppress
-     2015-08-09 SHL FIXME to be gone
-     */
-
-  fNoFleshDbgMsg = getenv("FM2_NO_FLESH_DBGMSG") != NULL;
-#endif
   tidFleshWorkListThread = xbeginthread(FleshWorkThread,
                            65536,

trunk/dll/flesh.h

@@ -30 +30 @@
 BOOL Flesh(HWND hwndCnr, PCNRITEM pciParent);
 VOID UnFlesh(HWND hwndCnr, PCNRITEM pciParent);
-#if 0 // 2015-08-03 SHL FIXME debug
 VOID WaitFleshWorkListEmpty(PCSZ pszDirName, ULONG ulSleep);
-#else
-#define WaitFleshWorkListEmpty(pszDirName, ulSleep) WaitFleshWorkListEmptyDbg(pszDirName, ulSleep, __FILE__, __LINE__)
-VOID WaitFleshWorkListEmptyDbg(PCSZ pszDirName, ULONG ulSleep, PCSZ pszSrcFile, UINT uSrcLineNo);
-#endif
-
-#if 0 // 2015-08-03 SHL FIXME debug
 BOOL AddFleshWorkRequest(HWND hwndCnr, PCNRITEM pci, FLESHWORKACTION action);
-#else
-#define AddFleshWorkRequest(hwnCnr, pciParent, action) AddFleshWorkRequestDbg(hwnCnr, pciParent, action, __FILE__, __LINE__)
-BOOL AddFleshWorkRequestDbg(HWND hwndCnr, PCNRITEM pci, FLESHWORKACTION action, PCSZ pszSrcFile, UINT uSrcLineNo);
-#endif
 
 // Data declarations

trunk/dll/init.c

@@ -1216 +1216 @@
   MaxComLineStrg = MAXCOMLINESTRGDEFAULT;
   AutoviewHeight = 48;
-  //strcpy(printer, "PRN");
   prnwidth = 80;
   prnlength = 66;
@@ -1226 +1225 @@
   prntabspaces = 8;
   CollectorsortFlags = sortFlags = SORT_FILENAME | SORT_DIRSFIRST;
-  //ullDATFileSpaceNeeded = 10000;
-
   //Get default Country info
   {
@@ -1240 +1237 @@
       ulDateFmt = CtryInfo.fsDateFmt;
       ulTimeFmt = CtryInfo.fsTimeFmt;
-      //DbgMsg(pszSrcFile, __LINE__, "Date Fmt %x", ulDateFmt);
     }
     else {
@@ -1277 +1273 @@
       if (rc != NO_ERROR) {
         fProtectOnly = TRUE;
-        //DbgMsg(pszSrcFile, __LINE__, "DosQModuleHandle VKBD returned %d fProtectOnly=%d", rc, fProtectOnly);
       }
       else {
@@ -1283 +1278 @@
         if (rc != NO_ERROR) {
           fProtectOnly = TRUE;
-          //DbgMsg(pszSrcFile, __LINE__, "DosQModuleHandle VMOUSE returned %d fProtectOnly=%d", rc, fProtectOnly);
         }
       }
@@ -1648 +1642 @@
     ShowNote();
 
-  // 2015-08-11 SHL FIXME debug
-  //DbgMsg(pszSrcFile, __LINE__, "ShowEnv %u SwitchTree %u SwitchTreeExpand %u SwitchTreeOnFocus %u CollapseFirst %u", fShowEnv, fSwitchTreeOnDirChg, fSwitchTreeExpand, fSwitchTreeOnFocus, fCollapseFirst);
-  
   LoadDetailsSwitches(PCSZ_DIRCNR, &dsDirCnrDefault, FALSE);
 

trunk/dll/mainwnd.c

@@ -742 +742 @@
       static HACCEL haccelCmdList = NULLHANDLE;
       static HACCEL haccelButtonList = NULLHANDLE;
-      // DbgMsg(pszSrcFile, __LINE__, "WM_FOCUSCHANGE %u", SHORT1FROMMP(mp2));
       id = WinQueryWindowUShort(hwndParent, QWS_ID);
       if (SHORT1FROMMP(mp2)) {
@@ -2137 +2136 @@
           HWND hwndActive = TopWindow(hwnd, (HWND) 0);
           if (hwndActive)
-            //DbgMsg(pszSrcFile, __LINE__, "WinSendMsg UM_DRIVECMD %c", *dv); // 2015-08-04 SHL FIXME debug
             WinSendMsg(WinWindowFromID(hwndActive, FID_CLIENT),
                        UM_DRIVECMD, MPFROMP(dv), MPVOID);
@@ -3467 +3465 @@
 
   sprintf(szPrefix, "%s.", pszStateName);
-
-  //DbgMsg(pszSrcFile, __LINE__, "RestoreDirCnrState %s", pszStateName);        // 2015-08-13 SHL FIXME debug
-
   // If restoring shutdown state bypass no-prescan drives
   fIsShutDownState = strcmp(pszStateName, PCSZ_SHUTDOWNSTATE) == 0;
@@ -3681 +3676 @@
       WinDestroyWindow(hwndPPSave);
     }
-    //DbgMsg(pszSrcFile, __LINE__, "RestoreDirCnrState returning fRestored %u", fRestored);     // 2015-08-13 SHL FIXME debug
   }
 
@@ -4769 +4763 @@
     {
       HWND hwnd = WinQueryFocus(HWND_DESKTOP);
-      // DbgMsg(pszSrcFile, __LINE__, "IDM_CONTEXTMENU %x", hwnd);
       if (hwnd != NULLHANDLE) {
         HWND hwndParent = WinQueryWindow(hwnd, QW_PARENT);
@@ -4777 +4770 @@
         case MAIN_USERLIST:
         case MAIN_CMDLIST:
-          // DbgMsg(pszSrcFile, __LINE__, "WM_CONTEXTMENU");
           WinPostMsg(hwnd, WM_CONTEXTMENU, 0, 0);
         }
@@ -6551 +6543 @@
             }
             else if (SHORT1FROMMP(mp1) == MAIN_DRIVELIST) {
-              //DbgMsg(pszSrcFile, __LINE__, "MainWndProc CBN_ENTER ShowTreeRec(\"%s\")", path); // 2015-08-04 SHL FIXME debug
               ShowTreeRec(WinWindowFromID(WinWindowFromID(hwndTree,
                                                           FID_CLIENT),
@@ -6684 +6675 @@
     fAmQuitting = TRUE;                 // Let world know quit in progress
     DosSleep(1);
-    //DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_CLOSE returning with fAmClosing %u", fAmClosing); // 2015-08-16 SHL
-
     return 0;           // Suppress WinDefWindowProc WM_QUIT message generation
 
@@ -6714 +6703 @@
 
   case WM_DESTROY:
-    //DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_DESTROY hwnd %p TID %u", hwnd, GetTidForThread());   // 2015-08-09 SHL FIXME debug
+
     hwndMain = (HWND)0;
     if (!PostMsg((HWND)0, WM_QUIT, MPVOID, MPVOID))

trunk/dll/mainwnd2.c

@@ -1405 +1405 @@
     PostMsg(hwnd, UM_CLOSE, MPVOID, MPVOID);
     fAmQuitting = TRUE;                 // Let world know quit in progress
-    //DbgMsg(pszSrcFile, __LINE__, "MainWndProc2 WM_CLOSE returning with fAmClosing %u", fAmClosing); // 2015-08-16 SHL
     DosSleep(1);
     return 0;                   // Suppress WinDefWindowProc WM_QUIT message generation

trunk/dll/mkdir.c

@@ -76 +76 @@
     if (!last) {
       Broadcast((HAB) 0, hwndClient, UM_UPDATERECORD, MPFROMP(s), MPVOID);
-      //DbgMsg(pszSrcFile, __LINE__, "UM_UPDATERECORD %s", s);
     }
     else if (last == ERROR_ACCESS_DENIED) {

trunk/dll/notebook.c

@@ -3813 +3813 @@
       if (!WinSetAccelTable(hab, haccelCfg, hwndNotebook))
         Win_Error(hwndNotebook, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-      // else
-        // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_DRIVELIST %x %x", hwndFrame, haccelDriveList);
-    }
-
+    }
     // If generic call, try to find conditional cascade default
     // 15 Feb 08 SHL fixme to be gone when/if IDM_NOTEBOOK gone?
     if (mp2 == MPFROMLONG(IDM_NOTEBOOK)) {
-      //DbgMsg(pszSrcFile, __LINE__, "Trying to translate IDM_NOTEBOOK");
       hwndTemp = WinQueryWindow(hwnd, QW_OWNER);
       if (hwndTemp != HWND_DESKTOP) {

trunk/dll/notify.c

@@ -463 +463 @@
             len--;
             if (len2 != len) {
-              //DbgMsg(pszSrcFile, __LINE__, "len %u unexpected - should be %u", len2, len);    // 18 Jul 08 SHL fixme to be Runtime_Error
               xfree((PSZ)p, pszSrcFile, __LINE__);
             }

trunk/dll/seeall.c

@@ -2154 +2154 @@
 #  endif
 
-  // DbgMsg(pszSrcFile, __LINE__, "FindAllThread requesting hmtxScan");
   apiret = DosRequestMutexSem(ad->hmtxScan, SEM_INDEFINITE_WAIT);
   if (apiret != NO_ERROR)
@@ -2212 +2211 @@
     }
 
-    // DbgMsg(pszSrcFile, __LINE__, "FindAllThread releasing hmtxScan");
     DosReleaseMutexSem(ad->hmtxScan);
   }
@@ -2718 +2716 @@
 
   case UM_SETUP5:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc UM_SETUP5");
+
     if (pAD) {
       if (mp1 && *((CHAR *)mp1))
@@ -2768 +2766 @@
 
   case UM_SETUP2:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc UM_SETUP2");
+
     if (pAD) {
 
@@ -2799 +2797 @@
 
   case UM_SETUP3:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc UM_SETUP3");
+
     if (pAD) {
       pAD->multiplier = pAD->afindexcnt / 32767;
@@ -2838 +2836 @@
 
   case UM_SETUP4:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc UM_SETUP4");
+
     if (pAD)
       pAD->killme = TRUE;
@@ -2846 +2844 @@
 
   case UM_RESCAN:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc UM_RESCAN");
+
     if (pAD && !pAD->stopflag) {
       if (DosRequestMutexSem(pAD->hmtxScan, SEM_IMMEDIATE_RETURN)) {
@@ -2924 +2922 @@
 
   case UM_SETUP:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc UM_SETUP");
+
     if (pAD) {
       WinSendMsg(pAD->hvscroll, SBM_SETTHUMBSIZE, MPFROM2SHORT(1, 1), MPVOID);
@@ -3514 +3512 @@
 
   case WM_PAINT:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc WM_PAINT");
+
     if (pAD) {
 
@@ -3712 +3710 @@
 
   case WM_VSCROLL:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc WM_VSCROLL");
+
     if (pAD && !pAD->stopflag &&
         !DosRequestMutexSem(pAD->hmtxScan, SEM_IMMEDIATE_RETURN)) {
@@ -4406 +4404 @@
 
   case WM_SIZE:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc WM_SIZE");
+
     PostMsg(hwnd, UM_SETUP3, MPVOID, MPVOID);
     break;
 
   case WM_CLOSE:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc WM_CLOSE");
+
     if (pAD)
       pAD->stopflag = 1;
@@ -4418 +4416 @@
 
   case WM_DESTROY:
-    // DbgMsg(pszSrcFile, __LINE__, "SeeAllWndProc WM_DESTROY");
+
     if (pAD) {
       pAD->stopflag = 1;

trunk/dll/strutil.c

@@ -123 +123 @@
   }
 
-  // DbgMsg(pszSrcFile, __LINE__, "Fetching %lu", id);
-
   // If string already loaded, return it now
   if (id >= ulFirstId &&
@@ -133 +131 @@
     if (((ULONG)psz & 0xffff0000) == 0)
       DbgMsg(pszSrcFile, __LINE__, "id %lu corrupted %p", id, psz);
-    // DbgMsg(pszSrcFile, __LINE__, "id %lu \"%s\"", id, psz ? psz : "(null)");
     return psz;
   }
@@ -158 +155 @@
     if (i < cLongStrings) {
       // Combine stringtable items to build long string
-      // DbgMsg(pszSrcFile, __LINE__, "Building long string %lu", id);
       for (; LongStrings[i].id == id; i++) {
         uDbgState = 3;
@@ -207 +203 @@
   uDbgState = 5;
   // Add to cache
-  // DbgMsg(pszSrcFile, __LINE__, "Caching %lu", id);
-
   // Calculate new array limits
   if (!pLoadedStrings) {
@@ -225 +219 @@
       !pLoadedStrings) {
     PSZ *pNewLoadedStrings;
-    // DbgMsg(pszSrcFile, __LINE__, "Reallocating for %lu", id);
     pNewLoadedStrings = xrealloc(pLoadedStrings,
                                  (ulNewLastId - ulNewFirstId + 1) * sizeof(PSZ),
@@ -259 +252 @@
   pLoadedStrings[id - ulFirstId] = psz;
   cBusy--;
-  // DbgMsg(pszSrcFile, __LINE__, "id %lu \"%s\"", id, psz ? psz : "(null)");
   return psz;
 }

trunk/dll/systemf.c

@@ -670 +670 @@
 
     memset(&ex, 0, sizeof(EXECARGS));
-    //DbgMsg(pszSrcFile, __LINE__, "env %s", environment);
     if (!environment) {
       ULONG size;
@@ -695 +694 @@
     else
       ex.flags = flags;
-    //DbgMsg(pszSrcFile, __LINE__, "Inserted %s", environment);
     ret = runemf2(ex.flags, hwnd, pszCallingFile, uiLineNumber, path,
                    *ex.environment ? ex.environment : NULL,

trunk/dll/treecnr.c

@@ -348 +348 @@
 
     // Walk down directory tree, expanding as needed
-    //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec needs expand, szDirArg \"%s\", IsFleshWorkListEmpty %u", szDirArg, IsFleshWorkListEmpty()); // 2015-08-04 SHL FIXME debug
-
     strcpy(szDir, szDirArg);
     p = szDir + 3;                      // Point after root backslash
@@ -364 +362 @@
                            TRUE);               // noenv
       if (!pciP || (INT)pciP == -1) {
-        //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord(\"%s\") returned pciP %p", szDir, pciP); // 2015-08-04 SHL FIXME debug
         WaitFleshWorkListEmpty(szDirArg, 240);  // 2015-08-23 SHL
         break;                                  // No match
       }
-
-      //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord(\"%s\") returned %p \"%s\"", szDir, pciP, pciP->pszFileName); // 2015-08-04 SHL FIXME debug
-
       if (!stricmp(szDirArg, pciP->pszFileName)) {
         pci = pciP;
@@ -380 +374 @@
 
       if (~pciP->rc.flRecordAttr & CRA_EXPANDED) {
-        //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec expanding \"%s\"", pciP->pszFileName); // 2015-08-04 SHL FIXME debug
         WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
       }
@@ -401 +394 @@
 
   } // 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
-
   if (found) {
     // Found it
@@ -447 +437 @@
     if (pciToSelect && (INT) pciToSelect != -1) {
       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);
       }
@@ -455 +443 @@
           WaitFleshWorkListEmpty(NULL, 240); //Let the root expand first otherwise it makes top
         }
-        // 2015-08-23 SHL FIXME debug
-        //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec ShowCnrRecord(%p) filename %s", pciToSelect, pciToSelect->pszFileName); // 2015-08-04 SHL FIXME debug
         ShowCnrRecord(hwndCnr, (PMINIRECORDCORE)pciToSelect);
       }
@@ -462 +448 @@
       if (!quickbail) {
         WaitFleshWorkListEmpty(szDirArg, 240);  // 2015-08-19 SHL try to ensure contents stable
-        //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec WinSendMsg(CM_SETRECORDEMPHASIS, CRA_SELECTED | CRA_CURSORED) szDirArg \"%s\"", szDirArg); // 2015-08-04 SHL FIXME debug
         WinSendMsg(hwndCnr,
                    CM_SETRECORDEMPHASIS,
@@ -746 +731 @@
            See RestoreDirCnrState()
         */
-        //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
-
         if (cDirectoriesRestored > 0)
           cDirectoriesRestored--;
@@ -755 +737 @@
           BOOL tempsusp = dcd->suspendview;
           BOOL tempfollow = fFollowTree;
-          //BOOL temptop;
           dcd->suspendview = TRUE;
           fFollowTree = FALSE;
-#if 0     // 2015-09-20 GKY This doesn't appear to be needed since maketop is always TRUE
-          if (mp2) {
-            temptop = fTopDir;
-            fTopDir = TRUE;
-          }
-#endif
-          //DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME calling ShowTreeRec(\"%s\")", mp1); // 2015-08-04 SHL FIXME debug
           priority_idle(); // 2015-09-26 GKY Majority of work done by Flesh and UI threads
           ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
           priority_normal();
-          //DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME calling PostMsg(IDM_UPDATE)"); // 2015-08-04 SHL FIXME debug
           PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
 
           dcd->suspendview = (USHORT)tempsusp;  // Restore
           fFollowTree = tempfollow;             // Restore
-#if 0
-          if (mp2)
-            fTopDir = temptop;                  // Restore
-#endif
         }
       }
@@ -831 +800 @@
       priority_idle();
       if (SHORT1FROMMP(mp1) == IDM_EXPAND) {
-        //DbgMsg(pszSrcFile, __LINE__,"UM_EXPAND Start");
         fExpandAll = TRUE;
         while (fExpanding) { // Not serialized not practical to wait on very large directories
@@ -840 +808 @@
           fExpanding = ExpandAll(dcd->hwndCnr, x, (PCNRITEM) mp2);
           DosSleep(240);
-          //DbgMsg(pszSrcFile, __LINE__,"UM_EXPAND fExpanding %i count %i", fExpanding, x);
         }
         fExpandAll = FALSE;
@@ -1011 +978 @@
               WaitFleshWorkListEmpty(pci->pszFileName, 240);    // 2015-08-19 SHL in case pci still in work list
               if ((toupper(*pci->pszFileName) - 'A') > 1)  {
-                DbgMsg(pszSrcFile, __LINE__,"UM_RESCAN2 UnFlesh %s", pci->pszFileName);
                 AddFleshWorkRequest(hwnd, pci, eUnFlesh);
               }
@@ -1038 +1004 @@
                  CM_SCROLLWINDOW,
                  MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
-      //DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc FillTreeCnr()"); // 2015-08-04 SHL FIXME debug
       FillTreeCnr(dcd->hwndCnr, dcd->hwndParent);
       if (fOkayMinimize) {
@@ -1047 +1012 @@
                  CM_INVALIDATERECORD,
                  MPVOID, MPFROM2SHORT(0, CMA_ERASE | CMA_REPOSITION));
-      //DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc PostMsg(UM_RESCAN)"); // 2015-08-04 SHL FIXME debug
       PostMsg(dcd->hwndCnr, UM_RESCAN, MPVOID, MPVOID);
     }
@@ -1985 +1949 @@
 
       if (dir) {
-        //DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc UM_SHOWME PostMsg(UM_SHOWME, %s)", dir); // 2015-08-13 SHL FIXME debug
         if (!PostMsg(dcd->hwndObject, UM_SHOWME, MPFROMP(dir), MPVOID))
           free(dir);
@@ -2275 +2238 @@
             chDrvU = *pci->pszFileName;
             chDrvU = toupper(chDrvU);
-            //DbgMsg(pszSrcFile, __LINE__,"IDM_FILESMENU prevalid drive %s file %s",
-            //       szDrv, pci->pszFileName);
             MakeValidDir(szDrv);
             rdy = *szDrv == chDrvU;     // Drive not ready if MakeValidDir changes drive letter
@@ -2285 +2246 @@
             local = rdy && (!(driveflags[chDrvU - 'A'] & (DRIVE_REMOTE | DRIVE_VIRTUAL)));
             underenv = (pci->flags & RECFLAGS_UNDERENV) != 0;
-            //DbgMsg(pszSrcFile, __LINE__,"IDM_FILESMENU postvalid drive %s rdy %i removable %i writeable %i local %i underenv %i",
-            //       szDrv, rdy, removable, writeable, local, underenv);
             CopyPresParams((HWND) mp2, hwndMainMenu);
             WinEnableMenuItem((HWND) mp2, IDM_INFO, rdy);
@@ -2433 +2392 @@
   case UM_DRIVECMD:
     if (mp1) {
-      DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc UM_DRIVECMD ShowTreeRec(\"%s\")", mp1);
       ShowTreeRec(hwnd, (CHAR *)mp1, FALSE, TRUE);
-      DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc PostMsg(IDM_UPDATE)");
       PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
     }
@@ -2902 +2859 @@
               if (pci->fleshed) {
                 if (x > 1) {
-                  DbgMsg(pszSrcFile, __LINE__,"UM_UPDATE UnFlesh %s", pci->pszFileName);
                   AddFleshWorkRequest(hwnd, pci, eUnFlesh);
                 }
@@ -3272 +3228 @@
     break; // WM_DESTROY
   } // switch
-  //DbgMsg(pszSrcFile, __LINE__,"return oldproc msg %i mp1 %p mp2 %p", msg, mp1, mp2);
   if (dcd && dcd->oldproc){
     return dcd->oldproc(hwnd, msg, mp1, mp2);
@@ -3516 +3471 @@
             }
             else if (qmsg.msg == UM_EXPANDTREE) {
-              // 2015-08-04 SHL
-              //DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc qmsg.msg == UM_EXPANDTREE %p pci %p %s",
-              //       qmsg.hwnd, pci, pci->pszFileName);
               if (fExpandAll)
                 DosSleep(1);
@@ -3526 +3478 @@
               AddFleshWorkRequest(dcd->hwndCnr, pci, eFlesh);   // forceFlesh
               if (!dcd->suspendview && fTopDir) {
-                //DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc UM_TOPDIR %p pci %p %s",
-                //       qmsg.hwnd, pci, pci->pszFileName);  // 2015-08-04 SHL FIXME debug
                 PostMsg(dcd->hwndCnr, UM_TOPDIR, MPFROMP(pci), MPVOID);
               }
             }
             if (qmsg.msg == UM_EXPANDTREE && !dcd->suspendview) {
-              //DbgMsg(pszSrcFile, __LINE__, "UM_FILTER %p pci %p %s",
-              //       dcd->hwndCnr, pci, pci->pszFileName);
               WinSendMsg(dcd->hwndCnr, UM_FILTER, MPVOID, MPVOID);
             }

trunk/dll/valid.c

@@ -339 +339 @@
   DosFSCtl(&easize, sizeof(EASIZEBUF), &ulDataLen, NULL, ulParmLen,
            &ulParmLen, FSCTL_MAX_EASIZE, szPath, -1, FSCTL_PATHNAME);
-  //DbgMsg(pszSrcFile, __LINE__, "%i %i %s %s", easize.cbMaxEASize, easize.cbMaxEAListSize, szPath, pfsn);
   szPath[2] = 0;
   if (pulType && easize.cbMaxEASize == 0)

trunk/dll/viewinf.c

@@ -570 +570 @@
             }
             else {
-              // DbgMsg(pszSrcFile, __LINE__, "Help file %s", p);
               ViewHelp(p);
             }

trunk/dll/walkem.c

@@ -124 +124 @@
     load_setups();
     for (pld = pFirstSetup; pld; pld = pld->next) {
-      // DbgMsg(pszSrcFile, __LINE__, "Inserted %s", pld->path);
       WinSendMsg(hwndStatelist,
                  LM_INSERTITEM,
@@ -273 +272 @@
     pld->next = pFirstSetup;
     pFirstSetup = pld;
-    // DbgMsg(pszSrcFile, __LINE__, "Inserted %s", pld->path);
-
     if (ulDataBytes == ulOldSetupsBytes)
       psz += 13;                        // Buffers fixed width prior to 3.0.7

trunk/dll/worker.c

@@ -1809 +1809 @@
                   DosReleaseMutexSem(hmtxFM2Delete);
                 }
-                //DbgMsg(pszSrcFile, __LINE__, "error %i retrn %i", error, retrn);
                 if (fWarnReadOnly && error ==  ERROR_FILE_EXISTS) {
                   retrn = SM2_NO;

trunk/dll/wrappers.c

@@ -258 +258 @@
   rc = DosAllocSharedMem(ppb, pszName, cb,
                          PAG_COMMIT | OBJ_GIVEABLE | PAG_READ | PAG_WRITE | OBJ_ANY);
-  //DbgMsg(pszSrcFile, __LINE__, "ppb %p", *ppb);
   if (rc)
     rc = DosAllocSharedMem(ppb, pszName, cb, PAG_COMMIT | OBJ_GIVEABLE | PAG_READ | PAG_WRITE);
@@ -281 +280 @@
 
   rc = DosAllocMem(ppb, cb, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY);
-  //DbgMsg(pszSrcFile, uiLineNumber, "ppb %p %x", *ppb, rc);
   if (rc)
     rc = DosAllocMem(ppb, cb, PAG_COMMIT | PAG_READ | PAG_WRITE);
   if (rc)
     Runtime_Error(pszSrcFile, uiLineNumber, GetPString(IDS_OUTOFMEMORY));
-  //DbgMsg(pszSrcFile, uiLineNumber, "ppb %p", *ppb);
   return rc;
 }