Changeset 1880

Timestamp:

Oct 12, 2015, 8:26:16 PM (10 years ago)

Author:

Gregg Young

Message:

Remove dead code and comments from remaining c files. #if 0 and #if NEVER were not addressed

Location:

trunk/dll

Files:

• errutil.c (modified) (2 diffs)
• excputil.c (modified) (2 diffs)
• filldir.c (modified) (4 diffs)
• flesh.c (modified) (4 diffs)
• fm2cmd.c (modified) (1 diff)
• fonts.c (modified) (1 diff)
• getnames.c (modified) (1 diff)
• grep.c (modified) (13 diffs)
• grep2.c (modified) (3 diffs)
• inis.c (modified) (3 diffs)
• instant.c (modified) (1 diff)
• key.c (modified) (2 diffs)
• killproc.c (modified) (3 diffs)
• mainwnd.c (modified) (5 diffs)
• mainwnd2.c (modified) (4 diffs)
• mkdir.c (modified) (1 diff)
• mle.c (modified) (7 diffs)
• newview.c (modified) (11 diffs)
• notebook.c (modified) (3 diffs)
• objcnr.c (modified) (4 diffs)
• pathutil.c (modified) (1 diff)
• rename.c (modified) (1 diff)
• seeall.c (modified) (9 diffs)
• strutil.c (modified) (2 diffs)
• systemf.c (modified) (5 diffs)
• timer.c (modified) (1 diff)
• treecnr.c (modified) (7 diffs)
• undel.c (modified) (3 diffs)
• walkem.c (modified) (4 diffs)
• worker.c (modified) (6 diffs)
• wrappers.c (modified) (1 diff)

trunk/dll/errutil.c

@@ -89 +89 @@
 
   static ULONG ul1stMSec;
-  // static ULONG ulLastMSec;
 
   ULONG msec = GetMSecTimer();
@@ -95 +94 @@
 
   if (!ul1stMSec) {
-    ul1stMSec = msec;
-    // ulLastMSec = msec;               // Avoid big delta 1st time
+    ul1stMSec = msec;      // Avoid big delta 1st time
   }
 
   delta = msec - ul1stMSec;
-  // ulLastMSec = msec;
   fprintf(stderr, "%03lu.%03lu ", delta / 1000, delta % 1000);
 

trunk/dll/excputil.c

@@ -26 +26 @@
 #define INCL_DOSMISC                    // DosDumpProcess?
 #define INCL_DOSERRORS                  // NO_ERROR
-// #include <os2.h>
 
 #include "wrappers.h"                   // xmalloc xfree
@@ -65 +64 @@
               "DosSetExceptionHandler");
   }
-
-#if 0 // 11 Dec 08 SHL fixme tobe gone - debug
-  {
-    static UINT when;
-    if (++when == 2)
-      *(char*)0 = 0;
-  }
-#endif
 
   (*ptd->pfnThread)(ptd->pvArgs);       // Invoke thread

trunk/dll/filldir.c

@@ -132 +132 @@
 #include <ctype.h>
 #include <limits.h>
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -919 +918 @@
                 (pffbFile->achName[1] == '.' && !pffbFile->achName[2])) ||
                (LoadedFirstChild && !stricmp(LoadedFirstChild, pffbFile->achName)))) {
-            // ulFindCnt--;             // Got . or .. or file to be skipped
+                        // Got . or .. or file to be skipped
           }
           else
@@ -1063 +1062 @@
 
             if (!pciFirst) {
-              //ERRORID erridErrorCode = WinGetLastError(WinQueryAnchorBlock(hwndCnr));
-              //PmpfF(("Allocation failed %i", erridErrorCode));
               Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
                         GetPString(IDS_CMALLOCRECERRTEXT));
@@ -1147 +1144 @@
             }
           }
-          //SleepIfNeeded(&itdSleep, 1);
         }
         priority_normal();

trunk/dll/flesh.c

@@ -53 +53 @@
 #include <string.h>
 #include <ctype.h>
-//#include <malloc.h>
 
 #define INCL_DOS
@@ -100 +99 @@
 BOOL fFilesInTree;
 
-//BOOL Flesh(HWND hwndCnr, PCNRITEM pciParent);
-
 BOOL Stubby(HWND hwndCnr, PCNRITEM pciParent);
 BOOL FleshEnv(HWND hwndCnr, PCNRITEM pciParent);
