Changeset 1365

Timestamp:

Jan 1, 2009, 8:00:28 PM (17 years ago)

Author:

Gregg Young

Message:

Add option to rescan drive tree on media eject Ticket 48; Remove error message when priovious notebook page isn't defined (fixes issue with new installs) Ticket 329

Location:

trunk/dll

Files:

• common.c (modified) (1 diff)
• fm3dlg.h (modified) (1 diff)
• fm3res.dlg (modified) (2 diffs)
• init.c (modified) (3 diffs)
• notebook.c (modified) (5 diffs)
• notebook.h (modified) (1 diff)

trunk/dll/common.c

@@ -368 +368 @@
       DosError(FERR_DISABLEHARDERR);
       DosDevIOCtl(-1L,
-                  8L, 0x40L, &parm, sizeof(parm), &plen, NULL, 0L, &dlen);
+                  8L, 0x40L, &parm, sizeof(parm), &plen, NULL, 0L, &dlen);
+      if (cmd == IDM_EJECT &&
+          (fEjectFlpyScan ? TRUE : parm[1] > 1) &&
+          (fEjectCDScan ? TRUE : !(driveflags[parm[1]] & DRIVE_CDROM)) &&
+          (fEjectRemovableScan ? TRUE : (parm[1] < 2 || driveflags[parm[1]] & DRIVE_CDROM)))
+        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
     }
     break;

trunk/dll/fm3dlg.h

@@ -718 +718 @@
 #define CFGS_RSCANSLOW                                                                  25373
 #define CFGS_RSCANNOWRITE                                                               25374
+#define CFGS_EJECTREMOVABLESCAN                                                         25375
+#define CFGS_EJECTCDSCAN                                                                25376
+#define CFGS_EJECTFLPYSCAN                                                              25377
 
 #define CFGA_FRAME                                                                              25380

trunk/dll/fm3res.dlg

@@ -1929 +1929 @@
                         SPBS_JUSTCENTER | WS_TABSTOP | SPBS_FASTSPIN |
                         WS_VISIBLE
-        LTEXT           "Recurse scan at startup:", -1, 130, 128, 106, 10, NOT WS_GROUP
+        GROUPBOX        "Recurse scan at startup:", -1, 130, 65, 166, 70, NOT WS_GROUP
         AUTOCHECKBOX    "Local hard drives", CFGS_RSCANLOCAL, 136, 116, 106, 10
         AUTOCHECKBOX    "Remote drives", CFGS_RSCANREMOTE, 136, 104, 106, 10
@@ -1937 +1937 @@
         AUTOCHECKBOX    "Read only drives of drive types selected", CFGS_RSCANNOWRITE,
                         142, 68, 136, 10
-        PUSHBUTTON      "~Help", IDM_HELP, 120, 4, 40, 14, BS_NOPOINTERFOCUS |
-                        WS_GROUP
-        PUSHBUTTON      "~Undo", IDM_UNDO, 168, 4, 40, 14, BS_NOPOINTERFOCUS
+        GROUPBOX        "Drive tree rescan on media eject from:", -1, 130, 16, 166, 45, NOT WS_GROUP
+        AUTOCHECKBOX    "Removable drives", CFGS_EJECTREMOVABLESCAN, 136, 44, 106, 10
+        AUTOCHECKBOX    "CD/DVD drives", CFGS_EJECTCDSCAN, 136, 32, 106, 10
+        AUTOCHECKBOX    "Floppy drives", CFGS_EJECTFLPYSCAN, 136, 20, 106, 10
+        PUSHBUTTON      "~Help", IDM_HELP, 4, 4, 40, 14, BS_NOPOINTERFOCUS |
+                        WS_GROUP
+        PUSHBUTTON      "~Undo", IDM_UNDO, 52, 4, 40, 14, BS_NOPOINTERFOCUS
     END
 END

trunk/dll/init.c

@@ -1037 +1037 @@
   }
 
-  /* a couple of default window procs so we don't have to look them up later */
+  // a couple of default window procs so we don't have to look them up later
   if (WinQueryClassInfo(hab, WC_CONTAINER, &clinfo))
     PFNWPCnr = clinfo.pfnWindowProc;
@@ -1239 +1239 @@
     ULONG ulAppType;
 
-    FullPath = searchapath("PATH", "LVMGUI.CMD");
-    if (*FullPath)
-      fLVMGui = TRUE;
+      FullPath = searchapath("PATH", "LVMGUI.CMD");
+      if (*FullPath)
+        fLVMGui = TRUE;
     if (!DosQueryAppType("DFSOS2.EXE", &ulAppType))
       fDFSee = TRUE;
