system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 20:06:18 +00:00
Code Issues Projects Releases Wiki Activity

ddraw: Report correct frequency in GetDisplayMode().

Browse Source 
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2020-09-04 16:56:41 +08:00 committed by Alexandre Julliard
parent d4fdb1f62c
commit 5ec9505a5c
5 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ddraw/ddraw.c
View File

@ -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;

1
dlls/ddraw/tests/ddraw1.c
View File

@ -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),

2
dlls/ddraw/tests/ddraw2.c
View File

@ -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,

2
dlls/ddraw/tests/ddraw4.c
View File

@ -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,

2
dlls/ddraw/tests/ddraw7.c
View File

@ -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,