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

trunk/dll/worker.c

@@ -49 +49 @@
                 by temp file creation failures.
   12 Nov 11 GKY Fixed extract failure caused by spaces in the arc file name.
+  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
 
 ***********************************************************************/
@@ -118 +122 @@
 #pragma data_seg(GLOBAL2)
 FILE *LogFileHandle;
+BOOL fUnlock;
 
 #pragma data_seg(DATA2)
@@ -222 +227 @@
           UINT x;
           BOOL dontask = FALSE, wildcarding = FALSE, overold =
-            FALSE, overnew = FALSE, usedtarget;
+            FALSE, overnew = FALSE, noreadonlywarn = FALSE, usedtarget;
 
           WinCancelShutdown(hmq2, TRUE);
@@ -455 +460 @@
                   }
                 }
-                break;
+                break;
+
+              case IDM_UNLOCKFILE:
+                runemf2(SEPARATE | KEEP | WINDOWED//| INVISIBLE | BACKGROUND
+                        | WAIT,
+                        HWND_DESKTOP, pszSrcFile, __LINE__,
+                        NULL, NULL, "%s %s", PCSZ_UNLOCKEXE, wk->li->list[x]);
+                break;
 
               case IDM_VIEWARCHIVE:
@@ -707 +719 @@
                     // Target OK so far
                     CHAR newname[CCHMAXPATH];
-                    APIRET rc;
+                    APIRET rc;
+                    INT ret;
                     FILESTATUS4L fs4;
                     BOOL isnewer;
@@ -793 +806 @@
                         overold = TRUE;
                       if (mv.overnew)
-                        overnew = TRUE;
+                        overnew = TRUE;
+                      if (mv.noreadonlywarn)
+                        noreadonlywarn = TRUE;
                       if (wildcarding || wk->li->type == IDM_RENAME) {
                         p = strrchr(mv.target, '\\');
@@ -856 +871 @@
                       priority_idle();
 
-                    rc = docopyf(type, wk->li->list[x], newname);
+                    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);
+                      rc = docopyf(type, wk->li->list[x], newname);
+                    }
+                    if (!ret && (rc == ERROR_ACCESS_DENIED || (rc == ERROR_SHARING_VIOLATION && fUnlock)))
+                      rc = NO_ERROR;
+                    //if (fTurnOffReadOnly)
+                    //  make_deleteable(newname, rc);
                     if (fResetVerify) {
                       DosSetVerify(fVerify);
                       fResetVerify = FALSE;
                     }
-                    priority_normal();
+                    priority_normal();
                     if (rc) {
                       if ((rc == ERROR_DISK_FULL ||
@@ -1715 +1740 @@
                   if (error) {
                     DosError(FERR_DISABLEHARDERR);
-                    make_deleteable(wk->li->list[x]);
+                    make_deleteable(wk->li->list[x], error);
                     if (wk->li->type == IDM_DELETE){
                       hObjectdest = WinQueryObject("<XWP_TRASHCAN>");