Fix drag and drop

Fixes dotnet#7518 Eventually I should improve dotnet#7519 but until then, this is safer approach IMO. cc @Olina-Zhang @dreddy-work @RussKie
kant2002 · Aug 13, 2022 · 9ded6fb · 9ded6fb
1 parent 01abac5
commit 9ded6fb
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.IDropTargetVtbl.cs b/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.IDropTargetVtbl.cs
@@ -33,8 +33,7 @@ private static int DragEnter(IntPtr thisPtr, IntPtr pDataObj, uint grfKeyState,
                 try
                 {
                     Ole32.IDropTarget instance = ComInterfaceDispatch.GetInstance<Ole32.IDropTarget>((ComInterfaceDispatch*)thisPtr);
-                    var dataObject = WinFormsComWrappers.Instance.GetOrCreateObjectForComInstance(pDataObj, CreateObjectFlags.Unwrap);
-                    return (int)instance.DragEnter(dataObject, grfKeyState, pt, ref *pdwEffect);
+                    return (int)instance.DragEnter(Marshal.GetObjectForIUnknown(pDataObj), grfKeyState, pt, ref *pdwEffect);
                 }
                 catch (Exception ex)
                 {
@@ -79,8 +78,7 @@ private static int Drop(IntPtr thisPtr, IntPtr pDataObj, uint grfKeyState, Point
                 try
                 {
                     Ole32.IDropTarget instance = ComInterfaceDispatch.GetInstance<Ole32.IDropTarget>((ComInterfaceDispatch*)thisPtr);
-                    var dataObject = WinFormsComWrappers.Instance.GetOrCreateObjectForComInstance(pDataObj, CreateObjectFlags.Unwrap);
-                    return (int)instance.Drop(dataObject, grfKeyState, pt, ref *pdwEffect);
+                    return (int)instance.Drop(Marshal.GetObjectForIUnknown(pDataObj), grfKeyState, pt, ref *pdwEffect);
                 }
                 catch (Exception ex)
                 {