[PATCH 0/2] MR6180: gdiplus: Fixes when compiling against wine headers.

[Alistair Leslie-Hughes (＠alesliehughes)]

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

[PATCH 1/2] include: Add *_SHIFT macros

[Alistair Leslie-Hughes]

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

---
 include/gdipluspixelformats.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h
index 2a2a3ccbcfd..91726628be1 100644
--- a/include/gdipluspixelformats.h
+++ b/include/gdipluspixelformats.h
@@ -22,6 +22,12 @@
 typedef DWORD ARGB;
 typedef INT PixelFormat;
 
+#define ALPHA_SHIFT 24
+#define RED_SHIFT   16
+#define GREEN_SHIFT 8
+#define BLUE_SHIFT  0
+#define ALPHA_MASK  ((ARGB) 0xff << ALPHA_SHIFT)
+
 #define    PixelFormatIndexed   0x00010000
 #define    PixelFormatGDI       0x00020000
 #define    PixelFormatAlpha     0x00040000
-- 
GitLab


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

[PATCH 2/2] include: Forward declare all gdiplus classes

[Alistair Leslie-Hughes]

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

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

diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h
index 67b6ac1e34e..ba99ccb67a9 100644
--- a/include/gdiplusgpstubs.h
+++ b/include/gdiplusgpstubs.h
@@ -21,6 +21,28 @@
 
 #ifdef __cplusplus
 
+class Bitmap;
+class Brush;
+class CachedBitmap;
+class Font;
+class FontCollection;
+class FontFamily;
+class Graphics;
+class GraphicsPath;
+class HatchBrush;
+class Image;
+class ImageAttributes;
+class InstalledFontCollection;
+class LinearGradientBrush;
+class Matrix;
+class Metafile;
+class PathGradientBrush;
+class PathIterator;
+class Pen;
+class Region;
+class SolidBrush;
+class TextureBrush;
+
 class GpGraphics {};
 class GpPen {};
 class GpBrush {};
-- 
GitLab

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

[PATCH 2/2] include: Forward declare all gdiplus classes

[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=147454

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: include/gdipluspixelformats.h:22
error: patch failed: include/gdiplusgpstubs.h:21
Task: Patch failed to apply