Changeset 1357 for trunk/dll/dircnrs.c

Timestamp:

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

Author:

Gregg Young

Message:

Fixed DROPHELP issues Tickets 320 & 324

File:

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

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));
           }
         }