[PATCH 0/1] MR7207: d3d9: Fix IUnknown delegation in IDirect3DDevice9On12.

[PATCH 1/1] d3d9: Fix IUnknown delegation in IDirect3DDevice9On12.

[Elizabeth Figura]

From: Elizabeth Figura

Fixes: a39264165fada18415c02a9d7cc95a4e4684d3f9
---
 dlls/d3d9/device.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 65e7001147e..5f59d10079d 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -593,19 +593,27 @@ static void device_reset_viewport_state(struct d3d9_device *device)
     wined3d_stateblock_set_scissor_rect(device->state, &rect);
 }

+static struct d3d9_device *impl_from_IDirect3DDevice9On12(IDirect3DDevice9On12 *iface)
+{
+    return CONTAINING_RECORD(iface, struct d3d9_device, IDirect3DDevice9On12_iface);
+}
+
 static HRESULT WINAPI d3d9on12_QueryInterface(IDirect3DDevice9On12 *iface, REFIID iid, void **out)
 {
-    return IDirect3DDevice9Ex_QueryInterface(iface, iid, out);
+    struct d3d9_device *device = impl_from_IDirect3DDevice9On12(iface);
+    return IDirect3DDevice9Ex_QueryInterface(&device->IDirect3DDevice9Ex_iface, iid, out);
 }

static ULONG WINAPI d3d9on12_AddRef(IDirect3DDevice9On12 *iface)
 {
-    return IDirect3DDevice9Ex_AddRef(iface);
+    struct d3d9_device *device = impl_from_IDirect3DDevice9On12(iface);
+    return IDirect3DDevice9Ex_AddRef(&device->IDirect3DDevice9Ex_iface);
 }

static ULONG WINAPI d3d9on12_Release(IDirect3DDevice9On12 *iface)
 {
-    return IDirect3DDevice9Ex_Release(iface);
+    struct d3d9_device *device = impl_from_IDirect3DDevice9On12(iface);
+    return IDirect3DDevice9Ex_Release(&device->IDirect3DDevice9Ex_iface);
 }

static HRESULT WINAPI d3d9on12_GetD3D12Device(IDirect3DDevice9On12 *iface, REFIID iid, void **out)

[PATCH 1/1] d3d9: Fix IUnknown delegation in IDirect3DDevice9On12.

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

Your paranoid android.

=== debian11 (32 bit report) ===

d3d9:
device.c:15248: Test failed: Got hr 0x80004005.

Report validation errors:
d3d9:device crashed (c0000005)

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

d3d9:
device.c:15248: Test failed: Got hr 0x80004005.

kernel32:
comm.c:1586: Test failed: Unexpected time 1001, expected around 500

Report validation errors:
d3d9:device crashed (c0000005)

[PATCH 0/1] MR7207: d3d9: Fix IUnknown delegation in IDirect3DDevice9On12. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.