Stefan Dösinger : d3d9/tests: Windows 10 15.07 doesn' t detect external mode changes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: eb7c1fd62eaac3847c86c855806f9d78c1c9a3a5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eb7c1fd62eaac3847c86c85580...

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Thu Oct 19 10:09:22 2017 +0200

d3d9/tests: Windows 10 15.07 doesn't detect external mode changes.

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d9/tests/d3d9ex.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c
index 59a1daf..9dd3553 100644
--- a/dlls/d3d9/tests/d3d9ex.c
+++ b/dlls/d3d9/tests/d3d9ex.c
@@ -2843,11 +2843,13 @@ static void test_wndproc(void)
         change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN);
         ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x, i=%u.\n", change_ret, i);
 
-        /* Native needs a present call to pick up the mode change. */
+        /* Native needs a present call to pick up the mode change. Windows 10 15.07 never picks up the mode change
+         * in these calls and returns S_OK. This is a regression from Windows 8 and has been fixed in later Win10
+         * builds. */
         hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL);
-        todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x, i=%u.\n", hr, i);
+        todo_wine ok(hr == S_PRESENT_MODE_CHANGED || broken(hr == S_OK), "Got unexpected hr %#x, i=%u.\n", hr, i);
         hr = IDirect3DDevice9Ex_CheckDeviceState(device, device_window);
-        todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x, i=%u.\n", hr, i);
+        todo_wine ok(hr == S_PRESENT_MODE_CHANGED || broken(hr == S_OK), "Got unexpected hr %#x, i=%u.\n", hr, i);
 
         expect_messages = tests[i].focus_loss_messages;
         /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or