-//VOID UnFlesh(HWND hwndCnr, PCNRITEM pciParent);
 
 /**
@@ -543 +539 @@
             *p = 0;;
             BldFullPathName(szBuffer, wildcard, pffb->achName);
-            pci->pszFileName =  xstrdup(szBuffer, pszSrcFile, __LINE__); //NullStr;   // 2015-08-19 SHL FIXME to doc why
+            pci->pszFileName =  xstrdup(szBuffer, pszSrcFile, __LINE__); 
             p = strrchr(pci->pszFileName, '\\');
             p++;
-            pci->pszDisplayName = p; //NullStr;
+            pci->pszDisplayName = p; 
             pci->rc.pszIcon = pci->pszDisplayName;
             if (fForceUpper)
@@ -746 +742 @@
   }
   c = strlen(((PFLESHWORKITEM)item)->pci->pszFileName);
-  // 2015-08-23 SHL FIXME to not trap for Gregg
   return strncmp(((PFLESHWORKITEM)item)->pci->pszFileName, (PCSZ)data, c) == 0;
 }

trunk/dll/fm2cmd.c

@@ -63 +63 @@
       strcpy(temp, directory);
       AddBackslashToPath(directory);
-      //if (directory[strlen(directory) - 1] != '\\')
-      //  strcat(temp, "\\");
     }
     else {

trunk/dll/fonts.c

@@ -28 +28 @@
 #include "fm3dll.h"
 #include "init.h"                       // Global semaphore
-
-//static VOID SetFont(HWND hwnd);
 
 #pragma data_seg(DATA1)

trunk/dll/getnames.c

@@ -185 +185 @@
             if (*szBuffer) {
               AddBackslashToPath(szBuffer);
-              //if (szBuffer[strlen(szBuffer) - 1] != '\\')
-              //  strcat(szBuffer, "\\");
               *szTemp = 0;
               WinQueryDlgItemText(hwnd, 258, CCHMAXPATH, szTemp);

trunk/dll/grep.c

@@ -323 +323 @@
       WinCancelShutdown(ghmq, TRUE);
       IncrThreadUsage();
-      // DosSleep(100); //05 Aug 07 GKY 128     // 07 Feb 08 SHL
       // hwndStatus does not exist for applet
       WinSetWindowText(hwndStatus ? hwndStatus : grep.hwndCurFile,
@@ -788 +787 @@
                         pci, grep->dir[x], grep->insertffb[x], FALSE, dcd);
     pci = (PCNRITEM) pci->rc.preccNextRecord;
-    //SleepIfNeeded(pitdSleep, 1);
     if (pci == NULL && ulRecsToInsert) {
       memset(&ri, 0, sizeof(RECORDINSERT));
@@ -808 +806 @@
     SleepIfNeeded(pitdSleep, 1);
   }//for
-    // if (grep->toinsert == FilesToGet)        // 07 Feb 08 SHL
-    //  DosSleep(0);  //26 Aug 07 GKY 1 // 07 Feb 08 SHL
     freegreplist(grep);
     PostMsg(grep->hwndFiles, UM_RESCAN, MPVOID, MPVOID);
@@ -1056 +1052 @@
       }                                 // while
       Free_FEAList(head);
-      // DosSleep(1);                   // 07 Feb 08 SHL
     }
   }
@@ -1094 +1089 @@
       Fortify_LeaveScope();
 #      endif
-      // DosSleep(1);                   // 07 Feb 08 SHL
     }
   } // if
@@ -1203 +1197 @@
         else
           break;
-        // DosSleep(0); //26 Aug 07 GKY 1       // 07 Feb 08 SHL
       }
       fclose(fp);
-      // DosSleep(1);                   // 07 Feb 08 SHL
     }
     free(buffer);
@@ -1373 +1365 @@
   ULONG x;
   ULONG y;
-  // ULONG cntr = 1000;                 // 09 Feb 08 SHL
-
-  // if (grep->CRCdupes)                // 09 Feb 08 SHL
-  //  cntr = 100;                       // 09 Feb 08 SHL
+
   x = 0;
   for (i = grep->dupehead; i; i = i->next)
@@ -1386 +1375 @@
     else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
       WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_GREPDUPESORTINGTEXT));
-    // DosSleep(0);  //26 Aug 07 GKY 1  // 07 Feb 08 SHL
     grep->dupenames = xmalloc(sizeof(DUPES *) * (x + 1), pszSrcFile, __LINE__);
     if (!grep->nosizedupes)
@@ -1404 +1392 @@
       InitITimer(pitdSleep, 0);         // Reset rate estimator
       SleepIfNeeded(pitdSleep, 1);
-      // DosSleep(0); //26 Aug 07 GKY 1 // 07 Feb 08 SHL
-
       qsort(grep->dupenames,
             x,
@@ -1411 +1397 @@
             grep->ignoreextdupes ? comparenamesqe : comparenamesq);
       SleepIfNeeded(pitdSleep, 1);
-      // DosSleep(0); //26 Aug 07 GKY 1 // 07 Feb 08 SHL
       if (!grep->nosizedupes) {
         qsort(grep->dupesizes, x, sizeof(DUPES *), comparesizesq);
         SleepIfNeeded(pitdSleep, 1);
-        // DosSleep(0); //26 Aug 07 GKY 1       // 07 Feb 08 SHL
       }
 
@@ -1597 +1581 @@
         if (!(i->flags & GF_SKIPME)) {
           if (IsITimerExpired(pitdReport)) {
-            // if (!(y % cntr)) { }
-            CHAR s[44];
+            CHAR s[44];
+
             sprintf(s, GetPString(IDS_GREPDUPECHECKPROGTEXT), y, grep->numfiles);
             if (!hwndStatus)
@@ -1604 +1588 @@
             else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
               WinSetWindowText(hwndStatus, s);
-            // DosSleep(0); //26 Aug 07 GKY 1   // 07 Feb 08 SHL
           }
           y++;
@@ -1667 +1650 @@
                 }
               }
-              // else if (!(x % 100))   // 07 Feb 08 SHL
-              //        DosSleep(0);  //26 Aug 07 GKY 1 // 07 Feb 08 SHL
             }
             c = c->next;

trunk/dll/grep2.c

@@ -335 +335 @@
       fInitDone = TRUE;
     }
-    else {//if (sLastMaskSelect == LIT_NONE) {
+    else {
       size = sizeof(sLastMaskSelect);
       PrfQueryProfileData(fmprof, appname, (CHAR *) PSCZ_GREP_LASTMASK_SELECT, &sLastMaskSelect, &size);
@@ -445 +445 @@
       fclose(fp);
     }
-    // 25 Sep 09 SHL Reselect last last used item
-    //if (sLastMaskSelect >= 0)
-    //  WinSendDlgItemMsg(hwnd, GREP_LISTBOX, LM_SELECTITEM,
-    //          MPFROMSHORT(sLastMaskSelect), MPFROMSHORT(TRUE));
-
     FillPathListBox(hwnd,
                     WinWindowFromID(hwnd, GREP_DRIVELIST),
@@ -1136 +1131 @@
           break;
         }
-        DosSleep(100);                  //05 Aug 07 GKY 128
+        DosSleep(100);    
         free(p);
 #       ifdef FORTIFY

trunk/dll/inis.c

@@ -47 +47 @@
 #include <ctype.h>
 #include <share.h>
-// #include <process.h>                    // _beginthread
 
 #define INCL_DOS
@@ -2262 +2261 @@
       WinSetDlgItemText(hwnd, INI_NUMDATA, "0");
       WinSendDlgItemMsg(hwnd, INI_DATALIST, LM_DELETEALL, MPVOID, MPVOID);
-      // inidata = WinQueryWindowPtr(hwnd, QWL_USER);   // 09 Jan 08 SHL
     }
     return 0;
@@ -2547 +2545 @@
                 }
                 else
-                  DosSleep(100); //05 Aug 07 GKY 250
+                  DosSleep(100);
               }
             }

trunk/dll/instant.c

@@ -137 +137 @@
                       batches++);
               fp = xfopen(s, modew, pszSrcFile, __LINE__, FALSE);
-              //if (!fp)
-              //  Runtime_Error(pszSrcFile, __LINE__, "fopen");
               if (fp) {
                 if (!strncmp(bat, "/*", 2)) {

trunk/dll/key.c

@@ -127 +127 @@
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk1), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk2), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk3), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk4), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk5), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk6), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk7), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk8), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk9), MPVOID);
-          DosSleep(100);//05 Aug 07 GKY 257
+          DosSleep(100);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk8), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk7), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk6), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk5), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk4), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk3), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk2), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk1), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
                             MPFROMLONG(sk0), MPVOID);
-          DosSleep(16);//05 Aug 07 GKY 33
+          DosSleep(16);
           WinShowWindow(WinWindowFromID(hwnd, ABT_ICON), FALSE);
           WinSendDlgItemMsg(hwnd, ABT_ICON, SM_SETHANDLE,
@@ -213 +213 @@
   case UM_SETDIR:
     WinSetFocus(HWND_DESKTOP, HWND_DESKTOP);
-    DosSleep(250);//05 Aug 07 GKY 2500
+    DosSleep(250);
     return 0;
 

trunk/dll/killproc.c

@@ -43 +43 @@
 #include <string.h>
 #include <ctype.h>
-// #include <process.h>
 #include <limits.h>
 
@@ -472 +471 @@
         }
         else
-          DosSleep(100);                // 05 Aug 07 GKY 250
+          DosSleep(100);                
       }
       else if (fUseQSysState)
@@ -484 +483 @@
         }
         else
-          DosSleep(100);//05 Aug 07 GKY 250
+          DosSleep(100);
       else {
         if (xbeginthread(FillKillListThread,

trunk/dll/mainwnd.c

@@ -5611 +5611 @@
           break;
         }
-        x = SHORT1FROMMP(mp1);// - IDM_COMMANDSTART;
+        x = SHORT1FROMMP(mp1);
         if (x >= 0) {
-          //x++;
           RunCommand(hwndCnr, x);
           if (fUnHilite) {
@@ -5704 +5703 @@
     }
     else
-      DosSleep(32);//05 Aug 07 GKY 64
+      DosSleep(32);
 
     hwndFrame = WinQueryWindow(hwnd, QW_PARENT);
@@ -5835 +5834 @@
                                     (CHAR *) WC_COMBOBOX,
                                     (PSZ) NULL,
-                                    //WS_VISIBLE |
                                     CBS_DROPDOWN,
                                     (swp.x +
@@ -6596 +6594 @@
                             UM_RESTORE,
                             MPVOID,
-                            MPFROMLONG(1));                // Autotile
+                            MPFROMLONG(RESTORE_STATE_TILE_CHILDREN));     // Autotile
                   }
                 }
@@ -6625 +6623 @@
                 WinPostMsg(hwnd,
                            WM_COMMAND,
-                           MPFROM2SHORT(atol(p), 0), //fixme GKY this traps in atol the {} probably don't exist
-                           //IDM_COMMANDSTART + sSelect, 0),
+                           MPFROM2SHORT(atol(p), 0), 
                            MPVOID);
               }

trunk/dll/mainwnd2.c

@@ -49 +49 @@
 #include <string.h>
 #include <share.h>
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -463 +462 @@
   case IDM_CONFIRMDELETE:               // 2014-05-17 SHL
   case IDM_TOGGLEDRAGDIALOG:            // 2014-05-15 SHL
-//    case IDM_SYSINFO:
   case IDM_HIDENOTEWND:
   case IDM_SHOWNOTEWND:
@@ -724 +722 @@
         break;
       }
-      x = SHORT1FROMMP(mp1);// - IDM_COMMANDSTART;
+      x = SHORT1FROMMP(mp1);
       if (x >= 0) {
-        //x++;
         RunCommand(hwndCnr, x);
         if (fUnHilite) {
@@ -811 +808 @@
     }
     else
-      DosSleep(32);//05 Aug 07 GKY 64
+      DosSleep(32);
 
     pd = xmallocz(sizeof(PERSON1DATA), pszSrcFile, __LINE__);

trunk/dll/mkdir.c

@@ -186 +186 @@
   MakeValidDir(szBuff);
   AddBackslashToPath(szBuff);
-  //if (*szBuff && szBuff[strlen(szBuff) - 1] != '\\')
-  //  strcat(szBuff, "\\");
   sip.prompt = GetPString(IDS_MKDIRPROMPTTEXT);
   sip.inputlen = CCHMAXPATH - 1;

trunk/dll/mle.c

@@ -34 +34 @@
 #include <ctype.h>
 #include <share.h>
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -560 +559 @@
                 first = FALSE;
               }
-// fprintf(stderr,"%d bytes of %d imported\n",howmuch,numimport);
               if (howmuch < 1) {
                 numimport = 0;
@@ -568 +566 @@
                 numimport -= howmuch;
                 memmove(hexbuff, hexbuff + howmuch, numimport);
-                DosSleep(0);  //26 Aug 07 GKY 1
+                DosSleep(0);  
                 if (!WinIsWindow(hab, h) || (vw && vw->killme))
                   break;
@@ -705 +703 @@
               first = FALSE;
             }
-// fprintf(stderr,"%d bytes of %d imported\n",howmuch,numread);
             if (howmuch < 1) {
               numread = 0;
@@ -723 +720 @@
                   numread = tempnum;
               }
-              DosSleep(0); //26 Aug 07 GKY 1
+              DosSleep(0); 
             }
             else
@@ -734 +731 @@
             WinSetWindowText(grandpa, s);
           }
-          DosSleep(0); //26 Aug 07 GKY 1
+          DosSleep(0); 
         }
         DosFreeMem(buffer);
@@ -812 +809 @@
   Fortify_LeaveScope();
 #  endif
-  // _endthread();                      // 10 Dec 08 SHL
 }
 

trunk/dll/newview.c

@@ -50 +50 @@
 #include <stdlib.h>
 #include <string.h>
-// #include <process.h>                 // 10 Dec 08 SHL
 #include <limits.h>
 #include <share.h>
@@ -253 +252 @@
   CHAR *pszTestStr = pszSrc;
   CHAR szMailTo[SEARCHSTRINGLEN] = "mailto:";
-  //CHAR szMailEnd[] = ">";
 
   if (!strnstr(pszTestStr, pszFindChar, StrLens))
@@ -265 +263 @@
       strip_trail_char(">", pszSrc);
       strcat(szMailTo, pszSrc);
-     // strcat(szMailTo, szMailEnd);
       strcpy(pszSrc, szMailTo);
       return pszSrc;
@@ -292 +289 @@
     strip_trail_char(",.;:'>", pszSrc);
     strcat(szMailTo, pszSrc);
-    //strcat(szMailTo, szMailEnd);
     strcpy(pszSrc, szMailTo);
     return pszSrc;
@@ -1161 +1157 @@
                                                NEWVIEW_STATUS1),
                                (CHAR *) GetPString(IDS_NOMATCHINGTEXT));
-              DosSleep(150);//05 Aug 07 GKY 1500
+              DosSleep(150);
               PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
               PostMsg(hwnd, UM_SETUP4, MPVOID, MPVOID);
@@ -1273 +1269 @@
                                                NEWVIEW_STATUS1),
                                (CHAR *) GetPString(IDS_NVNOLINESSELTEXT));
-              DosSleep(150);//05 Aug 07 GKY 1500
+              DosSleep(150);
             }
           }
@@ -2035 +2031 @@
         {
           WinSendMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
-          DosSleep(16); //05 Aug 07 GKY 32
+          DosSleep(16); 
           return (MRESULT) 1;
         }
@@ -3949 +3945 @@
             WinInvalidateRect(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                                               NEWVIEW_DRAG), NULL, FALSE);
-            //WinInvalidateRect(ad->hhscroll, NULL, FALSE);
           }
           DosReleaseMutexSem(ad->ScanSem);
@@ -3988 +3983 @@
             WinInvalidateRect(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                                               NEWVIEW_DRAG), NULL, FALSE);
-            //WinInvalidateRect(ad->hhscroll, NULL, FALSE);
           }
           DosReleaseMutexSem(ad->ScanSem);
@@ -4073 +4067 @@
         }
         if (ad->busy)
-          DosSleep(100); //05 Aug 07 GKY 128
+          DosSleep(100); 
         if (ad->hps) {
           GpiDeleteSetId(ad->hps, NEWVIEWMLE_FONT_LCID);
@@ -4227 +4221 @@
         hwndFrame = (HWND) 0;
       else {
-        //DosSleep(32);
         if (!(FrameFlags & FCF_TASKLIST) && !(flags & 2)) {
           SWP swp;

trunk/dll/notebook.c

@@ -1954 +1954 @@
           if (SaveDirCnrState(hwndMain, PCSZ_FM2TEMPTEXT) > 0) {
             PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(RESTORE_STATE_CLOSE_CHILDREN));
-//          PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
             PostMsg(MainObjectHwnd, UM_RESTORE, (PSZ) PCSZ_FM2TEMPTEXT, MPFROMLONG(RESTORE_STATE_RESTORE));
           }
@@ -3836 +3835 @@
           else {
             mp2 = WinSendMsg(mi.hwndSubMenu, MM_QUERYDEFAULTITEMID, MPVOID, MPVOID);
-            //if (!mp2) // causes spurious error message on new installs GKY 1-9-09
-            //  mp2 = MPFROMLONG(IDM_QUICKSETTINGS);
-              //Runtime_Error(pszSrcFile, __LINE__, "MM_QUERYDEFAULTITEMID");
           }
         }
@@ -4027 +4023 @@
     break;
   case WM_CLOSE:
-    //SaveLastPageIndex(hwnd);
     break;
   }

trunk/dll/objcnr.c

@@ -32 +32 @@
 #include <string.h>
 #include <ctype.h>
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -104 +103 @@
   strcpy(maskstr, filename);
   AddBackslashToPath(maskstr);
-  //if (maskstr[strlen(maskstr) - 1] != '\\')
-  //  strcat(maskstr, "\\");
   endpath = &maskstr[strlen(maskstr)];
   strcat(maskstr, "*");
@@ -324 +321 @@
 
   case UM_SETUP:
-    // WinEnableWindowUpdate(WinWindowFromID(hwnd,OBJCNR_CNR),FALSE);
     {
       CNRINFO cnri;
@@ -347 +343 @@
   case UM_CONTAINER_FILLED:
     WinSetDlgItemText(hwnd, OBJCNR_NOTE, NullStr);
-//      WinEnableWindowUpdate(WinWindowFromID(hwnd,OBJCNR_CNR),TRUE);
     WinSendDlgItemMsg(hwnd, OBJCNR_CNR, CM_INVALIDATERECORD, MPVOID,
                       MPFROM2SHORT(0, CMA_ERASE | CMA_INVALIDATE));

trunk/dll/pathutil.c

@@ -69 +69 @@
   return pszPathName;
 }
-
-// #pragma data_seg(DATA1)
 
 /**

trunk/dll/rename.c

@@ -93 +93 @@
     }
     if (mv->compare) {
-      //WinShowWindow(WinWindowFromID(hwnd, REN_DONTASK), FALSE);
       WinShowWindow(WinWindowFromID(hwnd, REN_OVEROLD), FALSE);
       WinShowWindow(WinWindowFromID(hwnd, REN_OVERNEW), FALSE);

trunk/dll/seeall.c

@@ -72 +72 @@
 #include <string.h>
 #include <ctype.h>
-// #include <process.h>
 
 #define INCL_DOS
@@ -719 +718 @@
                 goto Abort;
               }
-              DosSleep(0);              //26 Aug 07 GKY 1
+              DosSleep(0);              
               if (mv.skip || !*mv.target)
                 break;
@@ -1194 +1193 @@
         if (toupper(*path) < 'C' && !fAlertBeepOff)
           DosBeep(1000, 25);
-        DosSleep(16);                   // 05 Aug 07 GKY 33
+        DosSleep(16);                   
         break;
 
@@ -1395 +1394 @@
           TileChildren(hwndMain, TRUE);
         WinSetWindowPos(hwndC, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE);
-        DosSleep(100);//05 Aug 07 GKY 250
+        DosSleep(100);
       }
     }
     else {
       StartCollector(HWND_DESKTOP, 4);
-      DosSleep(100);//05 Aug 07 GKY 250
+      DosSleep(100);
     }
   }
@@ -1748 +1747 @@
           for (x = 0; x < ad->afheadcnt; x++)
             ad->afhead[x].flags &= (~(AF_DUPE | AF_SELECTED));
-          DosSleep(0);  //26 Aug 07 GKY 1
+          DosSleep(0);  
           for (x = 0; x < ad->afheadcnt && !ad->stopflag; x++) {
             if (!(ad->afhead[x].flags & (AF_DUPE | AF_FILTERED))) {
@@ -2176 +2175 @@
                   break;
                 PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-                DosSleep(0); //26 Aug 07 GKY 1
+                DosSleep(0); 
               }
             } // for
@@ -2736 +2735 @@
       }
       else {
-        DosSleep(50);//05 Aug 07 GKY 100
+        DosSleep(50);
         PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
         PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
@@ -4205 +4204 @@
         else {
           DosReleaseMutexSem(pAD->hmtxScan);
-          DosSleep(50);//05 Aug 07 GKY 100
+          DosSleep(50);
           WinInvalidateRect(hwnd, NULL, FALSE);
           PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
@@ -4388 +4387 @@
       }
       else if (SHORT1FROMMP(mp1) == IDM_COLLECTOR) {
-        DosSleep(50);//05 Aug 07 GKY 100
+        DosSleep(50);
         if (!PostMsg(hwnd, msg, mp1, mp2))
           WinSendMsg(hwnd, msg, mp1, mp2);

trunk/dll/strutil.c

@@ -96 +96 @@
   #pragma aux SMPSafeInc = "lock inc cBusy" modify exact [];
   #pragma aux SMPSafeDec = "lock dec cBusy" modify exact [];
-  // SMPSafeInc();
   for (c = 0; ; c++) {
     if (SMPSafeInc(), cBusy == 1)
@@ -114 +113 @@
     extern PTIB2 GetPTIB2(void);
     #pragma aux GetPTIB2 = "mov eax,fs:[12]" value [eax];
-    // PIB *ppib;
-    // TIB *ptib;
     TIB2 *ptib2 = GetPTIB2();
-    // APIRET apiret = DosGetInfoBlocks(&ptib, &ppib);
     ulDbgId = id;
-    // ulDbgTid = apiret == 0 ? ptib->tib_ptib2->tib2_ultid : 0;
     ulDbgTid = ptib2->tib2_ultid;
   }

trunk/dll/systemf.c

@@ -1242 +1242 @@
           for (ctr = 0;; ctr++)
           {
-            DosSleep(50);//05 Aug 07 GKY 200
+            DosSleep(50);
             if (DosSetSession(ulSessID, &sd))   // Check if session gone (i.e. finished)
               break;
@@ -1258 +1258 @@
                                 DCWW_NOWAIT, &bPriority, hTermQSem);
               if (rc == ERROR_QUE_EMPTY) {
-                DosSleep(50);//05 Aug 07 GKY 100
+                DosSleep(50);
                 continue;
               }
@@ -1273 +1273 @@
               // Oh heck
               Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,"DosReadQueue");
-              DosSleep(100);//05 Aug 07 GKY 500
+              DosSleep(100);
               continue;
             }
-
-            //  printf("%s %d DosReadQueue thread 0x%x sess %u sessRC %u rq.pid 0x%x rq.data 0x%x\n",
-            //       __FILE__, __LINE__,ptib->tib_ordinal,pTermInfo->usSessID,pTermInfo->usRC,rq.pid, rq.ulData); fflush(stdout);
 
             if (pTermInfo->usSessID == ulSessID)
@@ -1286 +1283 @@
             {
               static ULONG ulLastSessID;
-              // printf("%s %d requeue thread 0x%x our sess %u term sess %u term rc %u\n",
-              //       __FILE__, __LINE__,ptib->tib_ordinal,ulSessID,pTermInfo->usSessID,pTermInfo->usRC); fflush(stdout);
-              // fixme to be gone when no longer needed for debug?
               if (ulLastSessID) {
-                DosSleep(100);//05 Aug 07 GKY 500
+                DosSleep(100);
                 ulLastSessID = pTermInfo->usSessID;
               }
@@ -1297 +1291 @@
               if (rc)
                 Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,"DosWriteQueue");
-              DosSleep(50); //05 Aug 07 GKY 100         // Let other thread see queue entry
+              DosSleep(50);          // Let other thread see queue entry
             }
           } // for
 
           ret = pTermInfo->usRC == 0;           // Set 1 if rc 0 else 0
-          // printf("%s %d thread 0x%x term for sess %u\n",
-          //      __FILE__, __LINE__,ptib->tib_ordinal,ulSessID);fflush(stdout);
           DosFreeMem(pTermInfo);
         }

trunk/dll/timer.c

@@ -14 +14 @@
 
 ***********************************************************************/
