Changeset 1686 for trunk/dll/worker.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/worker.c (modified) (5 diffs)

trunk/dll/worker.c

@@ -53 +53 @@
   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
+                Added saymsg2 for this purpose
 
 ***********************************************************************/
@@ -874 +876 @@
                     rc = docopyf(type, wk->li->list[x], newname);
                     if (rc == ERROR_ACCESS_DENIED || rc == ERROR_SHARING_VIOLATION) {
-                      if (rc == ERROR_ACCESS_DENIED && noreadonlywarn)
-                        rc = -1;
-                      ret = make_deleteable(newname, rc);
+                      ret = make_deleteable(newname, rc, noreadonlywarn);
                       rc = docopyf(type, wk->li->list[x], newname);
                     }
-                    if (!ret && (rc == ERROR_ACCESS_DENIED || (rc == ERROR_SHARING_VIOLATION && fUnlock)))
+                    if (rc == ERROR_ACCESS_DENIED || (rc == ERROR_SHARING_VIOLATION && fUnlock))
                       rc = NO_ERROR;
                     if (fResetVerify) {
@@ -1588 +1588 @@
               HOBJECT hObjectdest, hObjectofObject;
               BYTE G_abSupportedDrives[24] = {0};
-              ULONG cbSupportedDrives = sizeof(G_abSupportedDrives);
+              ULONG cbSupportedDrives = sizeof(G_abSupportedDrives);
+              BOOL ignorereadonly = FALSE;
 
               for (x = 0; wk->li->list[x]; x++) {
@@ -1732 +1733 @@
                     error = DosForceDelete(wk->li->list[x]); ;
                   }
-                  if (error) {
+                  if (error) {
+                    INT retrn = 0;
+
                     DosError(FERR_DISABLEHARDERR);
-                    make_deleteable(wk->li->list[x], error);
+                    retrn = make_deleteable(wk->li->list[x], error, ignorereadonly);
+                    if (retrn == 2)
+                      break;
+                    if (retrn == 1)
+                      ignorereadonly = TRUE;
+                    if (retrn == 3)
+                      continue;
                     if (wk->li->type == IDM_DELETE){
                       hObjectdest = WinQueryObject("<XWP_TRASHCAN>");
@@ -1791 +1800 @@
                             UM_UPDATERECORD,
                             MPFROMP(wk->li->list[x]), MPVOID);
-                }
+                } ;
               } // for
             }