Changeset 1741

Timestamp:

Feb 23, 2014, 12:32:04 AM (12 years ago)

Author:

Gregg Young

Message:

Fix warn readonly yes don't ask to work when recursing directories.

Location:

trunk/dll

Files:

• arccnrs.c (modified) (2 diffs)
• collect.c (modified) (4 diffs)
• copyf.c (modified) (4 diffs)
• copyf.h (modified) (2 diffs)
• dircnrs.c (modified) (5 diffs)
• seeall.c (modified) (3 diffs)
• treecnr.c (modified) (4 diffs)
• worker.c (modified) (3 diffs)

trunk/dll/arccnrs.c

@@ -92 +92 @@
                 It was never fully implemented and doesn't make sense for the container.
   09 Feb 14 GKY Fix trap on opening a file without an extention
+  22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
 
 ***********************************************************************/
@@ -3094 +3095 @@
             li->type = SHORT1FROMMP(mp1);
             li->hwnd = hwnd;
-            li->list = BuildArcList(hwnd);
+            li->list = BuildArcList(hwnd);
+            if (li->type == IDM_DELETE)
+              ignorereadonly = FALSE;
             if (li->type == IDM_REFRESH) {
 

trunk/dll/collect.c

@@ -83 +83 @@
   05 Sep 12 SHL Correct UM_COLLECTFROMFILE bad list file reporting
   13 Dec 13 SHL CollectorCnrWndProc IDM_FILTER: avoid exception on missing fileName
+  22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
 
 ***********************************************************************/
@@ -158 +159 @@
 #include "excputil.h"                   // xbeginthread
 #include "walkem.h"                     // WalkAllDlgProc
+#include "copyf.h"                      // ignorereadonly
 
 // Data definitions
@@ -640 +642 @@
       case IDM_MCIPLAY:
       case IDM_UPDATE:
+        if (li->type == IDM_DELETE)
+          ignorereadonly = FALSE;
         if (PostMsg(hwnd, UM_MASSACTION, mp1, mp2))
           return (MRESULT) TRUE;
@@ -2393 +2397 @@
                 action = UM_MASSACTION;
                 break;
-              }
+              }
+              if (li->type == IDM_DELETE)
+                ignorereadonly = FALSE;
               if (li->type == IDM_SHADOW || li->type == IDM_OBJECT ||
                   li->type == IDM_SHADOW2)

trunk/dll/copyf.c

@@ -39 +39 @@
                 and so it works with move to trashcan inabled.
   22 Feb 14 GKY Fix wipeallf to recurss properly
+  22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
 
 ***********************************************************************/
@@ -77 +78 @@
 static CHAR *GetLongName(CHAR * oldname, CHAR * buffer);
 static CHAR *TruncName(CHAR * oldname, CHAR * buffer);
+
+BOOL ignorereadonly = FALSE;
 
 //static CHAR default_disk(VOID);
@@ -534 +537 @@
         if (!IsFile(dir)) {
           if (!strchr(dir, '?') && !strchr(dir, '*'))
-            wipeallf(FALSE, "%s\\*", dir);
+            wipeallf(TRUE, "%s\\*", dir);
           DosError(FERR_DISABLEHARDERR);
           if (DosDeleteDir(dir)) {
@@ -621 +624 @@
           else {
             // remove directory
-            wipeallf(FALSE, "%s\\*", oldname);
+            wipeallf(TRUE, "%s\\*", oldname);
             DosError(FERR_DISABLEHARDERR);
             if (DosDeleteDir(oldname)) {

trunk/dll/copyf.h

@@ -18 +18 @@
   09 Feb 14 GKY Modified wipeallf to allow suppression of the readonly warning on delete
                 of temporary files
+  22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
 
 ***********************************************************************/
@@ -24 +25 @@
 
 #define COPYF_H
+extern BOOL ignorereadonly;
 
 BOOL AdjustWildcardName(CHAR * oldname, CHAR * newname);

trunk/dll/dircnrs.c

@@ -83 +83 @@
   04 Aug 12 GKY Changes to use Unlock to unlock files if Unlock.exe is in path both from menu/toolbar and as part of
                 copy, move and delete operations
+  22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
 
 ***********************************************************************/
@@ -161 +162 @@
 #include "excputil.h"                   // 06 May 08 SHL added
 #include "pathutil.h"                   // AddBackslashToPath
+#include "copyf.h"                      // ignorereadonly
 
 // Data definitions
@@ -975 +977 @@
       case IDM_MCIPLAY:
       case IDM_UPDATE:
+        if (li->type == IDM_DELETE)
+          ignorereadonly = FALSE;
         if (PostMsg(hwnd, UM_MASSACTION, mp1, mp2))
           return (MRESULT) TRUE;
@@ -2626 +2630 @@
             li->hwnd = hwnd;
             li->list = BuildList(hwnd);
+            if (li->type == IDM_DELETE)
+              ignorereadonly = FALSE;
             switch (SHORT1FROMMP(mp1)) {
             case IDM_WILDMOVE:
@@ -2697 +2703 @@
                 action = UM_MASSACTION;
                 break;
-              }
+              }
+              if (li->type == IDM_DELETE)
+                ignorereadonly = FALSE;
               if (SHORT1FROMMP(mp1) == IDM_OBJECT ||
                   SHORT1FROMMP(mp1) == IDM_SHADOW ||

trunk/dll/seeall.c

@@ -61 +61 @@
   16 Feb 14 GKY Rework readonly check on delete code so it actually works in a logical way
                 and so it works with move to trashcan inabled.
+  22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
 
 ***********************************************************************/
@@ -980 +981 @@
           CHAR prompt[CCHMAXPATH * 3];
           APIRET error;
-          BOOL ignorereadonly = FALSE;
 
           for (x = 0; list[x]; x++) {
@@ -4346 +4346 @@
               case IDM_SHADOW:
               case IDM_OPENSETTINGS:
-              case IDM_OPENDEFAULT:
+              case IDM_OPENDEFAULT:
+                if (SHORT1FROMMP(mp1) == IDM_DELETE)
+                  ignorereadonly = FALSE;
                 if (!PostMsg(pAD->hwndObj, UM_MASSACTION, mp1, MPFROMP(list)))
                   FreeList(list);

trunk/dll/treecnr.c

@@ -90 +90 @@
   30 Dec 12 GKY Changed refresh removable media to query LVM directly to call Rediscover_PRMs (Ticket 472);
                 Also added a tree rescan following volume detach.
+  22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
 
 ***********************************************************************/
@@ -157 +158 @@
 #include "init.h"                       // GetTidForWindow
 #include "excputil.h"                   // xbeginthread
+#include "copyf.h"                      // ignorereadonly
 
 // Data definitions
@@ -903 +905 @@
       case IDM_DELETE:
       case IDM_PERMDELETE:
+        if (li->type == IDM_DELETE)
+          ignorereadonly = FALSE;
         if (PostMsg(hwnd, UM_MASSACTION, mp1, mp2))
           return (MRESULT) TRUE;
@@ -3005 +3009 @@
             case IDM_MCIPLAY:
               action = UM_MASSACTION;
-            }
+            }
+            if (li->type == IDM_DELETE)
+              ignorereadonly = FALSE;
             if (SHORT1FROMMP(mp1) == IDM_SHADOW ||
                 SHORT1FROMMP(mp1) == IDM_SHADOW2)

trunk/dll/worker.c

@@ -63 +63 @@
   22 Feb 14 GKY Cleanup of readonly check code suppress spurious error on blocked directory
                 delete and eliminated the check on additional temp file deletes
+  22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
 
 ***********************************************************************/
@@ -1604 +1605 @@
               BYTE G_abSupportedDrives[24] = {0};
               ULONG cbSupportedDrives = sizeof(G_abSupportedDrives);
-              BOOL ignorereadonly = FALSE;
               INT retrn = 0;
 
@@ -1711 +1711 @@
                                  &fsa, (ULONG) sizeof(FILESTATUS3));
                 if (fsa.attrFile & FILE_DIRECTORY) {
-                  error = (APIRET) wipeallf(FALSE, "%s%s*",
+                  error = (APIRET) wipeallf(ignorereadonly, "%s%s*",
                                             wk->li->list[x],
                                             (*wk->li->list[x] &&