[PATCH 0/1] MR2317: include: Add more Windows.Foundation.Numerics structs.

[Mohamad Al-Jaf (＠maljaf)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2317

[PATCH 1/1] include: Add more Windows.Foundation.Numerics structs.

[Mohamad Al-Jaf]

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com>

---
 include/windows.foundation.numerics.idl | 76 +++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/include/windows.foundation.numerics.idl b/include/windows.foundation.numerics.idl
index eca99ca29bc..f74eb4fd889 100644
--- a/include/windows.foundation.numerics.idl
+++ b/include/windows.foundation.numerics.idl
@@ -27,7 +27,51 @@ import "windowscontracts.idl";
 import "windows.foundation.idl";
 
 namespace Windows.Foundation.Numerics {
+    typedef struct Matrix3x2 Matrix3x2;
+    typedef struct Matrix4x4 Matrix4x4;
+    typedef struct Plane Plane;
+    typedef struct Quaternion Quaternion;
+    typedef struct Vector2 Vector2;
     typedef struct Vector3 Vector3;
+    typedef struct Vector4 Vector4;
+
+    declare {
+        interface Windows.Foundation.IReference<Windows.Foundation.Numerics.Matrix4x4>;
+        interface Windows.Foundation.IReference<Windows.Foundation.Numerics.Vector2>;
+        interface Windows.Foundation.IReference<Windows.Foundation.Numerics.Vector3>;
+    }
+
+    [contract(Windows.Foundation.UniversalApiContract, 1.0)]
+    struct Matrix3x2
+    {
+        FLOAT M11;
+        FLOAT M12;
+        FLOAT M21;
+        FLOAT M22;
+        FLOAT M31;
+        FLOAT M32;
+    };
+
+    [contract(Windows.Foundation.UniversalApiContract, 1.0)]
+    struct Matrix4x4
+    {
+        FLOAT M11;
+        FLOAT M12;
+        FLOAT M13;
+        FLOAT M14;
+        FLOAT M21;
+        FLOAT M22;
+        FLOAT M23;
+        FLOAT M24;
+        FLOAT M31;
+        FLOAT M32;
+        FLOAT M33;
+        FLOAT M34;
+        FLOAT M41;
+        FLOAT M42;
+        FLOAT M43;
+        FLOAT M44;
+    };
 
     [contract(Windows.Foundation.UniversalApiContract, 1.0)]
     struct Vector3
@@ -36,4 +80,36 @@ namespace Windows.Foundation.Numerics {
         FLOAT Y;
         FLOAT Z;
     };
+
+    [contract(Windows.Foundation.UniversalApiContract, 1.0)]
+    struct Plane
+    {
+        Windows.Foundation.Numerics.Vector3 Normal;
+        FLOAT D;
+    };
+
+    [contract(Windows.Foundation.UniversalApiContract, 1.0)]
+    struct Quaternion
+    {
+        FLOAT X;
+        FLOAT Y;
+        FLOAT Z;
+        FLOAT W;
+    };
+
+    [contract(Windows.Foundation.UniversalApiContract, 1.0)]
+    struct Vector2
+    {
+        FLOAT X;
+        FLOAT Y;
+    };
+
+    [contract(Windows.Foundation.UniversalApiContract, 1.0)]
+    struct Vector4
+    {
+        FLOAT X;
+        FLOAT Y;
+        FLOAT Z;
+        FLOAT W;
+    };
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2317

[Mohamad Al-Jaf (＠maljaf)]

Not sure why it says
> Merge blocked: the source branch must be rebased onto the target branch.

It's definitely rebased and up to date.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2317#note_26063

[PATCH 0/1] MR2317: include: Add more Windows.Foundation.Numerics structs. - approved

[Rémi Bernon]

This merge request was approved by Rémi Bernon.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2317

[Rémi Bernon]

On Fri Mar  3 06:22:07 2023 +0000, Mohamad Al-Jaf wrote:
> Not sure why it says
> > Merge blocked: the source branch must be rebased onto the target branch.
> > It's definitely rebased and up to date.
> > Yeah happens all the time, I don't know either.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2317#note_26074