Changeset 618 for trunk/dll/arccnrs.c

Timestamp:

Apr 20, 2007, 9:19:03 PM (18 years ago)

Author:

Steven Levine

Message:

Add more drag/drop error checking
Use FreeDragInfoData
Sync with NumItemsToUnhilite AcceptOneDrop GetOneDrop mods

File:

• trunk/dll/arccnrs.c (modified) (6 diffs)

trunk/dll/arccnrs.c

@@ -33 +33 @@
   14 Mar 07 SHL ArcObjWndProc/UM_ENTER: delay before starting viewer
   30 Mar 07 GKY Remove GetPString for window class names
-   06 Apr 07 GKY Work around PM DragInfo and DrgFreeISH limit
+  06 Apr 07 GKY Work around PM DragInfo and DrgFreeISH limit
   06 Apr 07 GKY Add some error checking in drag/drop
+  20 Apr 07 SHL Sync with NumItemsToUnhilite mods
+
 ***********************************************************************/
 
@@ -950 +952 @@
       switch (msg) {
       case DM_DRAGOVER:
-        if (AcceptOneDrop(mp1, mp2))
+        if (AcceptOneDrop(hwnd, mp1, mp2))
           return MRFROM2SHORT(DOR_DROP, DO_MOVE);
         return MRFROM2SHORT(DOR_NODROP, 0);     /* Drop not valid */
@@ -964 +966 @@
             DrawTargetEmphasis(hwnd, emphasized);
           }
-          if (GetOneDrop(mp1, mp2, szFrom, sizeof(szFrom)))
+          if (GetOneDrop(hwnd, mp1, mp2, szFrom, sizeof(szFrom)))
             WinSendMsg(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                                        ARC_CNR),
@@ -1130 +1132 @@
       li = DoFileDrop(dcd->hwndCnr,
                       dcd->directory, FALSE, MPVOID, MPFROMP(&cni));
-      if (fExceedPMDrgLimit)
+      if (NumItemsToUnhilite)
              saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
                                    hwnd,
@@ -3006 +3008 @@
                              dcd->hwndObject,
                              mp2, dcd->arcname, NULL, TRUE)) {
-                if ((fUnHilite && wasemphasized) || fExceedPMDrgLimit)
+                if ((fUnHilite && wasemphasized) || NumItemsToUnhilite)
                   UnHilite(hwnd, TRUE, &dcd->lastselection);
               }
@@ -3036 +3038 @@
           li = DoFileDrop(hwnd, dcd->arcname, FALSE, mp1, mp2);
           DosBeep(50, 100);             // fixme to know why beep?
-          if (fExceedPMDrgLimit)
+          if (NumItemsToUnhilite)
             saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
                                   hwnd,