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

trunk/dll/dircnrs.c

@@ -22 +22 @@
   07 Jan 07 GKY Move error strings etc. to string file
   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
 
 ***********************************************************************/
@@ -587 +589 @@
         DoFileDrop(dcd->hwndCnr, dcd->directory, 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;
@@ -1050 +1057 @@
 {
   DIRCNRDATA *dcd = WinQueryWindowPtr(hwnd, QWL_USER);
+    APIRET rc;
 
   switch (msg) {
@@ -2690 +2698 @@
           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,
@@ -2832 +2847 @@
                            (pci) ? NULL : dcd->directory,
                            (pci) ? TRUE : FALSE)) {
-              if (pci && fUnHilite && wasemphasized)
+              if ((pci && fUnHilite && wasemphasized) || fexceedpmdrglimit)
                 UnHilite(hwnd, TRUE, &dcd->lastselection);
             }
@@ -2849 +2864 @@
           ULONG action = UM_ACTION;
 
-          li = DoFileDrop(hwnd, dcd->directory, TRUE, mp1, mp2);
+          li = DoFileDrop(hwnd, dcd->directory, TRUE, mp1, mp2);
+          if(fexceedpmdrglimit)
+             saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
+                   hwnd,
+                   GetPString(IDS_ERRORTEXT),
+                   GetPString(IDS_EXCEEDPMDRGLMT));
           if (li) {
             if (li->list && li->list[0] && IsRoot(li->list[0]))