[PATCH 0/1] MR4959: mfplat/tests: Skip device manager test if d3d11 device can't be created.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4959

[PATCH 1/1] mfplat/tests: Skip device manager test if d3d11 device can't be created.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/mfplat/tests/mfplat.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index f8cf51cad3b..42d682be426 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -5690,6 +5690,16 @@ static void test_dxgi_device_manager(void)
         return;
     }
 
+    hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT,
+                           NULL, 0, D3D11_SDK_VERSION, &d3d11_dev, NULL, NULL);
+    if (FAILED(hr))
+    {
+        skip("Failed to create D3D11 device object.\n");
+        return;
+    }
+    ok(hr == S_OK, "D3D11CreateDevice failed: %#lx.\n", hr);
+    EXPECT_REF(d3d11_dev, 1);
+
     hr = pMFCreateDXGIDeviceManager(NULL, &manager);
     ok(hr == E_POINTER, "MFCreateDXGIDeviceManager should failed: %#lx.\n", hr);
 
@@ -5721,11 +5731,6 @@ static void test_dxgi_device_manager(void)
     hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, 0);
     ok(hr == E_HANDLE, "Unexpected hr %#lx.\n", hr);
 
-    hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT,
-                           NULL, 0, D3D11_SDK_VERSION, &d3d11_dev, NULL, NULL);
-    ok(hr == S_OK, "D3D11CreateDevice failed: %#lx.\n", hr);
-    EXPECT_REF(d3d11_dev, 1);
-
     hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d11_dev, token - 1);
     ok(hr == E_INVALIDARG, "IMFDXGIDeviceManager_ResetDevice should failed: %#lx.\n", hr);
     EXPECT_REF(d3d11_dev, 1);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4959

[PATCH 1/1] mfplat/tests: Skip device manager test if d3d11 device can't be created.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=142487

Your paranoid android.


=== w10pro64_ja (64 bit report) ===

mfplat:
mfplat.c:3821: Test failed: Unexpected return value 0x102.
mfplat.c:3166: Test failed: Failed to get event, hr 0xc00d3e85.
mfplat.c:3169: Test failed: Failed to get event, hr 0xc00d3e85.
mfplat.c:3172: Test failed: Failed to finalize GetEvent, hr 0xc00d3e85.
mfplat.c:3175: Test failed: Unexpected result, hr 0xc00d3e85.