Merge pull request #12478 from AvaloniaUI/fixes/dnd-unwrap-win32-data…

…-object Unwrap win32 data object
AvaloniaUI · Aug 8, 2023 · 655f199 · 655f199
2 parents d772ea8 + 8328cc7
commit 655f199
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Windows/Avalonia.Win32/DataObject.cs b/src/Windows/Avalonia.Win32/DataObject.cs
@@ -103,6 +103,7 @@ public Win32Com.IEnumFORMATETC Clone()
 
 
         private IDataObject _wrapped;
+        public IDataObject Wrapped => _wrapped;
 
         public DataObject(IDataObject wrapped)
         {

diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -217,7 +217,7 @@ public static IDataObject GetAvaloniaObjectFromCOM(Win32Com.IDataObject pDataObj
 
             if (MicroComRuntime.TryUnwrapManagedObject(pDataObj) is DataObject dataObject)
             {
-                return dataObject;
+                return dataObject.Wrapped;
             }
             return new OleDataObject(pDataObj);
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,6 +103,7 @@ public Win32Com.IEnumFORMATETC Clone() @@
             private IDataObject _wrapped;
+            public IDataObject Wrapped => _wrapped;
             public DataObject(IDataObject wrapped)
             {
@@ Expand Down @@