[PATCH 0/3] MR6407: include: Updated a few gdiplus types.

[Alistair Leslie-Hughes (＠alesliehughes)]

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

[PATCH 1/3] include: Move ColorChannelLUT outside of if __cplusplus.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---
 include/gdipluscolormatrix.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h
index 391095ed8fb..2bbfaa6d97a 100644
--- a/include/gdipluscolormatrix.h
+++ b/include/gdipluscolormatrix.h
@@ -60,9 +60,10 @@ enum HistogramFormat
     HistogramFormatA,
 };
 
+typedef BYTE ColorChannelLUT[256];
+
 #ifndef __cplusplus
 
-typedef BYTE ColorChannelLUT[256];
 typedef enum ColorAdjustType ColorAdjustType;
 typedef enum ColorMatrixFlags ColorMatrixFlags;
 typedef enum HistogramFormat HistogramFormat;
-- 
GitLab


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

[PATCH 2/3] include/gdiplustypes.h: Add basic constructors for Rect/RectF

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---
 include/gdiplustypes.h | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h
index 80d5955ffb2..7f72b9fa23f 100644
--- a/include/gdiplustypes.h
+++ b/include/gdiplustypes.h
@@ -190,6 +190,18 @@ public:
     REAL Y;
     REAL Width;
     REAL Height;
+
+    RectF()
+       : X(0), Y(0), Width(0), Height(0)
+    {
+    }
+
+    RectF(REAL x, REAL y, REAL width, REAL height)
+       : X(x), Y(y), Width(width), Height(height)
+
+    {
+    }
+
 };
 
 /* FIXME: missing the methods. */
@@ -200,6 +212,16 @@ public:
     INT Y;
     INT Width;
     INT Height;
+
+    Rect()
+       : X(0), Y(0), Width(0), Height(0)
+    {
+    }
+
+    Rect(INT x, INT y, INT width, INT height)
+       : X(x), Y(y), Width(width), Height(height)
+    {
+    }
 };
 
 class CharacterRange
-- 
GitLab


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

[PATCH 3/3] include/gdiplustypes.h: Add class SizeF

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---
 include/gdiplustypes.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h
index 7f72b9fa23f..a9905327ecd 100644
--- a/include/gdiplustypes.h
+++ b/include/gdiplustypes.h
@@ -224,6 +224,24 @@ public:
     }
 };
 
+/* FIXME: missing the methods. */
+class SizeF
+{
+public:
+    REAL Width;
+    REAL Height;
+
+    SizeF()
+      : Width(0.0f), Height(0.0f)
+    {
+    }
+
+    SizeF(REAL width, REAL height)
+      : Width(width), Height(height)
+    {
+    }
+};
+
 class CharacterRange
 {
 public:
-- 
GitLab

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

[PATCH 3/3] include/gdiplustypes.h: Add class SizeF

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=148097

Your paranoid android.


=== debian11b (64 bit WoW report) ===

kernel32:
comm.c:1586: Test failed: Unexpected time 1000, expected around 500

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 0000000001A100EA, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032