-
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS

trunk/dll/treecnr.c

@@ -130 +130 @@
 #include <string.h>
 #include <ctype.h>
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -867 +866 @@
       dcd->hwndObject = hwnd;
       if (ParentIsDesktop(hwnd, dcd->hwndParent))
-        DosSleep(100); //05 Aug 07 GKY 250
+        DosSleep(100); 
     }
     return 0;
@@ -1266 +1265 @@
         else {
           menuHwnd = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
-//            WinEnableMenuItem(DirMenu,
-//                              IDM_TREE,
-//                              FALSE);
         }
         if (!(pci->attrFile & FILE_DIRECTORY))
@@ -2778 +2774 @@
           }
           WinSetWindowPos(hwndC, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE);
-          DosSleep(100);//05 Aug 07 GKY 250
+          DosSleep(100);
         }
         else
@@ -2800 +2796 @@
 
       case IDM_COLLECTOR:
-        DosSleep(32);//05 Aug 07 GKY 64
+        DosSleep(32);
         {
           CHAR **list;
@@ -3107 +3103 @@
           if (!cmdloaded)
             load_commands();
-          x = SHORT1FROMMP(mp1);// - IDM_COMMANDSTART;
+          x = SHORT1FROMMP(mp1);
           if (x >= 0) {
-            //x++;
             RunCommand(hwnd, x);
             if (fUnHilite)
@@ -3151 +3146 @@
       fOkayMinimize = TRUE;
       if (dcd->hwndObject) {
-        DosSleep(50);//05 Aug 07 GKY 100
+        DosSleep(50);
           fOkayMinimize = FALSE;
           WinSetWindowPos(((hwndMain) ? WinQueryWindow(hwndMain, QW_PARENT) :

trunk/dll/undel.c

@@ -28 +28 @@
 #include <string.h>
 #include <ctype.h>
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -216 +215 @@
       strcpy(s, (CHAR *)mp2);
       AddBackslashToPath(s);
-      //if (s[strlen(s) - 1] != '\\')
-      //  strcat(s, "\\");
       strcat(s, "*");
       WinSetDlgItemText(hwnd, UNDEL_ENTRY, s);
@@ -262 +259 @@
         }
         else
-          DosSleep(100);//05 Aug 07 GKY 500
+          DosSleep(100);
       }
       refresh = FALSE;

trunk/dll/walkem.c

@@ -1021 +1021 @@
         APIRET rc;
 
-        // *szBuffer = 0;
-        // WinQueryDlgItemText(hwnd,WALK_RECENT,CCHMAXPATH,szBuffer);
         if (!*szBuffer)
           break;
@@ -1155 +1153 @@
           strcpy(szBuff, wa->szCurrentPath);
           AddBackslashToPath(szBuff);
-          //if (szBuff[strlen(szBuff) - 1] != '\\')
-          //  strcat(szBuff, "\\");
           strcat(szBuff, szBuffer);
           MakeFullName(szBuff);
@@ -1544 +1540 @@
           strcpy(szBuff, wa->szCurrentPath1);
           AddBackslashToPath(szBuff);
-          //if (szBuff[strlen(szBuff) - 1] != '\\')
-          //  strcat(szBuff, "\\");
           strcat(szBuff, szBuffer);
           MakeFullName(szBuff);
@@ -1610 +1604 @@
           strcpy(szBuff, wa->szCurrentPath2);
           AddBackslashToPath(szBuff);
-          //if (szBuff[strlen(szBuff) - 1] != '\\')
-          //  strcat(szBuff, "\\");
           strcat(szBuff, szBuffer);
           MakeFullName(szBuff);

trunk/dll/worker.c

@@ -83 +83 @@
 #define INCL_DOS
 #define INCL_DOSERRORS
-// #define INCL_WINPROGRAMLIST          // 13 Jul 09 SHL dropped
-// #define INCL_WINHELP                 // 13 Jul 09 SHL dropped
 #define INCL_LONGLONG
 #define INCL_WINPOINTERS                // WinSetFileIcon
-// #define INCL_WINWORKPLACE            // 13 Jul 09 SHL dropped
 #define INCL_WINSHELLDATA               // PrfQueryProfileData
 
@@ -467 +464 @@
                             wk->li->list[x]);
                     AddNote(message);
-                    if (//fSyncUpdates ||
-                        AddToList(outname, &files, &cFilesModified, &cItemsAllocated))
+                    if (AddToList(outname, &files, &cFilesModified, &cItemsAllocated))
                       Broadcast(hab2,
                                 wk->hwndCnr,
@@ -572 +568 @@
                     goto Abort;
                   if (ret == 1) {
-                    if (//fSyncUpdates ||
-                        AddToList(wk->li->list[x],
+                    if (AddToList(wk->li->list[x],
                                   &files, &cFilesModified, &cItemsAllocated))
                       Broadcast(hab2,
@@ -1094 +1089 @@
               if (toupper(*wk->li->targetpath) < 'C' && !fAlertBeepOff)
                 DosBeep(1000, 25);      // Wake up user
-              DosSleep(16);//05 Aug 07 GKY 33
+              DosSleep(16);
               if (wk->li->type == IDM_WPSMOVE || wk->li->type == IDM_WPSCOPY)
-                DosSleep(48);//05 Aug 07 GKY 96
+                DosSleep(48);
               break;
             default:
@@ -1298 +1293 @@
               strcpy(szBuffer, wk->li->targetpath);
               AddBackslashToPath(wk->li->targetpath);
-              //if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] != '\\')
-              //  strcat(szBuffer, "\\");
               p = szBuffer + strlen(szBuffer);
               for (x = 0; wk->li->list[x]; x++) {
@@ -1836 +1829 @@
                   AddNote(prompt);
                 }
-                if (//fSyncUpdates ||
-                    AddToList(wk->li->list[x], &files, &numfiles, &numalloc)) {
+                if (AddToList(wk->li->list[x], &files, &numfiles, &numalloc)) {
                   Broadcast(hab2,
                             wk->hwndCnr,

trunk/dll/wrappers.c

@@ -305 +305 @@
   if (rc)
     Runtime_Error(pszSrcFile, uiLineNumber, GetPString(IDS_OUTOFMEMORY));
-  //DbgMsg(pszSrcFile, uiLineNumber, "ppb %p", *ppb);
   return rc;
 }