[PATCH 0/2] MR10024: wined3d: Reset internal_format_set when using the backup DC.

[Elizabeth Figura (＠zfigura)]

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

[PATCH 1/2] wined3d: Clear backup_dc and backup_wnd when deleting them.

[Elizabeth Figura]

From: Elizabeth Figura <[e-mail]>

If we were using a backup DC and then perform a reset, we will clear the DC, but
not zero it, meaning that once 3D is initialized again, we may eventually end up
trying to use the same backup DC which has been deleted. Fix this by also
zeroing the DC pointer.
---
 dlls/wined3d/device.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index efa1632ec35..45f480d693c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1487,6 +1487,8 @@ void wined3d_device_gl_delete_opengl_contexts_cs(void *object)
 
         wined3d_release_dc(device_gl->backup_wnd, device_gl->backup_dc);
         DestroyWindow(device_gl->backup_wnd);
+        device_gl->backup_dc = NULL;
+        device_gl->backup_wnd = NULL;
     }
 }
 
-- 
GitLab


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

[PATCH 2/2] wined3d: Reset internal_format_set when using the backup DC.

[Zhiyi Zhang]

From: Zhiyi Zhang <[e-mail]>

internal_format_set is only relevant to the real DC, but it's checked before
setting the format on the backup DC as well. If the real DC stops being valid,
we need to reset the field to make sure we actually set the format on the backup
DC.
---
 dlls/d3d8/tests/device.c  | 11 ++---------
 dlls/d3d9/tests/device.c  | 13 ++++---------
 dlls/wined3d/context_gl.c |  1 +
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index e777ac0aba3..02383233cff 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -2094,11 +2094,7 @@ static void test_reset(void)
 
     hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
             window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device2);
-    if (FAILED(hr))
-    {
-        skip("Failed to create device, hr %#lx.\n", hr);
-        goto cleanup;
-    }
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
 
     hr = IDirect3DDevice8_TestCooperativeLevel(device2);
     ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#lx.\n", hr);
@@ -2113,14 +2109,11 @@ static void test_reset(void)
 
     hr = IDirect3DDevice8_Reset(device2, &d3dpp);
     ok(SUCCEEDED(hr), "Reset failed, hr %#lx.\n", hr);
-    if (FAILED(hr))
-        goto cleanup;
 
     hr = IDirect3DDevice8_GetDepthStencilSurface(device2, &surface);
     ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#lx.\n", hr);
     ok(!!surface, "Depth / stencil buffer should not be NULL.\n");
-    if (surface)
-        IDirect3DSurface8_Release(surface);
+    IDirect3DSurface8_Release(surface);
 
 cleanup:
     free(modes);
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index fd596de84c6..9614a5b0a01 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -2549,12 +2549,9 @@ static void test_reset(void)
     d3dpp.EnableAutoDepthStencil = FALSE;
     d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8;
 
-    if (FAILED(hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
-            hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device2)))
-    {
-        skip("Failed to create device, hr %#lx.\n", hr);
-        goto cleanup;
-    }
+    hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+            hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device2);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
 
     hr = IDirect3DDevice9_TestCooperativeLevel(device2);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -2569,12 +2566,10 @@ static void test_reset(void)
     hr = IDirect3DDevice9_Reset(device2, &d3dpp);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
 
-    if (FAILED(hr)) goto cleanup;
-
     hr = IDirect3DDevice9_GetDepthStencilSurface(device2, &surface);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     ok(surface != NULL, "Depth stencil should not be NULL\n");
-    if (surface) IDirect3DSurface9_Release(surface);
+    IDirect3DSurface9_Release(surface);
 
 cleanup:
     free(modes);
diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c
index fc480f5a440..730c6db94aa 100644
--- a/dlls/wined3d/context_gl.c
+++ b/dlls/wined3d/context_gl.c
@@ -1256,6 +1256,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context
         TRACE("Using backup DC %p.\n", context_gl->dc);
         context_gl->dc_is_private = TRUE;
         context_gl->dc_has_format = FALSE;
+        context_gl->internal_format_set = FALSE;
 
         if (!wined3d_context_gl_set_pixel_format(context_gl))
         {
-- 
GitLab

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

[PATCH 0/2] MR10024: wined3d: Reset internal_format_set when using the backup DC. - approved

[Zhiyi Zhang (＠zhiyi)]

This merge request was approved by Zhiyi Zhang.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10024

[PATCH 0/2] MR10024: wined3d: Reset internal_format_set when using the backup DC. - approved

[Elizabeth Figura (＠zfigura)]

This merge request was approved by Elizabeth Figura.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10024