[PATCH 0/1] MR1411: dwmapi: Fallback to 60Hz if the display frequency is invalid in get_display_frequency().

[Zhiyi Zhang (＠zhiyi)]

DwmGetCompositionTimingInfo() may throw a zero division exception if the display reports a 0Hz
frequency, which can happen when testing under Xephyr without -fakescreenfps option.

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

[PATCH 1/1] dwmapi: Fallback to 60Hz if the display frequency is invalid in get_display_frequency().

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

DwmGetCompositionTimingInfo() may throw a zero division exception if the display reports a 0Hz
frequency, which can happen when testing under Xephyr without -fakescreenfps option.
---
 dlls/dwmapi/dwmapi_main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c
index 1a65410c7eb..56730f79cac 100644
--- a/dlls/dwmapi/dwmapi_main.c
+++ b/dlls/dwmapi/dwmapi_main.c
@@ -213,12 +213,16 @@ HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_i
 
 static int get_display_frequency(void)
 {
-    DEVMODEA mode;
+    DEVMODEW mode;
+    BOOL ret;
 
     memset(&mode, 0, sizeof(mode));
     mode.dmSize = sizeof(mode);
-    if (EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode))
+    ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &mode, 0);
+    if (ret && mode.dmFields & DM_DISPLAYFREQUENCY && mode.dmDisplayFrequency)
+    {
         return mode.dmDisplayFrequency;
+    }
     else
     {
         WARN("Failed to query display frequency, returning a fallback value.\n");
-- 
GitLab

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

[PATCH 1/1] dwmapi: Fallback to 60Hz if the display frequency is invalid in get_display_frequency().

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

Your paranoid android.


=== debian11 (32 bit report) ===

d3drm:
d3drm.c:4776: Test failed: Cannot create IDirect3DRMDevice2 interface, hr 0x8007000e.
d3drm.c:4778: Test failed: expected ref3 > ref1, got ref1 = 1 , ref3 = 1.
d3drm.c:4782: Test failed: Expected surface_ref2 > surface_ref1, got surface_ref1 = 1, surface_ref2 = 1.
Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00410761).

=== debian11 (build log) ===

04e0:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.