Changeset 1803 for trunk/dll/copyf.c

Timestamp:

May 2, 2015, 11:56:39 PM (10 years ago)

Author:

Gregg Young

Message:

Changes to allow a JAVA executable object to be created using "Real object" menu item on a jar file. (Ticket [37]) Eliminate redundant prompts and error messages when telling FM/2 not to delete a R/O file. (Ticket [548]) Limit attempts to unlock files to exes and dlls. (Ticket [549])

File:

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

trunk/dll/copyf.c

@@ -41 +41 @@
   22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
   19 Jul 14 GKY Fix redundant error message following selection of no for unlocking a file
+  02 May 15 GKY Changes to R/O check to eliminate redundant checks and error messages
+  02 May 15 GKY Limit unlock attempts to exes and dlls.
 
 ***********************************************************************/
@@ -689 +691 @@
   APIRET rc;
   INT ret = -1;
-  INT retrn;
+  INT retrn = SM2_YES;
   FILESTATUS3 fsi;
 
@@ -715 +717 @@
         DosError(FERR_DISABLEHARDERR);
         if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
-          ret = 0;
-      }
-    }
-  }
-  if (error ==  ERROR_SHARING_VIOLATION && fUnlock) {
+          ret = SM2_YES;
+      }
+    }
+  }
+  if (error ==  ERROR_SHARING_VIOLATION && fUnlock &&
+      (retrn == SM2_YES || retrn == SM2_DONTASK)   &&
+      (strstr(strlwr(filename), ".dll") || strstr(strlwr(filename), ".exe"))) {
     retrn = saymsg(MB_YESNO | MB_DEFBUTTON2,
                  HWND_DESKTOP,