Zhiyi Zhang : win32u: Allow selecting 32-bit DDBs into display compatible DCs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 60faf44ed10afde29f0ccd085b89c52621e5256c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=60faf44ed10afde29f0ccd085...

Author: Zhiyi Zhang <zzhang(a)codeweavers.com>
Date:   Wed Dec 29 15:32:52 2021 +0800

win32u: Allow selecting 32-bit DDBs into display compatible DCs.

Device context bit depths other than 32-bit are emulated and the real bit depth for display DCs is
still 32-bit. Thus, a 32-bit DDB should be allowed to be selected into a display compatible DC even
if the DC reports a different bit depth.

Fix a regression from d171d11.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51805
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/user32/tests/monitor.c | 2 --
 dlls/win32u/bitmap.c        | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c
index e745fb9c7b3..a857b295849 100644
--- a/dlls/user32/tests/monitor.c
+++ b/dlls/user32/tests/monitor.c
@@ -2301,7 +2301,6 @@ static void test_display_dc(void)
             bpp = GetDeviceCaps(mem_dc, BITSPIXEL);
             ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp);
             old_hbitmap = SelectObject(mem_dc, hbitmap);
-            todo_wine
             ok(!!old_hbitmap, "Failed to select bitmap.\n");
             bpp = GetDeviceCaps(mem_dc, BITSPIXEL);
             ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp);
@@ -2329,7 +2328,6 @@ static void test_display_dc(void)
                     ok(!old_hbitmap || broken(!!old_hbitmap) /* Win7 dual-QXL test bot and XP */,
                        "Selecting bitmap succeeded.\n");
                 else
-                    todo_wine_if(bpps[i] == 32)
                     ok(!!old_hbitmap || broken(!old_hbitmap) /* Win7 dual-QXL test bot and XP */,
                        "Failed to select bitmap.\n");
 
diff --git a/dlls/win32u/bitmap.c b/dlls/win32u/bitmap.c
index 00c8b347af5..2be88715948 100644
--- a/dlls/win32u/bitmap.c
+++ b/dlls/win32u/bitmap.c
@@ -401,7 +401,9 @@ HGDIOBJ WINAPI NtGdiSelectBitmap( HDC hdc, HGDIOBJ handle )
 
     if (!is_bitmapobj_dib( bitmap ) &&
         bitmap->dib.dsBm.bmBitsPixel != 1 &&
-        bitmap->dib.dsBm.bmBitsPixel != NtGdiGetDeviceCaps( hdc, BITSPIXEL ))
+        bitmap->dib.dsBm.bmBitsPixel != NtGdiGetDeviceCaps( hdc, BITSPIXEL ) &&
+        /* Display compatible DCs should accept 32-bit DDBs because other color depths are emulated */
+        !(NtGdiGetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASDISPLAY && bitmap->dib.dsBm.bmBitsPixel == 32))
     {
         WARN( "Wrong format bitmap %u bpp\n", bitmap->dib.dsBm.bmBitsPixel );
         GDI_ReleaseObj( handle );