Zhiyi Zhang : wined3d: Add an ordinal to struct wined3d_output.

[Alexandre Julliard]

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

Author: Zhiyi Zhang 
Date:   Thu Mar 19 17:07:46 2020 +0800

wined3d: Add an ordinal to struct wined3d_output.

Signed-off-by: Zhiyi Zhang 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/directx.c         | 9 ++++++---
 dlls/wined3d/wined3d_private.h | 1 +
 include/wine/wined3d.h         | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 9b99428134..4f3c9803c4 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -116,8 +116,8 @@ static void wined3d_output_cleanup(const struct wined3d_output *output)
     D3DKMTCloseAdapter(&close_adapter_desc);
 }

-static HRESULT wined3d_output_init(struct wined3d_output *output, struct wined3d_adapter *adapter,
-        const WCHAR *device_name)
+static HRESULT wined3d_output_init(struct wined3d_output *output, unsigned int ordinal,
+        struct wined3d_adapter *adapter, const WCHAR *device_name)
 {
     D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc;
     D3DKMT_CREATEDEVICE create_device_desc = {{0}};
@@ -137,6 +137,7 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, struct wined3d
         return E_FAIL;
     }

+    output->ordinal = ordinal;
     lstrcpyW(output->device_name, device_name);
     output->adapter = adapter;
     output->kmt_adapter = open_adapter_desc.hAdapter;
@@ -933,6 +934,7 @@ HRESULT CDECL wined3d_output_get_desc(const struct wined3d_output *output,
     if (FAILED(hr = wined3d_output_get_display_mode(output, &mode, &rotation)))
         return hr;

+    desc->ordinal = output->ordinal;
     memcpy(desc->device_name, adapter->device_name, sizeof(desc->device_name));
     SetRect(&desc->desktop_rect, 0, 0, mode.width, mode.height);
     OffsetRect(&desc->desktop_rect, adapter->monitor_position.x, adapter->monitor_position.y);
@@ -2805,7 +2807,8 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal,
         return FALSE;
     }

-    if (FAILED(hr = wined3d_output_init(&adapter->outputs[0], adapter, display_device.DeviceName)))
+    if (FAILED(hr = wined3d_output_init(&adapter->outputs[0], 0, adapter,
+            display_device.DeviceName)))
     {
         ERR("Failed to initialise output, hr %#x.\n", hr);
         goto done;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index db806adf71..6e976fb0aa 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2901,6 +2901,7 @@ struct wined3d_adapter_ops

struct wined3d_output
 {
+    unsigned int ordinal;
     WCHAR device_name[CCHDEVICENAME];
     struct wined3d_adapter *adapter;
     enum wined3d_format_id screen_format;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 2c3f085623..e989fff089 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2138,6 +2138,7 @@ struct wined3d_view_desc

struct wined3d_output_desc
 {
+    unsigned int ordinal;
     WCHAR device_name[CCHDEVICENAME];
     RECT desktop_rect;
     BOOL attached_to_desktop;