[ARM only] Fix incorrect parameters passed to the CreateDrawingSurfac…

…e method (#9342) * Use CreateDrawingSurface2 method with a correct SIZE struct * Fix old method definition just for case * Fix ICompositionDrawingSurface.GetSize method too
AvaloniaUI · Nov 3, 2022 · 4670536 · 4670536
1 parent 4ad6f1a
commit 4670536
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -2104,6 +2104,12 @@ public struct SIZE
             public int Y;
         }
 
+        public struct SIZE_F
+        {
+            public float X;
+            public float Y;
+        }
+
         public struct RECT
         {
             public int left;

diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
@@ -174,8 +174,9 @@ public WinUICompositedWindow CreateWindow(IntPtr hWnd)
             using var sc = _syncContext.EnsureLocked();
             using var desktopTarget = _compositorDesktopInterop.CreateDesktopWindowTarget(hWnd, 0);
             using var target = desktopTarget.QueryInterface<ICompositionTarget>();
+            using var device2 = _device.QueryInterface<ICompositionGraphicsDevice2>();
 
-            using var drawingSurface = _device.CreateDrawingSurface(new UnmanagedMethods.SIZE(), DirectXPixelFormat.B8G8R8A8UIntNormalized,
+            using var drawingSurface = device2.CreateDrawingSurface2(new UnmanagedMethods.SIZE(), DirectXPixelFormat.B8G8R8A8UIntNormalized,
                 DirectXAlphaMode.Premultiplied);
             using var surface = drawingSurface.QueryInterface<ICompositionSurface>();
             using var surfaceInterop = drawingSurface.QueryInterface<ICompositionDrawingSurfaceInterop>();

diff --git a/src/Windows/Avalonia.Win32/WinRT/winrt.idl b/src/Windows/Avalonia.Win32/WinRT/winrt.idl
@@ -8,6 +8,7 @@
 @clr-map Matrix4x4 System.Numerics.Matrix4x4
 @clr-map RECT Avalonia.Win32.Interop.UnmanagedMethods.RECT
 @clr-map SIZE Avalonia.Win32.Interop.UnmanagedMethods.SIZE
+@clr-map SIZE_F Avalonia.Win32.Interop.UnmanagedMethods.SIZE_F
 @clr-map POINT Avalonia.Win32.Interop.UnmanagedMethods.POINT
 @clr-map HWND IntPtr
 @clr-map BOOL int
@@ -442,12 +443,18 @@ interface IDesktopWindowContentBridgeInterop : IUnknown
 [uuid(FB22C6E1-80A2-4667-9936-DBEAF6EEFE95)]
 interface ICompositionGraphicsDevice : IInspectable
 {
-    HRESULT CreateDrawingSurface([in] SIZE sizePixels, [in] DirectXPixelFormat pixelFormat,
+    HRESULT CreateDrawingSurface([in] SIZE_F sizePixels, [in] DirectXPixelFormat pixelFormat,
         [in] DirectXAlphaMode alphaMode, [out] [retval] ICompositionDrawingSurface** result);
     HRESULT AddRenderingDeviceReplaced(void* handler, void* token);
     HRESULT RemoveRenderingDeviceReplaced([in] int token);
 }
 
+[uuid(0FB8BDF6-C0F0-4BCC-9FB8-084982490D7D)]
+interface ICompositionGraphicsDevice2 : IInspectable
+{
+    HRESULT CreateDrawingSurface2([in] SIZE sizePixels, [in] DirectXPixelFormat pixelFormat, [in] DirectXAlphaMode alphaMode, [out] [retval] ICompositionDrawingSurface** result);
+}
+
 [uuid(1527540D-42C7-47A6-A408-668F79A90DFB)]
 interface ICompositionSurface : IInspectable
 {
@@ -465,7 +472,7 @@ interface ICompositionDrawingSurface : IInspectable
 {
     [propget] HRESULT GetAlphaMode([out] [retval] DirectXAlphaMode* value);
     [propget] HRESULT GetPixelFormat([out] [retval] DirectXPixelFormat* value);
-    [propget] HRESULT GetSize([out] [retval] POINT* value);
+    [propget] HRESULT GetSize([out] [retval] SIZE_F* value);
 }
 
 enum CompositionBitmapInterpolationMode