Changeset 603 for trunk/dll/collect.c

Timestamp:

Apr 6, 2007, 11:57:45 PM (18 years ago)

Author:

Gregg Young

Message:

Work around for PM drag/drop limit; more drag/drop error checking

File:

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

trunk/dll/collect.c

@@ -31 +31 @@
   31 Aug 06 SHL Correct stop scan context menu enable/disable
   30 Mar 07 GKY Remove GetPString for window class names
+  06 Apr 07 GKY Work around PM DragInfo and DrgFreeDISH limits
+  06 Apr 07 GKY Add some error checking in drag/drop
 
 ***********************************************************************/
@@ -457 +459 @@
       cni.pDragInfo = (PDRAGINFO) mp1;
       li = DoFileDrop(dcd->hwndCnr, NULL, FALSE, MPVOID, MPFROMP(&cni));
+      if(fexceedpmdrglimit)
+             saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
+                   hwnd,
+                   GetPString(IDS_ERRORTEXT),
+                   GetPString(IDS_EXCEEDPMDRGLMT));
       if (li) {
         li->type = (fDefaultDeletePerm) ? IDM_PERMDELETE : IDM_DELETE;
@@ -2106 +2113 @@
           ULONG numitems;
           USHORT usOperation;
+                APIRET rc;
 
           pci = (PCNRITEM) ((PCNRDRAGINFO) mp2)->pRecord;
@@ -2116 +2124 @@
           numitems = DrgQueryDragitemCount(pDInfo);
           usOperation = pDInfo->usOperation;
-          DrgDeleteDraginfoStrHandles(pDInfo);
-          DrgFreeDraginfo(pDInfo);
+          rc = DeleteDragitemStrHandles(pDInfo); //
+          if(!rc)
+          Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    "DeleteDragitemStrHandles");
+          DrgDeleteDraginfoStrHandles (pDInfo);
+          rc = DrgFreeDraginfo(pDInfo);
+          if(!rc)
+          Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                 "DrgFreeDraginfo");
           saymsg(MB_ENTER | MB_ICONASTERISK,
                  hwnd,
@@ -2230 +2245 @@
                                  GetPString(IDS_DRAGFILEOBJTEXT));
               if (DoFileDrag(hwnd, dcd->hwndObject, mp2, NULL, NULL, TRUE)) {
-                if (fUnHilite && wasemphasized)
+                if ((fUnHilite && wasemphasized) || fexceedpmdrglimit)
                   UnHilite(hwnd, TRUE, &dcd->lastselection);
               }
@@ -2245 +2260 @@
           ULONG action = UM_ACTION;
 
-          li = DoFileDrop(hwnd, NULL, TRUE, mp1, mp2);
+          li = DoFileDrop(hwnd, NULL, TRUE, mp1, mp2);
+          if(fexceedpmdrglimit)
+             saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
+                   hwnd,
+                   GetPString(IDS_ERRORTEXT),
+                   GetPString(IDS_EXCEEDPMDRGLMT));
           if (li) {
             if (!*li->targetpath) {