[PATCH] include: add missing structures in dcommon.idl
Biswapriyo Nath
nathbappai at gmail.com
Fri May 15 08:24:36 CDT 2020
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20200515/fc22dc52/attachment.htm>
-------------- next part --------------
From 6be7aebf22b4424c973e6edc908e8a2ca8125297 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai at gmail.com>
Date: Fri, 15 May 2020 18:52:41 +0530
Subject: [PATCH] include: add missing structures in dcommon.idl
Signed-off-by: Biswapriyo Nath <nathbappai at gmail.com>
---
include/d2dbasetypes.h | 10 -----
include/dcommon.idl | 89 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 88 insertions(+), 11 deletions(-)
diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h
index b231081..a160a89 100644
--- a/include/d2dbasetypes.h
+++ b/include/d2dbasetypes.h
@@ -29,16 +29,6 @@ typedef struct D3DCOLORVALUE
typedef D3DCOLORVALUE D2D_COLOR_F;
-typedef struct D2D_MATRIX_3X2_F
-{
- float _11;
- float _12;
- float _21;
- float _22;
- float _31;
- float _32;
-} D2D_MATRIX_3X2_F;
-
typedef struct D2D_RECT_F
{
float left;
diff --git a/include/dcommon.idl b/include/dcommon.idl
index 53281bd..43c82eb 100644
--- a/include/dcommon.idl
+++ b/include/dcommon.idl
@@ -23,6 +23,12 @@ typedef struct
{
long x, y;
} POINT;
+
+typedef struct
+{
+ long left, top, right, bottom;
+} RECT;
+
typedef unsigned int UINT32;
cpp_quote("#endif")
@@ -52,7 +58,7 @@ typedef enum D2D1_ALPHA_MODE
D2D1_ALPHA_MODE_PREMULTIPLIED = 1,
D2D1_ALPHA_MODE_STRAIGHT = 2,
D2D1_ALPHA_MODE_IGNORE = 3,
- D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff,
+ D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff
} D2D1_ALPHA_MODE;
typedef struct D2D1_PIXEL_FORMAT
@@ -69,12 +75,76 @@ typedef struct D2D_POINT_2F
typedef POINT D2D_POINT_2L, D2D1_POINT_2L;
+typedef struct D2D_VECTOR_2F
+{
+ float x;
+ float y;
+} D2D_VECTOR_2F;
+
+typedef struct D2D_VECTOR_3F
+{
+ float x;
+ float y;
+ float z;
+} D2D_VECTOR_3F;
+
+typedef struct D2D_VECTOR_4F
+{
+ float x;
+ float y;
+ float z;
+ float w;
+} D2D_VECTOR_4F;
+
+typedef RECT D2D_RECT_L, D2D1_RECT_L;
+
typedef struct D2D_SIZE_U
{
UINT32 width;
UINT32 height;
} D2D_SIZE_U, D2D1_SIZE_U;
+typedef struct D2D_MATRIX_3X2_F
+{
+ union
+ {
+ struct
+ {
+ float m11;
+ float m12;
+ float m21;
+ float m22;
+ float dx;
+ float dy;
+ };
+
+ struct
+ {
+ float _11, _12;
+ float _21, _22;
+ float _31, _32;
+ };
+
+ float m[3][2];
+ };
+} D2D_MATRIX_3X2_F;
+
+typedef struct D2D_MATRIX_4X3_F
+{
+ union
+ {
+ struct
+ {
+ float _11, _12, _13;
+ float _21, _22, _23;
+ float _31, _32, _33;
+ float _41, _42, _43;
+ };
+
+ float m[4][3];
+ };
+} D2D_MATRIX_4X3_F;
+
typedef struct D2D_MATRIX_4X4_F
{
union
@@ -90,3 +160,20 @@ typedef struct D2D_MATRIX_4X4_F
float m[4][4];
};
} D2D_MATRIX_4X4_F;
+
+typedef struct D2D_MATRIX_5X4_F
+{
+ union
+ {
+ struct
+ {
+ float _11, _12, _13, _14;
+ float _21, _22, _23, _24;
+ float _31, _32, _33, _34;
+ float _41, _42, _43, _44;
+ float _51, _52, _53, _54;
+ };
+
+ float m[5][4];
+ };
+} D2D_MATRIX_5X4_F;
--
2.26.2
More information about the wine-devel
mailing list