Changeset 1876 for trunk/dll/common.c

Timestamp:

Oct 11, 2015, 1:42:28 AM (10 years ago)

Author:

Gregg Young

Message:

Eliminate some unnecessary Flesh and UnFlesh calls.Update icon and display name on CD/DVD eject in all cases.
Don't use Flesh thread for floppy drive scans fix them getting mistakenly identified as directories and add nonexistent subdirectories.

File:

• trunk/dll/common.c (modified) (2 diffs)

trunk/dll/common.c

@@ -37 +37 @@
                 for tree container and collector.
   07 Aug 15 SHL Clean up and comment
+  10 Oct 15 GKY Update icon and display name on CD/DVD eject in all cases.
 
 ***********************************************************************/
@@ -386 +387 @@
       DosError(FERR_DISABLEHARDERR);
       rc = DosDevIOCtl(-1L, 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))) {
-        BOOL toggleTree = FALSE;
-
-        if (!hwndTree) {
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
-          toggleTree = TRUE;
-        }
-        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        if (toggleTree)
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+      if (cmd == IDM_EJECT) {
+        if ((fEjectFlpyScan ? TRUE : parm[1] > 1) &&
+            (fEjectCDScan ? TRUE : !(driveflags[parm[1]] & DRIVE_CDROM)) &&
+            (fEjectRemovableScan ? TRUE : (parm[1] < 2 ||
+                                           driveflags[parm[1]] & DRIVE_CDROM))) {
+          BOOL toggleTree = FALSE;
+  
+          if (!hwndTree) {
+            WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+            toggleTree = TRUE;
+          }
+          WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+          if (toggleTree)
+            WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        }
+        else  if (driveflags[parm[1]] & DRIVE_CDROM) {
+          driveflags[parm[1]] |= DRIVE_INVALID;
+          PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
+        }
       }
     }