Zhiyi Zhang : ddraw: Report correct frequency in GetDisplayMode().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5ec9505a5ca50f98c1ce5110909c0c1cca340093
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5ec9505a5ca50f98c1ce51109...

Author: Zhiyi Zhang <zzhang(a)codeweavers.com>
Date:   Fri Sep  4 16:56:41 2020 +0800

ddraw: Report correct frequency in GetDisplayMode().

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 d7545e5c82..c3c335d978 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 6f0948bbab..2fac4d4b0b 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 abcd2010b2..6b58479853 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 071acbaced..d438132764 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 0f87d46ec0..288624728f 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,