[PATCH 2/2] ddraw/tests: Don't insist on a different refresh rate if no refresh rate was requested.
Stefan Dösinger
stefan at codeweavers.com
Wed Jan 26 02:52:26 CST 2022
d4fdb1f62cf5 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 at codeweavers.com>
---
Possibly the logical AND should be logical OR, i.e. one of the properties
differs and not all of them?
---
dlls/ddraw/tests/ddraw2.c | 2 +-
dlls/ddraw/tests/ddraw4.c | 2 +-
dlls/ddraw/tests/ddraw7.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 8a6c4b41ac1..625776c652c 100644
--- 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;
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index c229ab66341..9b8acb674e3 100644
--- 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;
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 18ebf849391..84789e8f177 100644
--- 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;
--
2.34.1
More information about the wine-devel
mailing list