ddraw/tests: Don't insist on a different refresh rate if no refresh rate was requested.

d4fdb1f6 broke test_cursor_clipping by accident. It added a requirement that width, height and refresh rate are different from the old mode, but test_cursor_clipping does not use DDEDM_REFRESHRATES, so all refresh rates are 0. Signed-off-by: Stefan Dösinger <stefan@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ddraw/tests: Don't insist on a different refresh rate if no refresh rate was requested.
9a499217 · Stefan Dösinger · Alexandre Julliard · dc79534a · 9a499217 · 9a499217
Commit 9a499217 authored Jan 26, 2022 by Stefan Dösinger Committed by Alexandre Julliard Jan 26, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ddraw2.c dlls/ddraw/tests/ddraw2.c +1 -1

ddraw4.c dlls/ddraw/tests/ddraw4.c +1 -1

ddraw7.c dlls/ddraw/tests/ddraw7.c +1 -1

No files found.
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -15116,7 +15116,7 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc
    /* See comment in ddraw7 about the frequency. */
    if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height &&
-            !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1))
+            (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency))
    {
        param->new_width = surface_desc->dwWidth;
        param->new_height = surface_desc->dwHeight;

--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -18153,7 +18153,7 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des
    /* See comment in ddraw7 about the frequency. */
    if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height &&
-            !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1))
+            (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency))
    {
        param->new_width = surface_desc->dwWidth;
        param->new_height = surface_desc->dwHeight;

--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -18427,7 +18427,7 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des
     * set 60hz in the advanced display properties manually. Usually the restriction to one refresh
     * rate applies to laptop panels. */
    if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height &&
-            !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1))
+            (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency))
    {
        param->new_width = surface_desc->dwWidth;
        param->new_height = surface_desc->dwHeight;