Changeset 1357

Timestamp:

Dec 27, 2008, 12:57:18 AM (17 years ago)

Author:

Gregg Young

Message:

Fixed DROPHELP issues Tickets 320 & 324

Location:

trunk/dll

Files:

• collect.c (modified) (2 diffs)
• dircnrs.c (modified) (3 diffs)
• treecnr.c (modified) (2 diffs)

trunk/dll/collect.c

@@ -57 +57 @@
                 less than 10 KiB (It hangs and can't be closed)
   10 Dec 08 SHL Integrate exception handler support
+  26 Dec 08 GKY Fixed DROPHELP to check for copy as default is action is DO_DEFAULT
 
 ***********************************************************************/
@@ -2361 +2362 @@
           numitems = DrgQueryDragitemCount(pDInfo);
           usOperation = pDInfo->usOperation;
+          if (usOperation == DO_DEFAULT)
+            usOperation = fCopyDefault ? DO_COPY : DO_MOVE;
           FreeDragInfoData(hwnd, pDInfo);
           saymsg(MB_ENTER | MB_ICONASTERISK,

trunk/dll/dircnrs.c

@@ -52 +52 @@
   29 Nov 08 GKY Remove or replace with a mutex semaphore DosEnterCriSec where appropriate.
   10 Dec 08 SHL Integrate exception handler support
+  26 Dec 08 GKY Fixed DROPHELP to check for copy as default is action is DO_DEFAULT
 
 ***********************************************************************/
@@ -2913 +2914 @@
           else {
             numitems = DrgQueryDragitemCount(pDInfo);
-            usOperation = pDInfo->usOperation;
+            usOperation = pDInfo->usOperation;
+            if (usOperation == DO_DEFAULT)
+              usOperation = fCopyDefault ? DO_COPY : DO_MOVE;
             FreeDragInfoData(hwnd, pDInfo);
             saymsg(MB_ENTER | MB_ICONASTERISK,
@@ -2925 +2928 @@
                    pci ? pci->pszFileName : NullStr,
                    pci ? " " : NullStr,
-                   GetPString((usOperation == DO_COPY) ?
-                              IDS_COPYTEXT :
+                   GetPString((usOperation == DO_MOVE) ?
+                              IDS_MOVETEXT :
                               (usOperation == DO_LINK) ?
-                              IDS_LINKTEXT : IDS_MOVETEXT));
+                              IDS_LINKTEXT : IDS_COPYTEXT));
           }
         }

trunk/dll/treecnr.c

@@ -52 +52 @@
   28 Nov 08 GKY Remove unneeded DosEnterCriSec calls
   10 Dec 08 SHL Integrate exception handler support
+  25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
+  26 Dec 08 GKY Implemented DROPHELP for the tree container
 
 ***********************************************************************/
@@ -1417 +1419 @@
           DrgAccessDraginfo(pDInfo);
           DrgFreeDraginfo(pDInfo);
+        }
+        return 0;
+
+      case CN_DROPHELP:
+        if (mp2) {
+
+          PDRAGINFO pDInfo;
+          PCNRITEM pci;
+          ULONG numitems;
+          USHORT usOperation;
+
+          pci = (PCNRITEM) ((PCNRDRAGINFO) mp2)->pRecord;
+          pDInfo = (PDRAGINFO) ((PCNRDRAGINFO) mp2)->pDragInfo;
+          if (!DrgAccessDraginfo(pDInfo)) {
+            Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                      GetPString(IDS_DROPERRORTEXT));
+          }
+          else {
+            numitems = DrgQueryDragitemCount(pDInfo);
+            usOperation = pDInfo->usOperation;
+            if (usOperation == DO_DEFAULT)
+              usOperation = fCopyDefault ? DO_COPY : DO_MOVE;
+            FreeDragInfoData(hwnd, pDInfo);
+            saymsg(MB_ENTER | MB_ICONASTERISK,
+                   hwnd,
+                   GetPString(IDS_DROPHELPHDRTEXT),
+                   GetPString(IDS_DROPHELPTEXT),
+                   numitems,
+                   &"s"[numitems == 1L],
+                   pci ? NullStr : GetPString(IDS_NOTEXT),
+                   pci ? NullStr : " ",
+                   pci ? pci->pszFileName : NullStr,
+                   pci ? " " : NullStr,
+                   GetPString((usOperation == DO_MOVE) ?
+                              IDS_MOVETEXT :
+                              (usOperation == DO_LINK) ?
+                              IDS_LINKTEXT : IDS_COPYTEXT));
+          }
         }
         return 0;