[PATCH 0/2] MR4429: evr/presenter: Handle failure to initialize D3D9.

[Nikolay Sivov (＠nsivov)]

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

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

[PATCH 1/2] evr/presenter: Handle failure to initialize D3D9.

[Nikolay Sivov]

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

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/evr/presenter.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c
index 2dc01608caf..a7ddbb0793f 100644
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -2120,6 +2120,11 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter)
     HRESULT hr;
 
     d3d = Direct3DCreate9(D3D_SDK_VERSION);
+    if (!d3d)
+    {
+        WARN("Failed to initialize d3d9.\n");
+        return E_FAIL;
+    }
 
     present_params.BackBufferCount = 1;
     present_params.SwapEffect = D3DSWAPEFFECT_COPY;
-- 
GitLab


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

[PATCH 2/2] evr/tests: Skip tests if D3D9 is unusable.

[Nikolay Sivov]

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

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/evr/tests/evr.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c
index 8842a858b83..25fb1978443 100644
--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -3642,8 +3642,17 @@ done:
 START_TEST(evr)
 {
     IMFVideoPresenter *presenter;
+    IDirect3D9 *d3d9;
     HRESULT hr;
 
+    d3d9 = Direct3DCreate9(D3D_SDK_VERSION);
+    if (!d3d9)
+    {
+        skip("Failed to initialize D3D9. Skipping EVR tests.\n");
+        return;
+    }
+    IDirect3D9_Release(d3d9);
+
     CoInitialize(NULL);
 
     if (FAILED(hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter)))
-- 
GitLab

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

[PATCH 2/2] evr/tests: Skip tests if D3D9 is unusable.

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

Your paranoid android.


=== debian11b (64 bit WoW report) ===

ws2_32:
protocol.c:2476: Test succeeded inside todo block: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 0: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 1: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 2: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 3: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 4: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 5: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 12: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 13: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 14: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 15: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 16: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 28: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 29: IPv6 address is returned.