Skip to content

W
wine-winehq
Commit 2814e5ce authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

d3d11: Stop advertising the ID3D10Device interface on devices created by d3d11.

The UPlay overlay tries to detect the device D3D version by querying this interface first. On d3d11 games, and as we are incorrectly advertising ID3D10Device, it decides to use d3d10 hooks and crashes the game after ~10 minutes. This is happening with "Splinter Cell: Blacklist" for instance. Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a5a1bcbd
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 10 deletions
dlls/d3d11/d3d11_main.c
View file @ 2814e5ce
......@@ -107,6 +107,7 @@ HRESULT WINAPI D3D11CoreRegisterLayers(void)
HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags,
const D3D_FEATURE_LEVEL *feature_levels, UINT levels, ID3D11Device **device)
{
struct d3d_device *d3d_device;
IUnknown *dxgi_device;
HMODULE d3d11;
HRESULT hr;
......@@ -130,6 +131,13 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte
return E_FAIL;
}
if (!(d3d_device = impl_from_ID3D11Device(*device)))
{
ERR("Failed to retrieve device impl, returning E_FAIL.\n");
return E_FAIL;
}
d3d_device->d3d11_only = TRUE;
return S_OK;
}
......
dlls/d3d11/d3d11_private.h
View file @ 2814e5ce
......@@ -537,6 +537,7 @@ struct d3d_device
LONG refcount;
D3D_FEATURE_LEVEL feature_level;
BOOL d3d11_only;
struct d3d11_immediate_context immediate_context;
......@@ -552,6 +553,11 @@ struct d3d_device
UINT stencil_ref;
};
static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface)
{
return CONTAINING_RECORD((ID3D11Device2 *)iface, struct d3d_device, ID3D11Device2_iface);
}
static inline struct d3d_device *impl_from_ID3D11Device2(ID3D11Device2 *iface)
{
return CONTAINING_RECORD(iface, struct d3d_device, ID3D11Device2_iface);
......
dlls/d3d11/device.c
View file @ 2814e5ce
......@@ -3887,8 +3887,9 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface
{
*out = &device->ID3D11Device2_iface;
}
else if (IsEqualGUID(riid, &IID_ID3D10Device1)
|| IsEqualGUID(riid, &IID_ID3D10Device))
else if (!device->d3d11_only
&& (IsEqualGUID(riid, &IID_ID3D10Device1)
|| IsEqualGUID(riid, &IID_ID3D10Device)))
{
*out = &device->ID3D10Device1_iface;
}
......@@ -6241,6 +6242,7 @@ void d3d_device_init(struct d3d_device *device, void *outer_unknown)
device->refcount = 1;
/* COM aggregation always takes place */
device->outer_unk = outer_unknown;
device->d3d11_only = FALSE;
d3d11_immediate_context_init(&device->immediate_context, device);
ID3D11DeviceContext1_Release(&device->immediate_context.ID3D11DeviceContext1_iface);
......
dlls/d3d11/tests/d3d11.c
View file @ 2814e5ce
......@@ -2110,8 +2110,8 @@ static void test_device_interfaces(const D3D_FEATURE_LEVEL feature_level)
check_interface(device, &IID_IDXGIDevice, TRUE, FALSE);
check_interface(device, &IID_IDXGIDevice1, TRUE, FALSE);
check_interface(device, &IID_ID3D10Multithread, TRUE, TRUE); /* Not available on all Windows versions. */
todo_wine check_interface(device, &IID_ID3D10Device, FALSE, FALSE);
todo_wine check_interface(device, &IID_ID3D10Device1, FALSE, FALSE);
check_interface(device, &IID_ID3D10Device, FALSE, FALSE);
check_interface(device, &IID_ID3D10Device1, FALSE, FALSE);
check_interface(device, &IID_ID3D11InfoQueue, enable_debug_layer, FALSE);
hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device);
......@@ -2516,7 +2516,7 @@ static void test_texture1d_interfaces(void)
d3d10_device = (ID3D10Device *)0xdeadbeef;
ID3D10Texture1D_GetDevice(d3d10_texture, &d3d10_device);
todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device);
ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device);
if (d3d10_device) ID3D10Device_Release(d3d10_device);
ID3D10Texture1D_Release(d3d10_texture);
......@@ -2913,7 +2913,7 @@ static void test_texture2d_interfaces(void)
d3d10_device = (ID3D10Device *)0xdeadbeef;
ID3D10Texture2D_GetDevice(d3d10_texture, &d3d10_device);
todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device);
ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device);
if (d3d10_device) ID3D10Device_Release(d3d10_device);
ID3D10Texture2D_Release(d3d10_texture);
......@@ -3172,7 +3172,7 @@ static void test_texture3d_interfaces(void)
d3d10_device = (ID3D10Device *)0xdeadbeef;
ID3D10Texture3D_GetDevice(d3d10_texture, &d3d10_device);
todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device);
ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device);
if (d3d10_device) ID3D10Device_Release(d3d10_device);
ID3D10Texture3D_Release(d3d10_texture);
......@@ -3461,7 +3461,7 @@ static void test_create_buffer(void)
d3d10_device = (ID3D10Device *)0xdeadbeef;
ID3D10Buffer_GetDevice(d3d10_buffer, &d3d10_device);
todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device);
ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device);
if (d3d10_device) ID3D10Device_Release(d3d10_device);
ID3D10Buffer_Release(d3d10_buffer);
......@@ -6621,8 +6621,8 @@ static void test_device_context_state(void)
return;
}
todo_wine check_interface(device, &IID_ID3D10Device, FALSE, FALSE);
todo_wine check_interface(device, &IID_ID3D10Device1, FALSE, FALSE);
check_interface(device, &IID_ID3D10Device, FALSE, FALSE);
check_interface(device, &IID_ID3D10Device1, FALSE, FALSE);
feature_level = ID3D11Device1_GetFeatureLevel(device);
ID3D11Device1_GetImmediateContext1(device, &context);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment