Changeset 1686 for trunk/dll/copyf.c

Timestamp:

Mar 10, 2013, 7:34:34 PM (12 years ago)

Author:

Gregg Young

Message:

GKY Improvrd readonly check on delete to allow cancel and don't ask again options; Added saymsg2 for this purpose; Fixes to snapshot file. cs 1685 contained the COMP.C changes

File:

• trunk/dll/copyf.c (modified) (13 diffs)

trunk/dll/copyf.c

@@ -33 +33 @@
   04 Aug 12 GKY Changes to allow copy and move over readonly files with a warning dialog; also added a warning dialog for delete of
                 readonly files
+  10 Mar 13 GKY Improvrd readonly check on delete to allow cancel and don't ask again options
 
 ***********************************************************************/
@@ -531 +532 @@
           DosError(FERR_DISABLEHARDERR);
           if (DosDeleteDir(dir)) {
-            make_deleteable(dir, 0);
+            make_deleteable(dir, -1, TRUE);
             DosDeleteDir(dir);
           }
@@ -541 +542 @@
           error = DosForceDelete(dir);
           if (error) {
-            make_deleteable(dir, error);
+            make_deleteable(dir, error, FALSE);
             DosForceDelete(dir);
           }
@@ -618 +619 @@
             DosError(FERR_DISABLEHARDERR);
             if (DosDeleteDir(oldname)) {
-              make_deleteable(oldname, 0);
+              make_deleteable(oldname, -1, TRUE);
               DosDeleteDir(oldname);
             }
@@ -675 +676 @@
 }
 
-INT make_deleteable(CHAR * filename, INT error)
+INT make_deleteable(CHAR * filename, INT error, BOOL Dontcheckreadonly)
 {
   APIRET rc;
@@ -682 +683 @@
   FILESTATUS3 fsi;
 
+  //DbgMsg(pszSrcFile, __LINE__, "error %i ", error);
+  DosError(FERR_DISABLEHARDERR);
+  rc = DosQueryPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi));
+  if (!rc) {
+    if (fsi.attrFile & 0x00000001) {
+      if (fWarnReadOnly && !Dontcheckreadonly) {
+        retrn = saymsg2(NULL, 0,
+                       HWND_DESKTOP,
+                       GetPString(IDS_READONLYFILEWARNINGTITLE),
+                       GetPString(IDS_READONLYFILEWARNING),
+                       filename);
+        if (retrn == 3)
+          ret = 3;
+        else if (retrn == 4)
+          ret = 2;
+        else {
+          fsi.attrFile = 0;
+          DosError(FERR_DISABLEHARDERR);
+          if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
+            if (retrn == 1)
+              ret = 0;
+            else
+              ret = 1;
+        }
+      }
+      else
+        fsi.attrFile = 0;
+        DosError(FERR_DISABLEHARDERR);
+        if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
+          ret = 0;
+    }
+  }
   if (error ==  ERROR_SHARING_VIOLATION && fUnlock) {
     retrn = saymsg(MB_YESNO | MB_DEFBUTTON2,
@@ -694 +727 @@
     }
   }
-  DosError(FERR_DISABLEHARDERR);
-  rc = DosQueryPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi));
-  if (!rc) {
-    if (fsi.attrFile & 0x00000001) {
-      if (fWarnReadOnly && error != -1) {
-        retrn = saymsg(MB_YESNO | MB_DEFBUTTON2,
-                       HWND_DESKTOP,
-                       GetPString(IDS_READONLYFILEWARNINGTITLE),
-                       GetPString(IDS_READONLYFILEWARNING),
-                       filename);
-        if (retrn == MBID_YES) {
-          fsi.attrFile = 0;
-          DosError(FERR_DISABLEHARDERR);
-          if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
-            ret = 0;
-        }
-        else
-          ret = 0;
-      }
-      else
-        fsi.attrFile = 0;
-        DosError(FERR_DISABLEHARDERR);
-        if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
-          ret = 0;
-    }
-  }
 
   return ret;
@@ -737 +744 @@
   va_list ap;
   INT rc;
+  static BOOL ignorereadonly = FALSE;
 
   va_start(ap, string);
@@ -815 +823 @@
           // remove directory
           if (DosDeleteDir(ss)) {
-            make_deleteable(ss, 0);     // Try harder
+            make_deleteable(ss, -1, TRUE);      // Try harder
             DosError(FERR_DISABLEHARDERR);
             DosDeleteDir(ss);
@@ -826 +834 @@
         DosError(FERR_DISABLEHARDERR);
         error = DosForceDelete(ss);
-        if (error) {
-          make_deleteable(ss, error);
+        if (error) {
+          INT retrn = 0;
+
+          retrn = make_deleteable(ss, error, ignorereadonly);
+          if (retrn == 3)
+            continue;
+          else if (retrn == 1)
+            ignorereadonly = TRUE;
           DosError(FERR_DISABLEHARDERR);
           rc = (INT) DosForceDelete(ss);
@@ -844 +858 @@
   free(ss);
   free(str);
+  ignorereadonly = FALSE;
   return 0;
 }
@@ -930 +945 @@
     DosError(FERR_DISABLEHARDERR);
     if (DosDelete(string)) {
-      make_deleteable(string, -1);
+      make_deleteable(string, -1, TRUE);
       DosError(FERR_DISABLEHARDERR);
       return DosDelete(string);
@@ -941 +956 @@
     error = DosForceDelete(string);
     if (error) {
-      make_deleteable(string, error);
+      make_deleteable(string, error, FALSE);
       DosError(FERR_DISABLEHARDERR);
       return DosForceDelete(string);