[PATCH v2 0/1] MR3957: d2d1: Support GUID_WICPixelFormat32bppRGB.

[Andrew Brobston (＠brobston)]

Needed by PowerFritz 18.

--
  v2: d2d1: Support GUID_WICPixelFormat32bppRGB.

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

[PATCH v2 1/1] d2d1: Support GUID_WICPixelFormat32bppRGB.

[Andrew Brobston]

From: Andrew Brobston

Needed by PowerFritz 18.  Allows creating bitmap objects for the WICPixelFormat32bppRGB
format.  Otherwise, we get the warning:

warn:d2d:d2d_bitmap_create_from_wic_bitmap Unsupported WIC bitmap format
{d98c6b95-3efe-47d6-bb25-eb1748ab0cf1}.

...and certain dialog boxes appear only as gray blocks.
---
 dlls/d2d1/bitmap.c     | 1 +
 dlls/d2d1/tests/d2d1.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index 316d0f25ad6..e5048611519 100644
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -680,6 +680,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW
         {&GUID_WICPixelFormat32bppPBGRA, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}},
         {&GUID_WICPixelFormat32bppPRGBA, {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}},
         {&GUID_WICPixelFormat32bppBGR,   {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}},
+        {&GUID_WICPixelFormat32bppRGB,   {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}},
     };

if (FAILED(hr = IWICBitmapSource_GetSize(bitmap_source, &size.width, &size.height)))
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 9480e1fc1a5..024886706c3 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -10433,6 +10433,7 @@ static void test_wic_bitmap_format(BOOL d3d11)
         {&GUID_WICPixelFormat32bppPBGRA, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}},
         {&GUID_WICPixelFormat32bppPRGBA, {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}},
         {&GUID_WICPixelFormat32bppBGR,   {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}},
+        {&GUID_WICPixelFormat32bppRGB,   {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}},
     };

if (!init_test_context(&ctx, d3d11))

[PATCH v2 0/1] MR3957: d2d1: Support GUID_WICPixelFormat32bppRGB. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.