Changeset 1878

Timestamp:

Oct 12, 2015, 12:24:39 AM (10 years ago)

Author:

Gregg Young

Message:

Remove some dead code and comments source files starting with A-D

Location:

trunk

Files:

• dll/arccnrs.c (modified) (9 diffs)
• dll/assoc.c (modified) (2 diffs)
• dll/autoview.c (modified) (1 diff)
• dll/cmdline.c (modified) (5 diffs)
• dll/collect.c (modified) (2 diffs)
• dll/colors.c (modified) (1 diff)
• dll/comp.c (modified) (5 diffs)
• dll/copyf.c (modified) (1 diff)
• dll/dircnrs.c (modified) (8 diffs)
• dll/dirsize.c (modified) (5 diffs)
• dll/draglist.c (modified) (3 diffs)
• vtree.def (modified) (1 diff)

trunk/dll/arccnrs.c

@@ -2130 +2130 @@
                        (li->type == IDM_EDITTEXT && *editor) ||
                        (li->type == IDM_EDITBINARY && *bined)) {
-                //DosSleep(32); // Added WAIT to runemf2 12-12-08 GKY
                 ExecOnList(hwnd, ((li->type == IDM_VIEWTEXT) ? viewer :
                                   (li->type == IDM_VIEWBINARY) ? binview :
                                   (li->type == IDM_EDITTEXT) ? editor :
                                   bined),
-                           WINDOWED | SEPARATE, NULL, NULL, // li->targetpath,
+                           WINDOWED | SEPARATE, NULL, NULL, 
                            li->list,
                            NULL, pszSrcFile, __LINE__);
@@ -2238 +2237 @@
               WinSendMsg(dcd->hwndCnr, WM_COMMAND,
                          MPFROM2SHORT(IDM_COLLECTOR, 0), MPVOID);
-              DosSleep(10); //05 Aug 07 GKY 128
+              DosSleep(10); 
               if (Collector) {
                 if (!PostMsg(Collector, WM_COMMAND,
@@ -2266 +2265 @@
     if (dcd) {
       if (*dcd->workdir) {
-        DosSleep(16); //05 Aug 07 GKY 33
+        DosSleep(16);
         wipeallf(TRUE, "%s\\*", dcd->workdir);
         if (rmdir(dcd->workdir)) {
-          DosSleep(100); //05 Aug 07 GKY 256
+          DosSleep(100);
           wipeallf(TRUE, "%s\\*", dcd->workdir);
           rmdir(dcd->workdir);
@@ -2635 +2634 @@
           if (!SetDir(dcd->hwndParent, hwnd, s, 0)) {
             if (stricmp(dcd->directory, s)) {
-              //DosEnterCritSec();  //GKY 11-29-08
               DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
               strcpy(lastextractpath, s);
               DosReleaseMutexSem(hmtxFM2Globals);
-              //DosExitCritSec();
             }
             strcpy(dcd->directory, s);
@@ -2667 +2664 @@
       SWP swp;
       CHAR *filename = mp1;
-      //printf("%s %d UM_ENTER %s\n",__FILE__, __LINE__, filename); fflush(stdout);
       if (IsFile(filename) != 1) {
         free(mp1);
@@ -3017 +3013 @@
             }
             WinSetWindowPos(hwndC, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE);
-            DosSleep(100); //05 Aug 07 GKY 128
+            DosSleep(100); 
           }
         }
@@ -3090 +3086 @@
         if (mp2) {
           if (stricmp(dcd->directory, (CHAR *) mp2)) {
-            //DosEnterCritSec(); //GKY 11-29-08
             DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
             strcpy(lastextractpath, (CHAR *) mp2);
             MakeValidDir(lastextractpath);
             DosReleaseMutexSem(hmtxFM2Globals);
-            //DosExitCritSec();
           }
           strcpy(dcd->directory, (CHAR *) mp2);
@@ -3370 +3364 @@
           LISTINFO *li;
 
-          //DosBeep(500, 100);          // fixme to know why beep?
           li = DoFileDrop(hwnd, dcd->arcname, FALSE, mp1, mp2);
-          //DosBeep(50, 100);           // fixme to know why beep?
           CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
           if (li) {
@@ -3739 +3731 @@
         }
         if (!*dcd->directory && *lastextractpath) {
-          //DosEnterCritSec();  //GKY 11-29-08
           DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
           strcpy(dcd->directory, lastextractpath);
           DosReleaseMutexSem(hmtxFM2Globals);
-          //DosExitCritSec();
         }
         if (!*dcd->directory) {

trunk/dll/assoc.c

@@ -886 +886 @@
           temp.offset = atol(dummy);
         }
-        //bstrip(temp.mask);
         sprintf(key, "ASSOC.%senv", temp.pszCmdLine);
         PrfWriteProfileString(fmprof, FM3Str, key, NULL);
@@ -980 +979 @@
           temp.offset = atol(dummy);
         }
-        //bstrip(temp.mask);
         sprintf(key, "ASSOC.%senv", temp.pszCmdLine);
         PrfWriteProfileString(fmprof, FM3Str, key, NULL);

trunk/dll/autoview.c

@@ -45 +45 @@
 #include <string.h>
 #include <ctype.h>
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS

trunk/dll/cmdline.c

@@ -99 +99 @@
   LINKCMDLINES *info, *last = NULL, *CmdLineHead;
   PSZ pszCmdLine;
-  //CHAR s[1024];
   INT x = 0;
   CHAR *moder = "r";
@@ -156 +155 @@
   FILE *fp;
   PSZ pszCmdLine;
-  //CHAR s[CCHMAXPATH + 14];
   CHAR *modew = "w";
 
@@ -399 +397 @@
     MLEsetlimit(WinWindowFromID(hwnd, EXEC_ENVIRON), 1000);
     WinSetDlgItemText(hwnd, EXEC_ENVIRON, ex->environment);
-//      WinEnableWindow(WinWindowFromID(hwnd,EXEC_ENVIRON),FALSE);
     WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
     PosOverOkay(hwnd);
@@ -421 +418 @@
         strcpy(executable, ex->path);
         AddBackslashToPath(executable);
-        //if (executable[strlen(executable) - 1] != '\\')
-        //  strcat(executable, "\\");
       }
       else
@@ -438 +433 @@
           *p = 0;
         if (IsFile(executable) == -1) {
-//        p = searchpath(executable);
-//        if (*p)
           if (SearchPathForFile(PCSZ_PATH, executable, executable))     // jbs: OK to have same source and destination?
-//          strcpy(executable, p);
-//        else {
             WinSetDlgItemText(hwnd,
                               EXEC_WARNING2,
                               (CHAR *) GetPString(IDS_CANTFINDFILETEXT));
             break;
-//        }
         }
       }

trunk/dll/collect.c

@@ -98 +98 @@
 #include <share.h>
 #include <limits.h>                     // USHRT_MAX
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS                        // QSV_MS_COUNT
@@ -2583 +2582 @@
 
           pci = (PCNRITEM) ((PCNRDRAGINFO) mp2)->pRecord;
-          // if(SHORT1FROMMP(mp1) == CN_DRAGAFTER)
-          //    pci = NULL;
           pDInfo = ((PCNRDRAGINFO) mp2)->pDragInfo;
           if (!DrgAccessDraginfo(pDInfo)) {

trunk/dll/colors.c

@@ -153 +153 @@
         co->colors[co->currentcolor] = (LONG) (SHORT1FROMMP(mp1) -
                                                COLOR_FIRST);
-        //DosBeep(1000, 1);             // fixme to be gone?
       }
       break;

trunk/dll/comp.c

@@ -1625 +1625 @@
       UINT l;
       UINT r;
-      // UINT cntr;
       FILELIST **filesl = NULL;
       FILELIST **filesr = NULL;
@@ -2012 +2011 @@
             pcir->pszDisplayName = pcir->pszFileName + lenr;
             pcir->attrFile = filesr[r]->attrFile;
-            // pcir->rc.hptrIcon = hptrFile;
             pcir->pszDispAttr = FileAttrToString(pcir->attrFile);
             pcir->cbFile = filesr[r]->cbFile;
@@ -2671 +2669 @@
       case BN_CLICKED:
         cmp = INSTDATA(hwnd);
-        //if (cmp)
-        //  *cmp->rightlist = 0;
         PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
         PostMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
@@ -2923 +2919 @@
       WinSetDlgItemText(hwnd, COMP_NOTE,
                         (CHAR *) GetPString(IDS_COMPHOLDFILTERINGTEXT));
-      // cmp->dcd.suspendview = 1;      // 12 Jan 08 SHL appears not to be used here
       priority_idle();                  // Don't hog resources
       WinSendMsg(GetHwndLeft(hwnd), CM_FILTER, MPFROMP(Filter),
@@ -2930 +2925 @@
                  MPFROMP(&cmp->dcd.mask));
       priority_normal();
-      // cmp->dcd.suspendview = 0;      // 12 Jan 08 SHL appears not to be used here
       if (*cmp->dcd.mask.szMask) {
         sprintf(s,

trunk/dll/copyf.c

@@ -86 +86 @@
 BOOL ignorereadonly = FALSE;
 
-//static CHAR default_disk(VOID);
-//static INT unlink_allf(CHAR * string, ...);
-
 #ifndef WinMoveObject
 HOBJECT APIENTRY WinMoveObject(HOBJECT hObjectofObject,

trunk/dll/dircnrs.c

@@ -103 +103 @@
 #include <ctype.h>
 #include <limits.h>
-//#include <malloc.h>                   // _msize _heapchk
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -2164 +2162 @@
               TileChildren(dcd->hwndParent, TRUE);
             WinSetWindowPos(hwndC, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE);
-            DosSleep(100); // 05 Aug 07 GKY 250
+            DosSleep(100);
           }
         }
@@ -2187 +2185 @@
 
       case IDM_COLLECTOR:
-        DosSleep(32); // 05 Aug 07 GKY 64
+        DosSleep(32); 
         {
           CHAR **list;
@@ -2703 +2701 @@
                     WinSetWindowPos(hwndC, HWND_TOP, 0, 0, 0, 0,
                                     SWP_ACTIVATE);
-                    DosSleep(100); //05 Aug 07 GKY 250
+                    DosSleep(100);
                   }
                 }
@@ -2773 +2771 @@
             if (!cmdloaded)
               load_commands();
-            x = SHORT1FROMMP(mp1);// - IDM_COMMANDSTART;
+            x = SHORT1FROMMP(mp1);
             if (x >= 0) {
-              //x++;
               RunCommand(hwnd, x);
               if (fUnHilite)
@@ -2800 +2797 @@
         if (pci->attrFile & FILE_DIRECTORY) {
           menuHwnd = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
-          // WinEnableMenuItem(DirMenu,IDM_TREE,TRUE);
         }
         else
@@ -3690 +3686 @@
       if (len == 0 && key != '\\') {
         // Let's see if user forgot leading backslash
-        // key = SHORT1FROMMP(mp2);
         if (SearchContainer(hwnd, msg, mp1, MPFROM2SHORT('\\', 0))) {
           if (SearchContainer(hwnd, msg, mp1, mp2))
@@ -3804 +3799 @@
                                        NULL,
                                        CCS_AUTOPOSITION | CCS_MINIICONS |
-                                       CCS_MINIRECORDCORE | ulCnrType, // |
-                                       //WS_VISIBLE,
+                                       CCS_MINIRECORDCORE | ulCnrType, 
                                        0,
                                        0,

trunk/dll/dirsize.c

@@ -173 +173 @@
   strcpy(maskstr, pszFileName);
   AddBackslashToPath(maskstr);
-  //if (maskstr[strlen(maskstr) - 1] != '\\')
-  //  strcat(maskstr, "\\");
   pEndMask = &maskstr[strlen(maskstr)]; // Point after last backslash
   strcat(maskstr, "*");
@@ -443 +441 @@
     fprintf(fp, "%*.*s%s %lu %s%s\n",
             indent * 2, indent * 2, " ",
-            pciParent->pszDisplayName,  //
+            pciParent->pszDisplayName,
             pciParent->attrFile,
             GetPString(IDS_FILETEXT), &"s"[pciParent->attrFile == 1]);
@@ -453 +451 @@
                                                CMA_ITEMORDER));
       while (pci && (INT) pci != -1) {
-        DosSleep(0); //26 Aug 07 GKY 1
+        DosSleep(0); 
         PrintToFile(hwndCnr, indent + 1, pci, fp);
         pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
@@ -935 +933 @@
             strrev(szTemp);
             AddBackslashToPath(szFileName);
-            //if (*szFileName && *szTemp != '\\')
-            //  strcat(szFileName, "\\");
             strcat(szFileName, szTemp);
             pci = WinSendDlgItemMsg(hwnd, DSZ_CNR, CM_QUERYRECORD,
@@ -1122 +1118 @@
       if (pState->hptr)
         WinDestroyPointer(pState->hptr);
-      DosSleep(16); //05 Aug 07 GKY 33
+      DosSleep(16);
       xfree(pState, pszSrcFile, __LINE__); // Let's hope no one is still looking
 #     ifdef FORTIFY

trunk/dll/draglist.c

@@ -709 +709 @@
           DrgDeleteStrHandle(pDItem->hstrTargetName);
         free(pDItem);
-        // pDItem = NULL;       // Why bother, we can count - fixme to be gone
         dcd->ulItemsToUnHilite = ulNumfiles + 1;
         break;
@@ -724 +723 @@
         pDItem->fsControl = DO_LINKABLE;
       ulNumfiles++;
-      // ppDItem[ulNumfiles] = NULL;    // Why bother - fixme to be gone
     }
   } // for
@@ -738 +736 @@
         pDInfo->usOperation = DO_LINK;
       pDInfo->hwndSource = hwndObj ? hwndObj : hwnd;
-      // pDInfo->hwndSource = hwnd;
       for (ulSelect = 0; ulSelect < ulNumfiles; ulSelect++) {
         if (!DrgSetDragitem(pDInfo, ppDItem[ulSelect], sizeof(DRAGITEM), ulSelect)) {

trunk/vtree.def

@@ -5 +5 @@
 # 14 Jun 07 SHL Convert to OpenWatcom
 
-option description '@#The Netlabs FM/2 team:3.23.0#@##1## 2015-05-25 03:23:00      TRESBOPEEP::EN:US:0:U:@@FM/2 Tree View MiniApp Copyright (c) 1993, 1998 M. Kimes, Copyright (c) 2001, 2015 Steven Levine and Associates, Inc. All rights reserved'
+option description '@#The Netlabs FM/2 team:3.24.0#@##1## 2015-10-11 03:24:00      TRESBOPEEP::EN:US:0:U:@@FM/2 Tree View MiniApp Copyright (c) 1993, 1998 M. Kimes, Copyright (c) 2001, 2015 Steven Levine and Associates, Inc. All rights reserved'
 
 option stack = 488416