[PATCH v2 0/1] MR6570: include: Add new value in DWRITE_GLYPH_IMAGE_FORMATS in dcommon.idl.

[Biswapriyo Nath (＠Biswa96)]

Required for https://github.com/mozilla/gecko-dev/blob/a2faa4127e3d08e663efb2db42c68afcb0...

--
  v2: include: Add new value in DWRITE_GLYPH_IMAGE_FORMATS in dcommon.idl.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6570

[PATCH v2 1/1] include: Add new value in DWRITE_GLYPH_IMAGE_FORMATS in dcommon.idl.

[Biswapriyo Nath]

From: Biswapriyo Nath <nathbappai(a)gmail.com>

Required for https://github.com/mozilla/gecko-dev/blob/a2faa4127e3d08e663efb2db42c68afcb0...
---
 include/dcommon.idl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/dcommon.idl b/include/dcommon.idl
index 43c82eb8a76..75e55d85690 100644
--- a/include/dcommon.idl
+++ b/include/dcommon.idl
@@ -49,9 +49,13 @@ typedef enum DWRITE_GLYPH_IMAGE_FORMATS
     DWRITE_GLYPH_IMAGE_FORMATS_PNG                    = 1 << 4,
     DWRITE_GLYPH_IMAGE_FORMATS_JPEG                   = 1 << 5,
     DWRITE_GLYPH_IMAGE_FORMATS_TIFF                   = 1 << 6,
-    DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7
+    DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7,
+    DWRITE_GLYPH_IMAGE_FORMATS_COLR_PAINT_TREE        = 1 << 8,
 } DWRITE_GLYPH_IMAGE_FORMATS;
 
+cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS)")
+cpp_quote("#define DWRITE_GLYPH_IMAGE_FORMATS_COLR_PAINT_TREE_DEFINED")
+
 typedef enum D2D1_ALPHA_MODE
 {
     D2D1_ALPHA_MODE_UNKNOWN = 0,
-- 
GitLab

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

[PATCH v2 1/1] include: Add new value in DWRITE_GLYPH_IMAGE_FORMATS in dcommon.idl.

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

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: include/dcommon.idl:49
Task: Patch failed to apply

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

d3d9:
d3d9ex.c:3236: Test failed: Got unexpected WINDOWPOS hwnd=0000000000000000, x=0, y=0, cx=0, cy=0, flags=0

kernel32:
comm.c:1574: Test failed: AbortWaitCts hComPortEvent failed
comm.c:1586: Test failed: Unexpected time 1001, expected around 500

mfmediaengine:
mfmediaengine.c:2564: Test failed: Unexpected time 0.000000.

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

[Nikolay Sivov (＠nsivov)]

SDK also has a guard for DEFINE_ENUM_FLAG_OPERATORS.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6570#note_83491

[Biswapriyo Nath (＠Biswa96)]

I am not sure if that guard actually required. Other IDL files do not have that guard and I have tested this change with mozilla-central/gfx/skia.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6570#note_83493