Changeset 749

Timestamp:

Aug 2, 2007, 6:47:07 PM (18 years ago)

Author:

Steven Levine

Message:

Lock in DoFileDrop sanity checks

File:

• trunk/dll/droplist.c (modified) (10 diffs)

trunk/dll/droplist.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2006 Steven H.Levine
+  Copyright (c) 2003, 2007 Steven H.Levine
 
   22 Nov 02 SHL Baseline
@@ -19 +19 @@
   21 Apr 07 SHL Add debug code to track down reason for PMERR_SOURCE_SAME_AS_TARGET
   10 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
+  02 Aug 07 SHL Lock in DoFileDrop sanity checks
 
 ***********************************************************************/
@@ -50 +51 @@
           if (!DrgAccessDraginfo(pDInfo)) {
             Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                      "DrgAccessDraginfo");
-            return FALSE;
+                      "DrgAccessDraginfo");
+            return FALSE;
           }
           else if (IsFm2Window(pDInfo->hwndSource, FALSE)) {
             DIRCNRDATA *dcdsrc = INSTDATA(pDInfo->hwndSource);
             if (dcdsrc->ulItemsToUnHilite) {
-            saymsg(MB_OK | MB_INFORMATION,
-                   HWND_DESKTOP,
-                   GetPString(IDS_ERRORTEXT),
-                   GetPString(IDS_EXCEEDPMDRGLMT));
+            saymsg(MB_OK | MB_INFORMATION,
+                   HWND_DESKTOP,
+                   GetPString(IDS_ERRORTEXT),
+                   GetPString(IDS_EXCEEDPMDRGLMT));
             }
             DrgFreeDraginfo(pDInfo);
-          }
-          return TRUE;
+          }
+          return TRUE;
 }
 
@@ -278 +279 @@
                      MPARAM mp1, MPARAM mp2)
 {
-
   /* builds a list from the dropped files */
 
@@ -287 +287 @@
   CHAR szFrom[CCHMAXPATH + 1], szArc[CCHMAXPATH + 1];
   CHAR **files = NULL;
-  INT numfiles = 0, numalloc = 0;
+  UINT numfiles = 0, numalloc = 0;
   ULONG curitem, numitems, *cbFile = NULL, *ulitemID = NULL;
   LISTINFO *li = NULL;
   ARC_TYPE *arcinfo = NULL;
   USHORT Operation;
+
+  UINT numok = 0;                       // 02 Aug 07 SHL fixme to be gone someday
+  UINT numfail = 0;
 
   *szArc = 0;
@@ -361 +364 @@
                            MPFROMLONG(pDItem->ulItemID),
                            MPFROMLONG(DMFL_TARGETFAIL));
+        numfail++;
         continue;
       }
@@ -377 +381 @@
                            MPFROMLONG(pDItem->ulItemID),
                            MPFROMLONG(DMFL_TARGETFAIL));
+        numfail++;
         continue;
       }
@@ -405 +410 @@
                            MPFROMLONG(pDItem->ulItemID),
                            MPFROMLONG(DMFL_TARGETFAIL));
+        numfail++;
         continue;
       }
@@ -448 +454 @@
                          MPFROMLONG(pDItem->ulItemID),
                          MPFROMLONG(DMFL_TARGETSUCCESSFUL));
-    }
-    else
+      numok++;
+    }
+    else {
       DrgSendTransferMsg(pDItem->hwndItem,
                          DM_ENDCONVERSATION,
                          MPFROMLONG(pDItem->ulItemID),
                          MPFROMLONG(DMFL_TARGETFAIL));
+      numfail++;
+    }
   } // for curitem
 
@@ -493 +502 @@
   }
 
-  // fixme to know why PM thinks drop not done
-  // this will avoid DrgFreeDraginfo complaints from FreeDragInfoData
-  DbgMsg(pszSrcFile, __LINE__, "calling FreeDragInfoData");
   FreeDragInfoData(hwndCnr, pDInfo);
 
+  // 02 Aug 07 SHL fixme to be gone someday or use Runtime_Error is really an error
+  if (numfail || numok == 0)
+    DbgMsg(pszSrcFile, __LINE__, "calling FreeDragInfoData with %u ok, %u failed", numok, numfail);
+
   return li;
 }