Changeset 1868

Timestamp:

Aug 24, 2015, 10:51:17 PM (10 years ago)

Author:

Gregg Young

Message:

Remove obsolete code fDontAsk?zip and fDummy

Location:

trunk/dll

Files:

• filldir.c (modified) (3 diffs)
• init.c (modified) (3 diffs)
• init.h (modified) (2 diffs)
• treecnr.c (modified) (4 diffs)
• treecnr.h (modified) (2 diffs)

trunk/dll/filldir.c

@@ -119 +119 @@
   22 Aug 15 GKY Minimize the occurence of an A:\ Drive not ready error by moving the cursor
                 to the default drive.
+  24 AUG 15 GKY Remove fDummy code
 
 ***********************************************************************/
@@ -1269 +1270 @@
   DbgMsg(pszSrcFile, __LINE__, "FillTreeCnr hwndCnr %x hwndParent %x", hwndCnr, hwndParent);     // 2015-08-03 SHL FIXME debug
 
-  fDummy = TRUE;
   *szSuggest = 0;
   for (iDrvNum = 0; iDrvNum < 26; iDrvNum++) {
@@ -1673 +1673 @@
 
   DosSleep(16);
-  fDummy = FALSE;
 
   fInitialDriveScan = FALSE;

trunk/dll/init.c

@@ -138 +138 @@
   20 Aug 15 SHL Support PCSZ_DOS...SEM
   22 Aug 15 GKY Remove recurse scan code.
-
+  24 Aug 15 GKY Remove obsolete code fDontAsk?zip
+  
 ***********************************************************************/
 
@@ -261 +262 @@
 BOOL fReminimize;
 BOOL fWantFirstTimeInit;
-BOOL fUseShellEnv;
-BOOL fDontAskBzip;
-BOOL fDontAskGzip;
-//BOOL fDrivetoSkip[26];
+BOOL fUseShellEnv;;
 HPOINTER hptrApp;
 HPOINTER hptrArc;
@@ -1646 +1644 @@
   if (fThreadNotes)
     ShowNote();
-  size = sizeof(BOOL);
-  PrfQueryProfileData(fmprof, FM3Str, "DontAskBzip", &fDontAskBzip, &size);
-  size = sizeof(BOOL);
-  PrfQueryProfileData(fmprof, FM3Str, "DontAskGzip", &fDontAskGzip, &size);
 
   // 2015-08-11 SHL FIXME debug

trunk/dll/init.h

@@ -45 +45 @@
   19 Aug 15 SHL Delete obsoletes
   20 Aug 15 SHL Support PCSZ_DOS...SEM
+  24 Aug 15 GKY Remove obsolete code fDontAsk?zip
 
 ***********************************************************************/
@@ -223 +224 @@
 extern BOOL fWantFirstTimeInit;
 extern BOOL fUseShellEnv;
-extern BOOL fDontAskBzip;
-extern BOOL fDontAskGzip;
 extern HPOINTER hptrApp;
 extern HPOINTER hptrArc;

trunk/dll/treecnr.c

@@ -104 +104 @@
   22 Aug 15 GKY Improve ability of maketop to get directory position in tree correct on first
                 open of states with large and/or deep tree structures
+  24 AUG 15 GKY Remove fDummy code
 
 ***********************************************************************/
@@ -180 +181 @@
 INT driveserial[26];
 BOOL fDCOpens;
-BOOL fDummy;
 BOOL fFollowTree;
 BOOL fTopDir;
@@ -1798 +1798 @@
 
       case CN_EMPHASIS:
-        if (!fDummy) {
-
-          PNOTIFYRECORDEMPHASIS pre = mp2;
-
-          if (pre->fEmphasisMask & CRA_SELECTED) {
-            if (pre->pRecord->flRecordAttr & CRA_SELECTED) {
-              if (((PCNRITEM) (pre->pRecord))->attrFile & FILE_DIRECTORY) {
-                PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-                if (fFollowTree &&
-                    !(driveflags
-                      [toupper(*((PCNRITEM) pre->pRecord)->pszFileName) -
-                       'A'] & DRIVE_INVALID)) {
-                  if (!LastDir && !ParentIsDesktop(hwnd, dcd->hwndParent))
-                    LastDir = FindDirCnr(dcd->hwndParent);
-                  if (LastDir) {
-
-                    NOTIFYRECORDENTER pri;
-                    BOOL tbool = fDCOpens;
-
-                    fDCOpens = FALSE;
-                    memset(&pri, 0, sizeof(pri));
-                    pri.hwndCnr = hwnd;
-                    pri.fKey = FALSE;
-                    pri.pRecord = pre->pRecord;
-                    WinSendMsg(hwnd,
-                               WM_CONTROL,
-                               MPFROM2SHORT(SHORT1FROMMP(mp1),
-                                            CN_ENTER), MPFROMP(&pri));
-                    fDCOpens = tbool;
-                  }
-                }
-                if (*(ULONG *) realappname != FM3UL)
-                  WinSetWindowText(WinWindowFromID(dcd->hwndFrame,
-                                                   MAIN_STATUS),
-                                   ((PCNRITEM) (pre->pRecord))->pszFileName);
-              }
-            }
-          }
-        }
-        break;
+        {
+          PNOTIFYRECORDEMPHASIS pre = mp2;
+
+          if (pre->fEmphasisMask & CRA_SELECTED) {
+            if (pre->pRecord->flRecordAttr & CRA_SELECTED) {
+              if (((PCNRITEM) (pre->pRecord))->attrFile & FILE_DIRECTORY) {
+                PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+                if (fFollowTree &&
+                    !(driveflags
+                      [toupper(*((PCNRITEM) pre->pRecord)->pszFileName) -
+                       'A'] & DRIVE_INVALID)) {
+                  if (!LastDir && !ParentIsDesktop(hwnd, dcd->hwndParent))
+                    LastDir = FindDirCnr(dcd->hwndParent);
+                  if (LastDir) {
+  
+                    NOTIFYRECORDENTER pri;
+                    BOOL tbool = fDCOpens;
+  
+                    fDCOpens = FALSE;
+                    memset(&pri, 0, sizeof(pri));
+                    pri.hwndCnr = hwnd;
+                    pri.fKey = FALSE;
+                    pri.pRecord = pre->pRecord;
+                    WinSendMsg(hwnd,
+                               WM_CONTROL,
+                               MPFROM2SHORT(SHORT1FROMMP(mp1),
+                                            CN_ENTER), MPFROMP(&pri));
+                    fDCOpens = tbool;
+                  }
+                }
+                if (*(ULONG *) realappname != FM3UL)
+                  WinSetWindowText(WinWindowFromID(dcd->hwndFrame,
+                                                   MAIN_STATUS),
+                                   ((PCNRITEM) (pre->pRecord))->pszFileName);
+              }
+            }
+          }
+        }
+        break;
 
       case CN_CONTEXTMENU:
@@ -3183 +3182 @@
     if (dcd && hwndMain) {
       fOkayMinimize = TRUE;
-      if (dcd->hwndObject && !fDummy) {
+      if (dcd->hwndObject) {
         DosSleep(50);//05 Aug 07 GKY 100
-        if (!fDummy) {
           fOkayMinimize = FALSE;
           WinSetWindowPos(((hwndMain) ? WinQueryWindow(hwndMain, QW_PARENT) :
                            dcd->hwndFrame), HWND_TOP, 0, 0, 0, 0,
                           SWP_MINIMIZE | SWP_DEACTIVATE);
-        }
       }
     }

trunk/dll/treecnr.h

@@ -14 +14 @@
                 and have no default choice.
   23 Aug 15 SHL Protect ShowTreeRec dirname arg
+  24 AUG 15 GKY Remove fDummy code
 
 ***********************************************************************/
@@ -35 +36 @@
 extern INT driveserial[26];
 extern BOOL fDCOpens;
-extern BOOL fDummy;
 extern BOOL fFollowTree;
 extern BOOL fTopDir;