[PATCH 1/2] ddraw/tests: Treat refresh rates with 1 hz difference as equal.

[Stefan Dösinger]

Signed-off-by: Stefan Dösinger

---

This fixes test failures on Win7, Geforce 9600.

The MS doc I am referring to is https://support.microsoft.com/en-us/topic/screen-refresh-rate-in-windows-doe....
---
 dlls/ddraw/tests/ddraw2.c |  3 ++-
 dlls/ddraw/tests/ddraw4.c |  3 ++-
 dlls/ddraw/tests/ddraw7.c | 11 ++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 00c8f820edb..8a6c4b41ac1 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -15114,8 +15114,9 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc
     if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel)
         return DDENUMRET_OK;

+    /* See comment in ddraw7 about the frequency. */
     if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height &&
-            surface_desc->dwRefreshRate != param->old_frequency)
+            !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1))
     {
         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 a8b68b8a20b..c229ab66341 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -18151,8 +18151,9 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des
     if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel)
         return DDENUMRET_OK;

+    /* See comment in ddraw7 about the frequency. */
     if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height &&
-            surface_desc->dwRefreshRate != param->old_frequency)
+            !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1))
     {
         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 f4388296702..18ebf849391 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -18417,8 +18417,17 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des
     if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel)
         return DDENUMRET_OK;