-    if (!DosQueryAppType("MINILVM.EXE", &ulAppType))
-      fMiniLVM = TRUE;
-    if (!DosQueryAppType("FDISK.EXE", &ulAppType))
-      fFDisk = TRUE;
-    if (!DosQueryAppType("LVM.EXE", &ulAppType))
-      fLVM = TRUE;
+      if (!DosQueryAppType("MINILVM.EXE", &ulAppType))
+        fMiniLVM = TRUE;
+      if (!DosQueryAppType("FDISK.EXE", &ulAppType))
+        fFDisk = TRUE;
+      if (!DosQueryAppType("LVM.EXE", &ulAppType))
+        fLVM = TRUE;
   }
 
@@ -1579 +1579 @@
   PrfQueryProfileData(fmprof, appname, "RScanNoWrite", &fRScanNoWrite, &size);
   size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, appname, "EjectRemovableScan", &fEjectRemovableScan, &size);
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, appname, "EjectCDScan", &fEjectCDScan, &size);
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, appname, "EjectFlpyScan", &fEjectFlpyScan, &size);
+  size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "Drag&DropDlg", &fDragndropDlg, &size);
   size = sizeof(BOOL);

trunk/dll/notebook.c

@@ -105 +105 @@
 BOOL fDragndropDlg;
 BOOL fDrivebarHelp;
+BOOL fEjectCDScan;
+BOOL fEjectFlpyScan;
+BOOL fEjectRemovableScan;
 BOOL fExternalArcboxes;
 BOOL fExternalCollector;
@@ -475 +478 @@
     WinCheckButton(hwnd, CFGS_FORCELOWER, fForceLower);
     WinCheckButton(hwnd, CFGS_FORCEUPPER, fForceUpper);
+    WinCheckButton(hwnd, CFGS_REMOTEBUG, fRemoteBug);
     WinCheckButton(hwnd, CFGS_NOREMOVABLESCAN, fNoRemovableScan);
     WinCheckButton(hwnd, CFGS_RSCANLOCAL, fRScanLocal);
@@ -481 +485 @@
     WinCheckButton(hwnd, CFGS_RSCANSLOW, fRScanSlow);
     WinCheckButton(hwnd, CFGS_RSCANNOWRITE, fRScanNoWrite);
-    WinCheckButton(hwnd, CFGS_REMOTEBUG, fRemoteBug);
+    WinCheckButton(hwnd, CFGS_EJECTREMOVABLESCAN, fEjectRemovableScan);
+    WinCheckButton(hwnd, CFGS_EJECTCDSCAN, fEjectCDScan);
+    WinCheckButton(hwnd, CFGS_EJECTFLPYSCAN, fEjectFlpyScan);
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_SETCURRENTVALUE,
                       MPFROMLONG(FilesToGet), MPVOID);
@@ -556 +562 @@
                         sizeof(BOOL));
     fNoRemovableScan = WinQueryButtonCheckstate(hwnd, CFGS_NOREMOVABLESCAN);
-    PrfWriteProfileData(fmprof, FM3Str, "NoRemovableScan", &fNoRemovableScan,
+    PrfWriteProfileData(fmprof, appname, "NoRemovableScan", &fNoRemovableScan,
+                        sizeof(BOOL));
+    fEjectRemovableScan = WinQueryButtonCheckstate(hwnd, CFGS_EJECTREMOVABLESCAN);
+    PrfWriteProfileData(fmprof, appname, "EjectRemovableScan", &fEjectRemovableScan,
+                        sizeof(BOOL));
+    fEjectCDScan = WinQueryButtonCheckstate(hwnd, CFGS_EJECTCDSCAN);
+    PrfWriteProfileData(fmprof, appname, "EjectCDScan", &fEjectCDScan,
+                        sizeof(BOOL));
+    fEjectFlpyScan = WinQueryButtonCheckstate(hwnd, CFGS_EJECTFLPYSCAN);
+    PrfWriteProfileData(fmprof, appname, "EjectFlpyScan", &fEjectFlpyScan,
                         sizeof(BOOL));
     fNoIconsFiles = WinQueryButtonCheckstate(hwnd, CFGS_NOICONSFILES);
@@ -3676 +3691 @@
           else {
             mp2 = WinSendMsg(mi.hwndSubMenu, MM_QUERYDEFAULTITEMID, MPVOID, MPVOID);
-            if (!mp2)
-              Runtime_Error(pszSrcFile, __LINE__, "MM_QUERYDEFAULTITEMID");
+            //if (!mp2)
+            //  mp2 = MPFROMLONG(IDM_QUICKSETTINGS);
+              //Runtime_Error(pszSrcFile, __LINE__, "MM_QUERYDEFAULTITEMID");
           }
         }

trunk/dll/notebook.h

@@ -45 +45 @@
 extern BOOL fDragndropDlg;
 extern BOOL fDrivebarHelp;
+extern BOOL fEjectCDScan;
+extern BOOL fEjectFlpyScan;
+extern BOOL fEjectRemovableScan;
 extern BOOL fExternalArcboxes;
 extern BOOL fExternalCollector;