Changeset 1251 for trunk/dll/treecnr.c

Timestamp:

Oct 19, 2008, 6:34:56 PM (17 years ago)

Author:

Gregg Young

Message:

Fix issues with drives context menu (Tickets 279, 290)

File:

• trunk/dll/treecnr.c (modified) (4 diffs)

trunk/dll/treecnr.c

@@ -47 +47 @@
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
   02 Aug 08 GKY Always pass temp variable point to UM_SHOWME to avoid freeing pci->pszFileName early
+  19 Oct 08 GKY Fixed logic for greying menu items (Format etc) on remote and virtual drives (it was reversed)
+  19 Oct 08 GKY Fixed context menu to be "drives" menu on unformatted drives
 
 ***********************************************************************/
@@ -58 +60 @@
 #define INCL_WIN
 #define INCL_LONGLONG
+#define INCL_DOSERRORS
 
 #include "fm3dll.h"
@@ -1108 +1111 @@
       PCNRITEM pci;
       HWND menuHwnd = (HWND) 0;
+      FSALLOCATE fsa;
 
       pci = (PCNRITEM) CurrentRecord(hwnd);
       if (pci && (INT) pci != -1) {
-        if (IsRoot(pci->pszFileName))
+        if (IsRoot(pci->pszFileName) || !DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
+                                                       FSIL_ALLOC, &fsa,
+                                                       sizeof(FSALLOCATE)))
           menuHwnd = CheckMenu(hwndMainMenu, &TreeMenu, TREE_POPUP);
         else {
@@ -2150 +2156 @@
             writeable = rdy
               && !(driveflags[chDrvU - 'A'] & DRIVE_NOTWRITEABLE);
-            remote = rdy && (driveflags[chDrvU - 'A'] & (DRIVE_REMOTE || DRIVE_VIRTUAL)) != 0;
+            remote = rdy && (driveflags[chDrvU - 'A'] & (DRIVE_REMOTE || DRIVE_VIRTUAL)) == 0;
             underenv = (pci->flags & RECFLAGS_UNDERENV) != 0;