Zhiyi Zhang : winex11.drv: Allow setting a 0-bit color depth display mode.

Alexandre Julliard julliard at winehq.org
Wed Aug 26 15:24:44 CDT 2020


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

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Tue Aug 25 15:16:51 2020 +0800

winex11.drv: Allow setting a 0-bit color depth display mode.

Windows 8.1 and older allow setting a display mode with 0-bit color depth.

Fix a regression from 981fb4edb371dd2ccf57dd350e76451df50c0a98.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winex11.drv/settings.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c
index 7827ede656..902f1ec15d 100644
--- a/dlls/winex11.drv/settings.c
+++ b/dlls/winex11.drv/settings.c
@@ -473,7 +473,9 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode)
     {
         found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx);
 
-        if (dev_mode->dmFields & DM_BITSPERPEL && found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel)
+        if (dev_mode->dmFields & DM_BITSPERPEL &&
+            dev_mode->dmBitsPerPel &&
+            found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel)
             continue;
         if (dev_mode->dmFields & DM_PELSWIDTH && found_mode->dmPelsWidth != dev_mode->dmPelsWidth)
             continue;




More information about the wine-cvs mailing list