[PATCH 2/2] ddraw: Report correct frequency in GetDisplayMode().
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/ddraw1.c | 1 - dlls/ddraw/tests/ddraw2.c | 2 -- dlls/ddraw/tests/ddraw4.c | 2 -- dlls/ddraw/tests/ddraw7.c | 2 -- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d7545e5c82c..c3c335d978e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1652,7 +1652,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 DDSD->dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; - DDSD->u2.dwRefreshRate = 60; + DDSD->u2.dwRefreshRate = mode.refresh_rate; DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 6f0948bbaba..2fac4d4b0ba 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13865,7 +13865,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index abcd2010b23..6b584798539 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14763,7 +14763,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -14796,7 +14795,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 071acbacedc..d438132764f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17824,7 +17824,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -17857,7 +17856,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0f87d46ec09..288624728f2 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18086,7 +18086,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -18119,7 +18118,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, -- 2.25.1
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=78090 Your paranoid android. === w1064v1809_2scr (32 bit report) === ddraw: ddraw1.c:11327: Test failed: Got unexpected color 0x00ffffff. ddraw1.c:11347: Test failed: Got unexpected color 0x00ffffff. === w1064v1809_he (32 bit report) === ddraw: ddraw1.c:1947: Test failed: Got unexpected color 0x000000ff. === w1064v1809_2scr (32 bit report) === ddraw: ddraw2.c:13486: Test failed: Expected 22 surfaces, got 20. === w8adm (32 bit report) === ddraw: ddraw7.c:3187: Test failed: Got unexpected hr 0x887601c2. === w1064v1809 (64 bit report) === ddraw: ddraw7.c:16416: Test failed: WM_KILLFOCUS was not received. ddraw7.c:16578: Test failed: Got unexpected hr 0x887600e1. ddraw7.c:16581: Test failed: Got unexpected hr 0x887600ff. 1224:ddraw7: unhandled exception c0000005 at 00000000004D09B0 === debiant (32 bit report) === ddraw: ddraw1.c:13768: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw1.c:13786: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw1.c:13793: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw2.c:14659: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw2.c:14677: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw2.c:14684: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw4.c:17720: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw4.c:17738: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw4.c:17745: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw7.c:17982: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw7.c:18000: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw7.c:18007: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw7.c:17982: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). === debiant (32 bit French report) === ddraw: ddraw1.c:13768: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw1.c:13786: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw1.c:13793: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw2.c:14659: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw2.c:14677: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw2.c:14684: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw4.c:17720: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1017,761). ddraw4.c:17720: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw4.c:17738: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw4.c:17745: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw7.c:17982: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw7.c:18000: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw7.c:18007: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw7.c:17982: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). === debiant (32 bit Japanese:Japan report) === ddraw: ddraw1.c:13768: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw1.c:13786: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw1.c:13793: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw1.c:13768: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw2.c:14659: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw2.c:14677: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw2.c:14684: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw2.c:14659: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw2.c:14677: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw2.c:14684: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw4.c:17720: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw4.c:17738: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw4.c:17745: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw7.c:17982: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw7.c:18000: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw7.c:18007: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). === debiant (32 bit Chinese:China report) === ddraw: ddraw1.c:13768: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw1.c:13786: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw1.c:13793: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw2.c:14659: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw2.c:14677: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw2.c:14684: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw4.c:17720: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw4.c:17738: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw4.c:17745: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw4.c:17720: Test failed: Expect window rect (0,0)-(1024,768), got (1031,26)-(2041,732). ddraw7.c:17982: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1017,761). ddraw7.c:18000: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw7.c:18007: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw7.c:17982: Test failed: Expect window rect (0,0)-(1024,768), got (1031,26)-(2041,732). === debiant (32 bit WoW report) === ddraw: ddraw1.c:13768: Test failed: Expect window rect (0,0)-(1024,768), got (-7,-26)-(1003,709). ddraw1.c:13768: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw1.c:13786: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw1.c:13793: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw2.c:14659: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw2.c:14677: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw2.c:14684: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw2.c:14659: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw2.c:14677: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw2.c:14684: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw4.c:17720: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw4.c:17738: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw4.c:17745: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw4.c:17720: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw4.c:17738: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw4.c:17745: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw7.c:17982: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw7.c:18000: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw7.c:18007: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw7.c:17982: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). === debiant (64 bit WoW report) === ddraw: ddraw1.c:13768: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,706). ddraw1.c:13786: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw1.c:13793: Test failed: Expect window rect (0,0)-(1024,768), got (0,1)-(1024,769). ddraw2.c:14659: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw2.c:14677: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw2.c:14684: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw4.c:17720: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw4.c:17738: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw4.c:17745: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw7.c:17982: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw7.c:18000: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw7.c:18007: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760).
participants (3)
-
Henri Verbeet -
Marvin -
Zhiyi Zhang