Changeset 687 for trunk/dll/dircnrs.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/dircnrs.c (modified) (3 diffs)

trunk/dll/dircnrs.c

@@ -592 +592 @@
       li =
         DoFileDrop(dcd->hwndCnr, dcd->directory, FALSE, MPVOID,
-                   MPFROMP(&cni));
-      dcdsrc = INSTDATA(cni.pDragInfo->hwndSource);
-      if (dcdsrc->ulItemsToUnHilite) {
-        saymsg(MB_OK | MB_INFORMATION,
-               hwnd,
-               GetPString(IDS_ERRORTEXT),
-               GetPString(IDS_EXCEEDPMDRGLMT));
-      }
+                   MPFROMP(&cni));
+      CheckPmDrgLimit(cni.pDragInfo);
       if (li) {
         li->type = (fDefaultDeletePerm) ? IDM_PERMDELETE : IDM_DELETE;
@@ -2743 +2737 @@
               return (MRFROM2SHORT(DOR_NEVERDROP, 0));
           }
-          if (*dcd->directory &&
-              (driveflags[toupper(*dcd->directory) - 'A'] &
-               DRIVE_NOTWRITEABLE)) {
+          if (*dcd->directory &&
+             (driveflags[toupper(*dcd->directory) - 'A'] &
+              DRIVE_NOTWRITEABLE)) {
             DrgFreeDraginfo(pDInfo);
             return MRFROM2SHORT(DOR_DROP,       /* Return okay to link */
@@ -2859 +2853 @@
 
           DbgMsg(pszSrcFile, __LINE__, "calling DoFileDrop");
-          li = DoFileDrop(hwnd, dcd->directory, 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, dcd->directory, TRUE, mp1, mp2);
+          CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
           if (li) {
             if (li->list && li->list[0] && IsRoot(li->list[0]))