[PATCH v2 2/2] d3d9: Report d3d9 adapter ordinal in d3d9_device_GetCreationParameters().

[Zhiyi Zhang]

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/d3d9/device.c       |  1 +
 dlls/d3d9/tests/device.c | 64 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 4ac38c0e89..61cb505d77 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -778,6 +778,7 @@ static HRESULT WINAPI d3d9_device_GetCreationParameters(IDirect3DDevice9Ex *ifac
             (struct wined3d_device_creation_parameters *)parameters);
     wined3d_mutex_unlock();
 
+    parameters->AdapterOrdinal = device->adapter_ordinal;
     return D3D_OK;
 }
 
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index afbd13a398..b4f378755a 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -13609,6 +13609,69 @@ static void test_shader_validator(void)
     todo_wine ok(!refcount, "Validator has %u references left.\n", refcount);
 }
 
+static void test_creation_parameters(void)
+{
+    D3DDEVICE_CREATION_PARAMETERS creation_params;
+    D3DPRESENT_PARAMETERS present_params = {0};
+    unsigned int adapter_idx, adapter_count;
+    IDirect3DDevice9 *device;
+    DWORD behavior_flags;
+    IDirect3D9 *d3d;
+    HWND window;
+    HRESULT hr;
+
+    window = create_window();
+    ok(!!window, "Failed to create a window.\n");
+    d3d = Direct3DCreate9(D3D_SDK_VERSION);
+    ok(!!d3d, "Failed to create a D3D object.\n");
+
+    present_params.BackBufferWidth = 640;
+    present_params.BackBufferHeight = 480;
+    present_params.BackBufferFormat = D3DFMT_A8R8G8B8;
+    present_params.SwapEffect = D3DSWAPEFFECT_DISCARD;
+    present_params.hDeviceWindow = window;
+    present_params.Windowed = TRUE;
+    present_params.EnableAutoDepthStencil = TRUE;
+    present_params.AutoDepthStencilFormat = D3DFMT_D24S8;
+
+    adapter_count = IDirect3D9_GetAdapterCount(d3d);
+    for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx)
+    {
+        behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING;
+        if (FAILED(IDirect3D9_CreateDevice(d3d, adapter_idx, D3DDEVTYPE_HAL, window,
+                behavior_flags, &present_params, &device)))
+        {
+            behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING;
+            if (FAILED(hr = IDirect3D9_CreateDevice(d3d, adapter_idx, D3DDEVTYPE_HAL, window,
+                    behavior_flags, &present_params, &device)))
+            {
+                skip("Adapter %u: Failed to create a D3D device, hr %#x.\n", adapter_idx, hr);
+                break;
+            }
+        }
+
+        memset(&creation_params, 0, sizeof(creation_params));
+        hr = IDirect3DDevice9_GetCreationParameters(device, &creation_params);
+        ok(hr == D3D_OK, "Adapter %u: GetCreationParameters failed, hr %#x.\n", adapter_idx, hr);
+        ok(creation_params.AdapterOrdinal == adapter_idx,
+                "Adapter %u: Got unexpected adapter ordinal %u.\n", adapter_idx,
+                creation_params.AdapterOrdinal);
+        ok(creation_params.DeviceType == D3DDEVTYPE_HAL,
+                "Adapter %u: Expect device type %#x, got %#x.\n", adapter_idx, D3DDEVTYPE_HAL,
+                creation_params.DeviceType);
+        ok(creation_params.hFocusWindow == window, "Adapter %u: Expect focus window %p, got %p.\n",
+                adapter_idx, window, creation_params.hFocusWindow);
+        ok(creation_params.BehaviorFlags == behavior_flags,
+                "Adapter %u: Expect behavior flags %#x, got %#x.\n", adapter_idx, behavior_flags,
+                creation_params.BehaviorFlags);
+
+        IDirect3DDevice9_Release(device);
+    }
+
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
 START_TEST(device)
 {
     HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll");
@@ -13741,6 +13804,7 @@ START_TEST(device)
     test_get_display_mode();
     test_multi_adapter();
     test_shader_validator();
+    test_creation_parameters();
 
     UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL));
 }
-- 
2.20.1