[PATCH 5/5] wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode().

[Zhiyi Zhang]

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/wined3d/swapchain.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index c094464412d..cbb6559983f 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -1379,19 +1379,19 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha
 }
 
 static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain_state *state,
-        struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode)
+        struct wined3d *wined3d, struct wined3d_output *output, struct wined3d_display_mode *mode)
 {
     HRESULT hr;
 
     if (state->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE)
     {
-        if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter_idx, mode)))
+        if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, 0, mode)))
         {
             WARN("Failed to find closest matching mode, hr %#x.\n", hr);
         }
     }
 
-    if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, adapter_idx, mode)))
+    if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, 0, mode)))
     {
         WARN("Failed to set display mode, hr %#x.\n", hr);
         return WINED3DERR_INVALIDCALL;
@@ -1429,7 +1429,8 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta
     else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH)
     {
         actual_mode = *mode;
-        if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode)))
+        if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output,
+                &actual_mode)))
         {
             wined3d_mutex_unlock();
             return hr;
@@ -1598,7 +1599,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st
             }
         }
 
-        if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode)))
+        if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output,
+                &actual_mode)))
             return hr;
     }
     else
-- 
2.20.1

[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=66298

Your paranoid android.


=== debian10 (32 bit report) ===

d3d9:
device.c:4052: Test failed: Failed to reset device, hr 0x80004005.
device.c:4064: Test failed: Expected message 0x7e for window 0, but didn't receive it, i=1.
device.c:4117: Test failed: Failed to reset device, hr 0x80004005, i=1.

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

d3d9:
device.c:4052: Test failed: Failed to reset device, hr 0x80004005.
device.c:4064: Test failed: Expected message 0x7e for window 0, but didn't receive it, i=1.
device.c:4117: Test failed: Failed to reset device, hr 0x80004005, i=1.

=== debian10 (32 bit WoW report) ===

d3d9:
device.c:4052: Test failed: Failed to reset device, hr 0x80004005.
device.c:4064: Test failed: Expected message 0x7e for window 0, but didn't receive it, i=1.
device.c:4117: Test failed: Failed to reset device, hr 0x80004005, i=1.
device.c:4243: Test failed: Failed to reset device, hr 0x80004005.
device.c:4253: Test failed: Expected message 0x7e for window 0x1, but didn't receive it, i=1.
device.c:4272: Test failed: Expected message 0x7e for window 0x1, but didn't receive it, i=1.

=== debian10 (64 bit WoW report) ===

d3d9:
device.c:4052: Test failed: Failed to reset device, hr 0x80004005.
device.c:4064: Test failed: Expected message 0x7e for window 0, but didn't receive it, i=1.
device.c:4117: Test failed: Failed to reset device, hr 0x80004005, i=1.