Changeset 1722

Timestamp:

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

Author:

Gregg Young

Message:

The rest of the files for CS 1721

Location:

trunk/dll

Files:

• copyf.c (modified) (6 diffs)
• errutil.c (modified) (5 diffs)
• fm3dll2.h (modified) (2 diffs)
• seeall.c (modified) (2 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);

trunk/dll/errutil.c

@@ -40 +40 @@
   07 Nov 13 SHL Update comments
   15 Feb 14 GKY Improvements to saymsg2 some code cleanup
+  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.
 
 ***********************************************************************/
@@ -60 +62 @@
 #include "init.h"                       // Data declares
 #include "wrappers.h"                   // xmallocz
+#include "fm3dll2.h"
 
 #pragma data_seg(DATA1)
@@ -398 +401 @@
   strcpy(mb2dBut[2].achText,GetPString(IDS_MB2DNO));
   strcpy(mb2dBut[3].achText,GetPString(IDS_MB2DCANCELOP));
-  mb2dBut[0].idButton = 1;
-  mb2dBut[1].idButton = 2;
-  mb2dBut[2].idButton = 3;
-  mb2dBut[3].idButton = 4;
+  mb2dBut[0].idButton = SM2_YES;
+  mb2dBut[1].idButton = SM2_DONTASK;
+  mb2dBut[2].idButton = SM2_NO;
+  mb2dBut[3].idButton = SM2_CANCEL;
   if (DefaultButton)
     mb2dBut[DefaultButton - 1].flStyle = BS_DEFAULT;
@@ -409 +412 @@
     pmbInfo->hIcon      = 0;
     pmbInfo->cButtons   = 4;
-    pmbInfo->flStyle    = MB_MOVEABLE | MB_SYSTEMMODAL | MB_ICONQUESTION ;
+    pmbInfo->flStyle    = MB_MOVEABLE | MB_ICONQUESTION ;
     pmbInfo->hwndNotify = NULLHANDLE;
     for (i = 0; i < 4; i++) {
@@ -415 +418 @@
     }
     rc = WinMessageBox2(HWND_DESKTOP, hwnd,
-                        szMsg, pszTitle, 1234,
+                        szMsg, pszTitle, SM2_DIALOG,
                         pmbInfo);
+    WinSetFocus(HWND_DESKTOP, SM2_DIALOG);
     free(pmbInfo);
     return rc;

trunk/dll/fm3dll2.h

@@ -36 +36 @@
                 copy, move and delete operations
   06 Jan 13 GKY Added EA compare option to compare dir Ticket 80
+  15 Feb 14 GKY Improvements to saymsg2 some code cleanup
+  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.
 
   Align with spaces only - no tabs please
@@ -406 +409 @@
 #define IDM_UNLOCKFILE      1170
 
+#define SM2_DIALOG          1234
+#define SM2_YES                1
+#define SM2_CANCEL             2
+#define SM2_NO                 3
+#define SM2_DONTASK            4
+
 #define IDM_UTILITIESMENU   2000
 #define IDM_INIVIEWER       2001

trunk/dll/seeall.c

@@ -59 +59 @@
   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.
 
 ***********************************************************************/
@@ -1098 +1100 @@
                 DosError(FERR_DISABLEHARDERR);
                 retrn = make_deleteable(list[x], error, ignorereadonly);
-                if (retrn == 2)
+                if (retrn == SM2_CANCEL)
                   break;
-                if (retrn == 1)
+                if (retrn == SM2_DONTASK)
                   ignorereadonly = TRUE;
-                if (retrn == 3)
+                if (retrn == SM2_NO)
                   continue;
                 if (SHORT1FROMMP(mp1) == IDM_DELETE)