Changeset 687 for trunk/dll/collect.c

Timestamp:

Jun 10, 2007, 10:41:52 PM (18 years ago)

Author:

Gregg Young

Message:

Add CheckPmDrgLimit function to fix crash when dragging to FM/2 for other apps

File:

• trunk/dll/collect.c (modified) (2 diffs)

trunk/dll/collect.c

@@ -462 +462 @@
       cni.pDragInfo = (PDRAGINFO) mp1;
       li = DoFileDrop(dcd->hwndCnr, NULL, FALSE, MPVOID, MPFROMP(&cni));
-      dcdsrc = INSTDATA(cni.pDragInfo->hwndSource);
-      if (dcdsrc->ulItemsToUnHilite) {
-        saymsg(MB_OK | MB_INFORMATION,
-               hwnd,
-               GetPString(IDS_ERRORTEXT),
-               GetPString(IDS_EXCEEDPMDRGLMT));
-      }
+      CheckPmDrgLimit(cni.pDragInfo);
       if (li) {
         li->type = fDefaultDeletePerm ? IDM_PERMDELETE : IDM_DELETE;
@@ -2263 +2257 @@
           ULONG action = UM_ACTION;
 
-          li = DoFileDrop(hwnd, NULL, TRUE, mp1, mp2);
-          dcdsrc = INSTDATA(((PCNRDRAGINFO)mp2)->pDragInfo->hwndSource);
-          if (dcdsrc->ulItemsToUnHilite) {
-            saymsg(MB_OK | MB_INFORMATION,
-                   hwnd,
-                   GetPString(IDS_ERRORTEXT),
-                   GetPString(IDS_EXCEEDPMDRGLMT));
-          }
+          li = DoFileDrop(hwnd, NULL, TRUE, mp1, mp2);
+          CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
           if (li) {
             if (!*li->targetpath) {