Changeset 1722 for trunk/dll/copyf.c

Timestamp:

Feb 16, 2014, 9:17:15 PM (11 years ago)

Author:

Gregg Young

Message:

The rest of the files for CS 1721

File:

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

trunk/dll/copyf.c

@@ -36 +36 @@
   09 Feb 14 GKY Modified wipeallf to allow suppression of the readonly warning on delete
                 of temporary files
+  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.
 
 ***********************************************************************/
@@ -544 +546 @@
           error = DosForceDelete(dir);
           if (error) {
-            make_deleteable(dir, error, FALSE);
+            make_deleteable(dir, error, TRUE);
             DosForceDelete(dir);
           }
@@ -691 +693 @@
     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
+      retrn = saymsg2(NULL, 3,
+                     HWND_DESKTOP,
+                     GetPString(IDS_READONLYFILEWARNINGTITLE),
+                     GetPString(IDS_READONLYFILEWARNING),
+                      filename);
+      //DbgMsg(pszSrcFile, __LINE__, "retrn %x ", retrn);
+      ret = retrn;
+      if (retrn == SM2_YES || retrn == SM2_DONTASK)
+        fsi.attrFile = 0;
+        DosError(FERR_DISABLEHARDERR);
+        if (xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
+          ret = -1; // failed
+      }
+      else {
         fsi.attrFile = 0;
         DosError(FERR_DISABLEHARDERR);
         if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
           ret = 0;
+      }
     }
   }
@@ -729 +726 @@
     }
   }
-
+  //DbgMsg(pszSrcFile, __LINE__, "retrn %x ", ret);
   return ret;
 }
@@ -839 +836 @@
 
           retrn = make_deleteable(ss, error, ignorereadonly);
-          if (retrn == 3)
+          if (retrn == SM2_NO)
             continue;
-          else if (retrn == 1)
+          else if (retrn == SM2_DONTASK)
             ignorereadonly = TRUE;
+          else if (retrn == SM2_CANCEL)
+            break;
           DosError(FERR_DISABLEHARDERR);
           rc = (INT) DosForceDelete(ss);
@@ -953 +952 @@
   else {
     APIRET error;
+    INT ret;
 
     DosError(FERR_DISABLEHARDERR);
     error = DosForceDelete(string);
     if (error) {
-      make_deleteable(string, error, FALSE);
+      ret = make_deleteable(string, error, FALSE);
+      if (ret == SM2_CANCEL || ret == SM2_NO)
+        return 0;
       DosError(FERR_DISABLEHARDERR);
       return DosForceDelete(string);