[PATCH v2 0/1] MR6847: evr: Use D3DCREATE_MULTITHREADED device creation flag.

[Rémi Bernon]

Fixes a random crash in Disagea 5 intro video when D3D9 buffers are locked and Presented concurrently.

--
  v2: evr: Use D3DCREATE_MULTITHREADED device creation flag.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6847

[PATCH v2 1/1] evr: Use D3DCREATE_MULTITHREADED device creation flag.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/evr/presenter.c | 2 +-
 dlls/evr/tests/evr.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c
index f1f1f0f8112..7ad59ccc958 100644
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -2136,7 +2136,7 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter)
     present_params.Flags = D3DPRESENTFLAG_VIDEO;
     present_params.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
     hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, GetDesktopWindow(),
-            D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_params, &device);
+            D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED, &present_params, &device);
 
     IDirect3D9_Release(d3d);
 
diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c
index 4674221b86d..040193c6363 100644
--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -2476,6 +2476,7 @@ static void test_presenter_video_window(void)
     hr = IDirect3DDevice9_GetCreationParameters(d3d_device, &device_params);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(device_params.hFocusWindow == GetDesktopWindow(), "Unexpected window %p.\n", device_params.hFocusWindow);
+    ok(device_params.BehaviorFlags & D3DCREATE_MULTITHREADED, "Unexpected flags %#lx.\n", device_params.BehaviorFlags);
 
     hr = IDirect3DDevice9_GetSwapChain(d3d_device, 0, &swapchain);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-- 
GitLab

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

[Rémi Bernon]

v2: Add a test that the flag is returned from GetCreationParameters.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6847#note_88036

[PATCH v2 0/1] MR6847: evr: Use D3DCREATE_MULTITHREADED device creation flag. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6847