Changeset 1664 for trunk/dll/copyf.c

Timestamp:

Aug 5, 2012, 2:11:07 AM (13 years ago)

Author:

Gregg Young

Message:

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. Changes to allow copy and move over readonly files with a warning dialog; also added a warning dialog for delete of readonly files

File:

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

trunk/dll/copyf.c

@@ -29 +29 @@
   26 Aug 11 GKY Add a low mem version of xDosAlloc* wrappers; move error checking into all the
                 xDosAlloc* wrappers.
+  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
+  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
 
 ***********************************************************************/
@@ -60 +64 @@
 #include "fortify.h"
 #include "pathutil.h"                   // AddBackslashToPath
+#include "worker.h"
+#include "systemf.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -525 +531 @@
           DosError(FERR_DISABLEHARDERR);
           if (DosDeleteDir(dir)) {
-            make_deleteable(dir);
+            make_deleteable(dir, 0);
             DosDeleteDir(dir);
           }
         }
-        else if (IsFile(dir) > 0) {
-          DosError(FERR_DISABLEHARDERR);
-          if (DosForceDelete(dir)) {
-            make_deleteable(dir);
+        else if (IsFile(dir) > 0) {
+          APIRET error;
+
+          DosError(FERR_DISABLEHARDERR);
+          error = DosForceDelete(dir);
+          if (error) {
+            make_deleteable(dir, error);
             DosForceDelete(dir);
           }
@@ -609 +618 @@
             DosError(FERR_DISABLEHARDERR);
             if (DosDeleteDir(oldname)) {
-              make_deleteable(oldname);
+              make_deleteable(oldname, 0);
               DosDeleteDir(oldname);
             }
@@ -666 +675 @@
 }
 
-INT make_deleteable(CHAR * filename)
-{
+INT make_deleteable(CHAR * filename, INT error)
+{
+  APIRET rc;
   INT ret = -1;
+  INT retrn;
   FILESTATUS3 fsi;
 
+  if (error ==  ERROR_SHARING_VIOLATION && fUnlock) {
+    retrn = saymsg(MB_YESNO | MB_DEFBUTTON2,
+                 HWND_DESKTOP,
+                 GetPString(IDS_LOCKEDFILEWARNINGTITLE),
+                 GetPString(IDS_LOCKEDFILEWARNING),
+                 filename);
+    if (retrn == MBID_YES) {
+      runemf2(SEPARATE | INVISIBLE | BACKGROUND | WAIT,
+              HWND_DESKTOP, pszSrcFile, __LINE__,
+              NULL, NULL, "%s %s", PCSZ_UNLOCKEXE, filename);
+    }
+  }
   DosError(FERR_DISABLEHARDERR);
-  if (!DosQueryPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi))) {
-    fsi.attrFile = 0;
-    DosError(FERR_DISABLEHARDERR);
-    if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
-      ret = 0;
-  }
+  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;
 }
@@ -772 +815 @@
           // remove directory
           if (DosDeleteDir(ss)) {
-            make_deleteable(ss);        // Try harder
+            make_deleteable(ss, 0);     // Try harder
             DosError(FERR_DISABLEHARDERR);
             DosDeleteDir(ss);
@@ -779 +822 @@
       }
       else {
-        DosError(FERR_DISABLEHARDERR);
-        if (DosForceDelete(ss)) {
-          make_deleteable(ss);
+        APIRET error;
+
+        DosError(FERR_DISABLEHARDERR);
+        error = DosForceDelete(ss);
+        if (error) {
+          make_deleteable(ss, error);
           DosError(FERR_DISABLEHARDERR);
           rc = (INT) DosForceDelete(ss);
@@ -884 +930 @@
     DosError(FERR_DISABLEHARDERR);
     if (DosDelete(string)) {
-      make_deleteable(string);
+      make_deleteable(string, -1);
       DosError(FERR_DISABLEHARDERR);
       return DosDelete(string);
@@ -890 +936 @@
   }
   else {
+    APIRET error;
+
     DosError(FERR_DISABLEHARDERR);
-    if (DosForceDelete(string)) {
-      make_deleteable(string);
+    error = DosForceDelete(string);
+    if (error) {
+      make_deleteable(string, error);
       DosError(FERR_DISABLEHARDERR);
       return DosForceDelete(string);