+    /* Windows will advertise 59hz (for 59.94) and 60hz (for proper 60hz) on monitors that support
+     * only one of the two (usually 59.94). If an application requests 60hz windows will apply 59.94.
+     * Thus if we think we found a different refresh rate, we get 59hz instead of the 60hz we
+     * requested.
+     *
+     * The same is true of other 1% slowed-down TV compatible refresh rates according to a Microsoft
+     * support document: 23.976 vs 24, 30, 48, 72 and 120 hz. It can be reproduced by attempting to
+     * 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 &&
-            surface_desc->dwRefreshRate != param->old_frequency)
+            !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1))
     {
         param->new_width = surface_desc->dwWidth;
         param->new_height = surface_desc->dwHeight;

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

[Stefan Dösinger]

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

---

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;

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

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106025

Your paranoid android.

=== w864 (64 bit report) ===

ddraw:
ddraw2.c:3582: Test failed: Failed to create surface, hr 0x887601c2.
0b2c:ddraw2: unhandled exception c0000005 at 00000000004805F8

=== w1064v1809 (32 bit report) ===

ddraw:
ddraw7.c:18858: Test failed: Got unexpected color 0x00000040.

=== w1064_tsign (32 bit report) ===

ddraw:
ddraw7.c:18858: Test failed: Got unexpected color 0x00000040.

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

ddraw:
ddraw2.c:3974: Test failed: Got unexpected screen width 800.
ddraw2.c:3976: Test failed: Got unexpected screen height 600.
ddraw2.c:3981: Test failed: Got unexpected screen width 800.
ddraw2.c:3983: Test failed: Got unexpected screen height 600.
ddraw2.c:4005: Test failed: Got unexpected screen width 800.
ddraw2.c:4007: Test failed: Got unexpected screen height 600.
ddraw2.c:4040: Test failed: Got unexpected screen width 800.
ddraw2.c:4042: Test failed: Got unexpected screen height 600.
ddraw2.c:4063: Test failed: Got unexpected screen width 800.
ddraw2.c:4065: Test failed: Got unexpected screen height 600.
ddraw2.c:4070: Test failed: Got unexpected screen width 800.
ddraw2.c:4072: Test failed: Got unexpected screen height 600.
ddraw4.c:3612: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3634: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3660: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3680: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3716: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).

=== debian11 (32 bit Arabic:Morocco report) ===

ddraw:
ddraw2.c:4070: Test failed: Got unexpected screen width 800.
ddraw2.c:4072: Test failed: Got unexpected screen height 600.

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

ddraw:
ddraw4.c:3856: Test failed: Expected resolution 1024x768, got 720x480.
ddraw4.c:3873: Test failed: Expected surface width 1024, got 720.
ddraw4.c:3899: Test failed: Expected screen size 1024x768, got 720x480.
ddraw4.c:3906: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480).
ddraw4.c:3918: Test failed: Expected surface width 1024, got 720.
ddraw4.c:3920: Test failed: Expected surface height 768, got 480.
ddraw4.c:3971: Test failed: Expected screen size 2 1024x768, got 720x480.
ddraw4.c:3979: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480).
ddraw4.c:3991: Test failed: Expected surface width 1024, got 720.
ddraw4.c:3993: Test failed: Expected surface height 768, got 480.

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

ddraw:
ddraw4.c:2956: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw4.c:2989: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw4.c:2992: Test failed: Expected window extended style 0x108, got 0x8.
ddraw4.c:2998: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw4.c:3001: Test failed: Expected window extended style 0x108, got 0x8.
ddraw4.c:3021: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw4.c:3023: Test failed: Expected window extended style 0x100, got 0.
ddraw4.c:3040: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31976).
ddraw4.c:3063: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31976).
ddraw4.c:3083: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw4.c:3085: Test failed: Expected window extended style 0x100, got 0.
ddraw7.c:3857: Test failed: Got unexpected screen width 800.
ddraw7.c:3859: Test failed: Got unexpected screen height 600.
ddraw7.c:3864: Test failed: Got unexpected screen width 800.
ddraw7.c:3866: Test failed: Got unexpected screen height 600.
ddraw7.c:3888: Test failed: Got unexpected screen width 800.
ddraw7.c:3890: Test failed: Got unexpected screen height 600.
ddraw7.c:3923: Test failed: Got unexpected screen width 800.
ddraw7.c:3925: Test failed: Got unexpected screen height 600.
ddraw7.c:3946: Test failed: Got unexpected screen width 800.
ddraw7.c:3948: Test failed: Got unexpected screen height 600.
ddraw7.c:3953: Test failed: Got unexpected screen width 800.
ddraw7.c:3955: Test failed: Got unexpected screen height 600.

=== debian11 (32 bit Hebrew:Israel report) ===

ddraw:
ddraw4.c:3464: Test failed: Got unexpected screen size 720x480.
ddraw4.c:3518: Test failed: Expected message 0x47, but didn't receive it.
ddraw4.c:3520: Test failed: Expected screen size 640x480, got 0x0.
ddraw4.c:3526: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3550: Test failed: Expected surface width 640, got 720.
ddraw4.c:3556: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3563: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3568: Test failed: Expected surface width 640, got 720.
ddraw4.c:3583: Test failed: Expected surface width 640, got 720.
ddraw4.c:3589: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3612: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3634: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3639: Test failed: Expected surface width 640, got 720.
ddraw4.c:3660: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3680: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3693: Test failed: Expected resolution 640x480, got 720x480.
ddraw4.c:3710: Test failed: Expected surface width 640, got 720.
ddraw4.c:3716: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3726: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3731: Test failed: Expected surface width 640, got 720.
ddraw4.c:3746: Test failed: Expected surface width 640, got 720.
ddraw4.c:3752: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3775: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3788: Test failed: Got unexpected hr 0.
ddraw4.c:3790: Test failed: Got unexpected hr 0.
ddraw4.c:3797: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3802: Test failed: Expected surface width 640, got 720.
ddraw4.c:3823: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3843: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3856: Test failed: Expected resolution 640x480, got 720x480.
ddraw4.c:3873: Test failed: Expected surface width 640, got 720.
ddraw4.c:3880: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3897: Test failed: Expected message 0x5, but didn't receive it.
ddraw4.c:3899: Test failed: Expected screen size 640x480, got 0x0.
ddraw4.c:3906: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3918: Test failed: Expected surface width 640, got 720.
ddraw4.c:3971: Test failed: Expected screen size 2 640x480, got 720x480.
ddraw4.c:3979: Test failed: Expected (0,0)-(640,480), got (0,0)-(720,480).
ddraw4.c:3991: Test failed: Expected surface width 640, got 720.

=== debian11 (32 bit Japanese:Japan report) ===

ddraw:
ddraw4.c:18247: Test failed: Expect clip rect (0,0)-(640,480), got (0,0)-(800,600).
ddraw4.c:18271: Test failed: Expect clip rect (0,0)-(640,480), got (0,0)-(800,600).
ddraw4.c:18312: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw4.c:18368: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw4.c:18375: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw4.c:18312: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,737).
ddraw4.c:18334: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737).
ddraw4.c:18349: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737).
ddraw4.c:18368: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,737).
ddraw4.c:18375: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,737).
ddraw7.c:2616: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw7.c:2649: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw7.c:2652: Test failed: Expected window extended style 0x108, got 0x8.
ddraw7.c:2658: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw7.c:2661: Test failed: Expected window extended style 0x108, got 0x8.
ddraw7.c:2681: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw7.c:2683: Test failed: Expected window extended style 0x100, got 0.
ddraw7.c:2700: Test failed: Expected (0,0)-(800,600), got (-32000,-32000)-(-31840,-31976).
ddraw7.c:2723: Test failed: Expected (0,0)-(800,600), got (-32000,-32000)-(-31840,-31976).
ddraw7.c:2743: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw7.c:2745: Test failed: Expected window extended style 0x100, got 0.
ddraw7.c:18586: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw7.c:18642: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw7.c:18649: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw7.c:18586: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,737).
ddraw7.c:18608: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737).
ddraw7.c:18623: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737).
ddraw7.c:18642: Test failed: Expect window rect (0,0)-(800,600), got (1024,0)-(2048,737).
ddraw7.c:18649: Test failed: Expect window rect (0,0)-(800,600), got (1024,0)-(2048,737).

=== debian11 (32 bit Chinese:China report) ===

ddraw:
ddraw2.c:15297: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737).
ddraw2.c:15312: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737).
ddraw4.c:18312: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw4.c:18368: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw4.c:18375: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw4.c:18312: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,737).
ddraw4.c:18334: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737).
ddraw4.c:18349: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737).
ddraw4.c:18368: Test failed: Expect window rect (0,0)-(800,600), got (1024,0)-(2048,737).
ddraw4.c:18375: Test failed: Expect window rect (0,0)-(800,600), got (1024,0)-(2048,737).
ddraw7.c:18586: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw7.c:18642: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw7.c:18649: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768).
ddraw7.c:18586: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,737).
ddraw7.c:18608: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737).
ddraw7.c:18623: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737).
ddraw7.c:18642: Test failed: Expect window rect (0,0)-(800,600), got (1024,0)-(2048,737).
ddraw7.c:18649: Test failed: Expect window rect (0,0)-(800,600), got (1024,0)-(2048,737).

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

ddraw:
ddraw7.c:3556: Test failed: Expected message 0x5, but didn't receive it.

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

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106024

Your paranoid android.

=== w8 (32 bit report) ===

ddraw:
ddraw7.c:18858: Test failed: Got unexpected color 0x0000ff00.

=== w8adm (32 bit report) ===

ddraw:
ddraw7.c:18858: Test failed: Got unexpected color 0x00000040.

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

ddraw:
ddraw4.c:3693: Test failed: Expected resolution 1024x768, got 640x480.
ddraw4.c:3710: Test failed: Expected surface width 1024, got 640.
ddraw4.c:3712: Test failed: Expected surface height 768, got 480.
ddraw4.c:3726: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3731: Test failed: Expected surface width 1024, got 640.
ddraw4.c:3733: Test failed: Expected surface height 768, got 480.
ddraw4.c:3746: Test failed: Expected surface width 1024, got 640.
ddraw4.c:3748: Test failed: Expected surface height 768, got 480.
ddraw4.c:3752: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3775: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3797: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3802: Test failed: Expected surface width 1024, got 640.
ddraw4.c:3804: Test failed: Expected surface height 768, got 480.
ddraw4.c:3823: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3843: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3856: Test failed: Expected resolution 1024x768, got 640x480.
ddraw4.c:3873: Test failed: Expected surface width 1024, got 640.
ddraw4.c:3875: Test failed: Expected surface height 768, got 480.
ddraw4.c:3880: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3897: Test failed: Expected message 0x5, but didn't receive it.
ddraw4.c:3899: Test failed: Expected screen size 1024x768, got 0x0.
ddraw4.c:3906: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3918: Test failed: Expected surface width 1024, got 640.
ddraw4.c:3920: Test failed: Expected surface height 768, got 480.
ddraw4.c:3971: Test failed: Expected screen size 2 1024x768, got 640x480.
ddraw4.c:3979: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480).
ddraw4.c:3991: Test failed: Expected surface width 1024, got 640.
ddraw4.c:3993: Test failed: Expected surface height 768, got 480.

=== debian11 (32 bit Arabic:Morocco report) ===

ddraw:
ddraw4.c:4458: Test failed: Got a different mode.
ddraw4.c:4489: Test failed: Got a different mode.

=== debian11 (32 bit Hebrew:Israel report) ===

ddraw:
ddraw2.c:4070: Test failed: Got unexpected screen width 800.
ddraw2.c:4072: Test failed: Got unexpected screen height 600.

=== debian11 (32 bit Japanese:Japan report) ===

ddraw:
ddraw2.c:6805: Test failed: Failed to attach surface, hr 0x8876000a.
ddraw2.c:6808: Test failed: Got unexpected hr 0x8876000a.
ddraw2.c:6810: Test failed: Failed to detach surface, hr 0x88760014.
ddraw2.c:6813: Test failed: Failed to attach surface, hr 0x8876000a.
ddraw2.c:6818: Test failed: Failed to detach surface, hr 0x88760014.
ddraw4.c:2956: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw4.c:2958: Test failed: Expected window extended style 0x100, got 0.
ddraw4.c:2989: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw4.c:2992: Test failed: Expected window extended style 0x108, got 0x8.
ddraw4.c:2998: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw4.c:3001: Test failed: Expected window extended style 0x108, got 0x8.
ddraw4.c:3021: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.
ddraw4.c:3023: Test failed: Expected window extended style 0x100, got 0.
ddraw4.c:3040: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31976).
ddraw4.c:3063: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31976).
ddraw4.c:3083: Test failed: Expected window style 0x4cf0000, got 0xa40b0000.

=== debian11 (64 bit WoW report) ===

ddraw:
ddraw2.c:3665: Test failed: Expected message 0x5, but didn't receive it.

[Henri Verbeet]

Signed-off-by: Henri Verbeet