Changeset 727

Timestamp:

Jul 8, 2007, 5:15:02 AM (18 years ago)

Author:

Steven Levine

Message:

FreeDragInfoData: suppress PMERR_SOURCE_SAME_AS_TARGET notices

File:

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

trunk/dll/draglist.c

@@ -19 +19 @@
   21 Apr 07 SHL Avoid odd first time drag failure
   12 May 07 SHL Use dcd->ulItemsToUnHilite
+  05 Jul 07 FreeDragInfoData: suppress PMERR_SOURCE_SAME_AS_TARGET notices
 
 ***********************************************************************/
@@ -98 +99 @@
 # endif
   if (!DrgFreeDraginfo(pDInfo)) {
-    if ((WinGetLastError(WinQueryAnchorBlock(hwnd)) & 0xffff) == PMERR_SOURCE_SAME_AS_TARGET) {
-      // fixme to find caller responsible for PMERR_SOURCE_SAME_AS_TARGET
-      Win_Error_NoMsgBox(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                         "DrgFreeDraginfo failed with PMERR_SOURCE_SAME_AS_TARGET");
-    }
-    else
+    // PMERR_SOURCE_SAME_AS_TARGET is not an error if dragging within same fm/2 process
+    if (!IsFm2Window(pDInfo->hwndSource, FALSE) ||
+        (WinGetLastError(WinQueryAnchorBlock(hwnd)) & 0xffff) != PMERR_SOURCE_SAME_AS_TARGET)
+    {
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__, "DrgFreeDraginfo");
+    }
   }
 }