April 2018 - Wine-Devel - list.winehq.org

Re: [PATCH 1/2] msi: Execute the custom action server with the correct bitness.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

April 30, 2018

[PATCH] comctl32/tooltip: Compare to special callback pointer value directly.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tooltips.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 54601017d6..1aa55d12e3 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -177,15 +177,6 @@ typedef struct static LRESULT CALLBACK TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef); - -static inline BOOL TOOLTIPS_IsCallbackString(LPCWSTR str, BOOL isW) -{ - if (isW) - return str == LPSTR_TEXTCALLBACKW; - else - return (LPCSTR)str == LPSTR_TEXTCALLBACKA; -} - static inline UINT_PTR TOOLTIPS_GetTitleIconIndex(HICON hIcon) { @@ -1091,7 +1082,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->lpszText = ti->lpszText; } else if (ti->lpszText) { - if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) { + if (ti->lpszText == LPSTR_TEXTCALLBACKW) { TRACE("add CALLBACK\n"); toolPtr->lpszText = LPSTR_TEXTCALLBACKW; } @@ -1674,7 +1665,7 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->lpszText = ti->lpszText; } else { - if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) + if (ti->lpszText == LPSTR_TEXTCALLBACKW) toolPtr->lpszText = LPSTR_TEXTCALLBACKW; else { if ( (toolPtr->lpszText) && @@ -1800,7 +1791,7 @@ TOOLTIPS_UpdateTipTextT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW toolPtr->lpszText = ti->lpszText; } else if (ti->lpszText) { - if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) + if (ti->lpszText == LPSTR_TEXTCALLBACKW) toolPtr->lpszText = LPSTR_TEXTCALLBACKW; else { if ( (toolPtr->lpszText) && -- 2.17.0

April 30, 2018

[PATCH 2/2] d3d11: Add ID3D11DeviceContext1 stub.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 633 +++++++++++++++++++++++-------------- 2 files changed, 396 insertions(+), 239 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 299319b0d3..b575f96656 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -516,7 +516,7 @@ struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) /* ID3D11DeviceContext - immediate context */ struct d3d11_immediate_context { - ID3D11DeviceContext ID3D11DeviceContext_iface; + ID3D11DeviceContext1 ID3D11DeviceContext1_iface; LONG refcount; struct wined3d_private_store private_store; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0b99222854..4032ab3bec 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -34,27 +34,28 @@ static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = /* ID3D11DeviceContext - immediate context methods */ -static inline struct d3d11_immediate_context *impl_from_ID3D11DeviceContext(ID3D11DeviceContext *iface) +static inline struct d3d11_immediate_context *impl_from_ID3D11DeviceContext1(ID3D11DeviceContext1 *iface) { - return CONTAINING_RECORD(iface, struct d3d11_immediate_context, ID3D11DeviceContext_iface); + return CONTAINING_RECORD(iface, struct d3d11_immediate_context, ID3D11DeviceContext1_iface); } -static inline struct d3d_device *device_from_immediate_ID3D11DeviceContext(ID3D11DeviceContext *iface) +static inline struct d3d_device *device_from_immediate_ID3D11DeviceContext1(ID3D11DeviceContext1 *iface) { - struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); return CONTAINING_RECORD(context, struct d3d_device, immediate_context); } -static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11DeviceContext *iface, +static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11DeviceContext1 *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_ID3D11DeviceContext) + if (IsEqualGUID(riid, &IID_ID3D11DeviceContext1) + || IsEqualGUID(riid, &IID_ID3D11DeviceContext) || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - ID3D11DeviceContext_AddRef(iface); + ID3D11DeviceContext1_AddRef(iface); *out = iface; return S_OK; } @@ -64,10 +65,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContext *iface) +static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContext1 *iface) { - struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); ULONG refcount = InterlockedIncrement(&context->refcount); TRACE("%p increasing refcount to %u.\n", context, refcount); @@ -80,10 +81,10 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContex return refcount; } -static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceContext *iface) +static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceContext1 *iface) { - struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); ULONG refcount = InterlockedDecrement(&context->refcount); TRACE("%p decreasing refcount to %u.\n", context, refcount); @@ -96,9 +97,9 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceConte return refcount; } -static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceContext *iface, ID3D11Device **device) +static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceContext1 *iface, ID3D11Device **device) { - struct d3d_device *device_object = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device_object = device_from_immediate_ID3D11DeviceContext1(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -106,40 +107,40 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceCont ID3D11Device_AddRef(*device); } -static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetPrivateData(ID3D11DeviceContext *iface, REFGUID guid, +static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetPrivateData(ID3D11DeviceContext1 *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); return d3d_get_private_data(&context->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateData(ID3D11DeviceContext *iface, REFGUID guid, +static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateData(ID3D11DeviceContext1 *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); return d3d_set_private_data(&context->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateDataInterface(ID3D11DeviceContext *iface, +static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateDataInterface(ID3D11DeviceContext1 *iface, REFGUID guid, const IUnknown *data) { - struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); return d3d_set_private_data_interface(&context->private_store, guid, data); } -static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -156,10 +157,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", @@ -176,10 +177,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceContext1 *iface, ID3D11PixelShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_pixel_shader *ps = unsafe_impl_from_ID3D11PixelShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -193,10 +194,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceCo wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -213,10 +214,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceContext1 *iface, ID3D11VertexShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_vertex_shader *vs = unsafe_impl_from_ID3D11VertexShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -230,10 +231,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceCo wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceContext1 *iface, UINT index_count, UINT start_index_location, INT base_vertex_location) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n", iface, index_count, start_index_location, base_vertex_location); @@ -244,10 +245,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceCo wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext1 *iface, UINT vertex_count, UINT start_vertex_location) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); TRACE("iface %p, vertex_count %u, start_vertex_location %u.\n", iface, vertex_count, start_vertex_location); @@ -257,7 +258,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext * wined3d_mutex_unlock(); } -static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext *iface, ID3D11Resource *resource, +static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext1 *iface, ID3D11Resource *resource, UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource) { struct wined3d_resource *wined3d_resource; @@ -284,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext return hr; } -static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext *iface, ID3D11Resource *resource, +static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext1 *iface, ID3D11Resource *resource, UINT subresource_idx) { struct wined3d_resource *wined3d_resource; @@ -298,10 +299,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -318,10 +319,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11DeviceContext1 *iface, ID3D11InputLayout *input_layout) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_input_layout *layout = unsafe_impl_from_ID3D11InputLayout(input_layout); TRACE("iface %p, input_layout %p.\n", iface, input_layout); @@ -331,10 +332,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11Dev wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *strides, const UINT *offsets) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n", @@ -351,10 +352,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11D wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_IASetIndexBuffer(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_IASetIndexBuffer(ID3D11DeviceContext1 *iface, ID3D11Buffer *buffer, DXGI_FORMAT format, UINT offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_buffer *buffer_impl = unsafe_impl_from_ID3D11Buffer(buffer); TRACE("iface %p, buffer %p, format %s, offset %u.\n", @@ -367,11 +368,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetIndexBuffer(ID3D11Dev wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D11DeviceContext1 *iface, UINT instance_index_count, UINT instance_count, UINT start_index_location, INT base_vertex_location, UINT start_instance_location) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); TRACE("iface %p, instance_index_count %u, instance_count %u, start_index_location %u, " "base_vertex_location %d, start_instance_location %u.\n", @@ -385,10 +386,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11DeviceContext1 *iface, UINT instance_vertex_count, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); TRACE("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, " "start_instance_location %u.\n", @@ -401,10 +402,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -421,10 +422,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceContext1 *iface, ID3D11GeometryShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_geometry_shader *gs = unsafe_impl_from_ID3D11GeometryShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -438,10 +439,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceCo wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_IASetPrimitiveTopology(ID3D11DeviceContext1 *iface, D3D11_PRIMITIVE_TOPOLOGY topology) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); enum wined3d_primitive_type primitive_type; unsigned int patch_vertex_count; @@ -454,10 +455,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetPrimitiveTopology(ID3 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -473,10 +474,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -493,7 +494,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_Begin(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_Begin(ID3D11DeviceContext1 *iface, ID3D11Asynchronous *asynchronous) { struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); @@ -507,7 +508,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Begin(ID3D11DeviceContext wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_End(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_End(ID3D11DeviceContext1 *iface, ID3D11Asynchronous *asynchronous) { struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); @@ -521,7 +522,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_End(ID3D11DeviceContext *i wined3d_mutex_unlock(); } -static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceContext *iface, +static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceContext1 *iface, ID3D11Asynchronous *asynchronous, void *data, UINT data_size, UINT data_flags) { struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); @@ -553,10 +554,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceCon return hr; } -static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11DeviceContext1 *iface, ID3D11Predicate *predicate, BOOL value) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_query *query; TRACE("iface %p, predicate %p, value %#x.\n", iface, predicate, value); @@ -568,10 +569,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11Devic wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -587,10 +588,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -607,11 +608,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargets(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargets(ID3D11DeviceContext1 *iface, UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views, ID3D11DepthStencilView *depth_stencil_view) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_depthstencil_view *dsv; unsigned int i; @@ -635,12 +636,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargets(ID3D11D } static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnorderedAccessViews( - ID3D11DeviceContext *iface, UINT render_target_view_count, + ID3D11DeviceContext1 *iface, UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views, ID3D11DepthStencilView *depth_stencil_view, UINT unordered_access_view_start_slot, UINT unordered_access_view_count, ID3D11UnorderedAccessView *const *unordered_access_views, const UINT *initial_counts) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " @@ -681,10 +682,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord } } -static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11DeviceContext1 *iface, ID3D11BlendState *blend_state, const float blend_factor[4], UINT sample_mask) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct d3d_blend_state *blend_state_impl; const D3D11_BLEND_DESC *desc; @@ -756,10 +757,10 @@ static void set_default_depth_stencil_state(struct wined3d_device *wined3d_devic wined3d_device_set_render_state(wined3d_device, WINED3D_RS_STENCILENABLE, FALSE); } -static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3D11DeviceContext1 *iface, ID3D11DepthStencilState *depth_stencil_state, UINT stencil_ref) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); const D3D11_DEPTH_STENCILOP_DESC *front, *back; const D3D11_DEPTH_STENCIL_DESC *desc; @@ -818,10 +819,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count, +static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceContext1 *iface, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *offsets) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int count, i; TRACE("iface %p, buffer_count %u, buffers %p, offsets %p.\n", iface, buffer_count, buffers, offsets); @@ -842,15 +843,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceC wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DrawAuto(ID3D11DeviceContext *iface) +static void STDMETHODCALLTYPE d3d11_immediate_context_DrawAuto(ID3D11DeviceContext1 *iface) { FIXME("iface %p stub!\n", iface); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndirect(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndirect(ID3D11DeviceContext1 *iface, ID3D11Buffer *buffer, UINT offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_buffer *d3d_buffer; TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); @@ -863,10 +864,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndire wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D11DeviceContext1 *iface, ID3D11Buffer *buffer, UINT offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_buffer *d3d_buffer; TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); @@ -879,10 +880,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceContext1 *iface, UINT thread_group_count_x, UINT thread_group_count_y, UINT thread_group_count_z) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); TRACE("iface %p, thread_group_count_x %u, thread_group_count_y %u, thread_group_count_z %u.\n", iface, thread_group_count_x, thread_group_count_y, thread_group_count_z); @@ -893,10 +894,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceConte wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DispatchIndirect(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DispatchIndirect(ID3D11DeviceContext1 *iface, ID3D11Buffer *buffer, UINT offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_buffer *buffer_impl; TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); @@ -909,10 +910,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DispatchIndirect(ID3D11Dev wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceContext1 *iface, ID3D11RasterizerState *rasterizer_state) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_rasterizer_state *rasterizer_state_impl; const D3D11_RASTERIZER_DESC *desc; union @@ -957,10 +958,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11DeviceContext1 *iface, UINT viewport_count, const D3D11_VIEWPORT *viewports) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_viewport wined3d_vp[WINED3D_MAX_VIEWPORTS]; unsigned int i; @@ -984,10 +985,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11DeviceContext1 *iface, UINT rect_count, const D3D11_RECT *rects) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); @@ -999,11 +1000,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D11DeviceContext1 *iface, ID3D11Resource *dst_resource, UINT dst_subresource_idx, UINT dst_x, UINT dst_y, UINT dst_z, ID3D11Resource *src_resource, UINT src_subresource_idx, const D3D11_BOX *src_box) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; struct wined3d_box wined3d_src_box; @@ -1024,10 +1025,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CopyResource(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CopyResource(ID3D11DeviceContext1 *iface, ID3D11Resource *dst_resource, ID3D11Resource *src_resource) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; TRACE("iface %p, dst_resource %p, src_resource %p.\n", iface, dst_resource, src_resource); @@ -1039,11 +1040,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopyResource(ID3D11DeviceC wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11DeviceContext1 *iface, ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, UINT row_pitch, UINT depth_pitch) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_resource; struct wined3d_box wined3d_box; @@ -1060,10 +1061,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11DeviceContext1 *iface, ID3D11Buffer *dst_buffer, UINT dst_offset, ID3D11UnorderedAccessView *src_view) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_unordered_access_view *uav; struct d3d_buffer *buffer_impl; @@ -1079,10 +1080,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11D wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D11DeviceContext1 *iface, ID3D11RenderTargetView *render_target_view, const float color_rgba[4]) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_rendertarget_view *view = unsafe_impl_from_ID3D11RenderTargetView(render_target_view); const struct wined3d_color color = {color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]}; HRESULT hr; @@ -1100,10 +1101,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUint(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUint(ID3D11DeviceContext1 *iface, ID3D11UnorderedAccessView *unordered_access_view, const UINT values[4]) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_unordered_access_view *view; TRACE("iface %p, unordered_access_view %p, values {%u, %u, %u, %u}.\n", @@ -1116,17 +1117,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUi wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewFloat(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewFloat(ID3D11DeviceContext1 *iface, ID3D11UnorderedAccessView *unordered_access_view, const float values[4]) { FIXME("iface %p, unordered_access_view %p, values %s stub!\n", iface, unordered_access_view, debug_float4(values)); } -static void STDMETHODCALLTYPE d3d11_immediate_context_ClearDepthStencilView(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_ClearDepthStencilView(ID3D11DeviceContext1 *iface, ID3D11DepthStencilView *depth_stencil_view, UINT flags, FLOAT depth, UINT8 stencil) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_depthstencil_view *view = unsafe_impl_from_ID3D11DepthStencilView(depth_stencil_view); DWORD wined3d_flags; HRESULT hr; @@ -1146,7 +1147,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearDepthStencilView(ID3D wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_GenerateMips(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_GenerateMips(ID3D11DeviceContext1 *iface, ID3D11ShaderResourceView *view) { struct d3d_shader_resource_view *srv = unsafe_impl_from_ID3D11ShaderResourceView(view); @@ -1158,13 +1159,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GenerateMips(ID3D11DeviceC wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_SetResourceMinLOD(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_SetResourceMinLOD(ID3D11DeviceContext1 *iface, ID3D11Resource *resource, FLOAT min_lod) { FIXME("iface %p, resource %p, min_lod %f stub!\n", iface, resource, min_lod); } -static FLOAT STDMETHODCALLTYPE d3d11_immediate_context_GetResourceMinLOD(ID3D11DeviceContext *iface, +static FLOAT STDMETHODCALLTYPE d3d11_immediate_context_GetResourceMinLOD(ID3D11DeviceContext1 *iface, ID3D11Resource *resource) { FIXME("iface %p, resource %p stub!\n", iface, resource); @@ -1172,12 +1173,12 @@ static FLOAT STDMETHODCALLTYPE d3d11_immediate_context_GetResourceMinLOD(ID3D11D return 0.0f; } -static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11DeviceContext1 *iface, ID3D11Resource *dst_resource, UINT dst_subresource_idx, ID3D11Resource *src_resource, UINT src_subresource_idx, DXGI_FORMAT format) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; enum wined3d_format_id wined3d_format; @@ -1196,16 +1197,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext1 *iface, ID3D11CommandList *command_list, BOOL restore_state) { FIXME("iface %p, command_list %p, restore_state %#x stub!\n", iface, command_list, restore_state); } -static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", @@ -1222,10 +1223,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceContext1 *iface, ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_hull_shader *hs = unsafe_impl_from_ID3D11HullShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -1239,10 +1240,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceCo wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -1259,10 +1260,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -1279,10 +1280,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", @@ -1299,10 +1300,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceContext1 *iface, ID3D11DomainShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_domain_shader *ds = unsafe_impl_from_ID3D11DomainShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -1316,10 +1317,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceCo wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -1336,10 +1337,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -1356,10 +1357,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", @@ -1376,10 +1377,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11UnorderedAccessView *const *views, const UINT *initial_counts) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p, initial_counts %p.\n", @@ -1396,10 +1397,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews( wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceContext1 *iface, ID3D11ComputeShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_compute_shader *cs = unsafe_impl_from_ID3D11ComputeShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -1413,10 +1414,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceCo wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -1433,10 +1434,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -1453,10 +1454,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -1481,10 +1482,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", @@ -1509,10 +1510,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceContext1 *iface, ID3D11PixelShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_shader *wined3d_shader; struct d3d_pixel_shader *shader_impl; @@ -1536,10 +1537,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo ID3D11PixelShader_AddRef(*shader); } -static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -1564,10 +1565,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceContext1 *iface, ID3D11VertexShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_vertex_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -1591,10 +1592,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo ID3D11VertexShader_AddRef(*shader); } -static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -1619,10 +1620,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetInputLayout(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetInputLayout(ID3D11DeviceContext1 *iface, ID3D11InputLayout **input_layout) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_vertex_declaration *wined3d_declaration; struct d3d_input_layout *input_layout_impl; @@ -1642,10 +1643,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetInputLayout(ID3D11Dev ID3D11InputLayout_AddRef(*input_layout); } -static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers, UINT *strides, UINT *offsets) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n", @@ -1679,10 +1680,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11D wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetIndexBuffer(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetIndexBuffer(ID3D11DeviceContext1 *iface, ID3D11Buffer **buffer, DXGI_FORMAT *format, UINT *offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d_buffer *buffer_impl; @@ -1704,10 +1705,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetIndexBuffer(ID3D11Dev ID3D11Buffer_AddRef(*buffer = &buffer_impl->ID3D11Buffer_iface); } -static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -1732,10 +1733,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceContext1 *iface, ID3D11GeometryShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_geometry_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -1759,10 +1760,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo ID3D11GeometryShader_AddRef(*shader); } -static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetPrimitiveTopology(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetPrimitiveTopology(ID3D11DeviceContext1 *iface, D3D11_PRIMITIVE_TOPOLOGY *topology) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); enum wined3d_primitive_type primitive_type; unsigned int patch_vertex_count; @@ -1775,10 +1776,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetPrimitiveTopology(ID3 d3d11_primitive_topology_from_wined3d_primitive_type(primitive_type, patch_vertex_count, topology); } -static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -1802,10 +1803,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -1830,10 +1831,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_GetPredication(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_GetPredication(ID3D11DeviceContext1 *iface, ID3D11Predicate **predicate, BOOL *value) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_query *wined3d_predicate; struct d3d_query *predicate_impl; @@ -1853,10 +1854,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GetPredication(ID3D11Devic ID3D11Predicate_AddRef(*predicate); } -static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -1880,10 +1881,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -1908,11 +1909,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11DeviceContext1 *iface, UINT render_target_view_count, ID3D11RenderTargetView **render_target_views, ID3D11DepthStencilView **depth_stencil_view) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_rendertarget_view *wined3d_view; TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p.\n", @@ -1957,13 +1958,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11D } static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnorderedAccessViews( - ID3D11DeviceContext *iface, + ID3D11DeviceContext1 *iface, UINT render_target_view_count, ID3D11RenderTargetView **render_target_views, ID3D11DepthStencilView **depth_stencil_view, UINT unordered_access_view_start_slot, UINT unordered_access_view_count, ID3D11UnorderedAccessView **unordered_access_views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_unordered_access_view *wined3d_view; struct d3d11_unordered_access_view *view_impl; unsigned int i; @@ -1998,10 +1999,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord } } -static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11DeviceContext1 *iface, ID3D11BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_blend_state *wined3d_state; struct d3d_blend_state *blend_state_impl; @@ -2023,10 +2024,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3D11DeviceContext1 *iface, ID3D11DepthStencilState **depth_stencil_state, UINT *stencil_ref) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); @@ -2037,10 +2038,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 *stencil_ref = device->stencil_ref; } -static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceContext1 *iface, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, buffer_count %u, buffers %p.\n", iface, buffer_count, buffers); @@ -2064,10 +2065,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceC wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceContext1 *iface, ID3D11RasterizerState **rasterizer_state) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_rasterizer_state *rasterizer_state_impl; struct wined3d_rasterizer_state *wined3d_state; @@ -2086,10 +2087,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceCon wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext1 *iface, UINT *viewport_count, D3D11_VIEWPORT *viewports) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_viewport wined3d_vp[WINED3D_MAX_VIEWPORTS]; unsigned int actual_count = ARRAY_SIZE(wined3d_vp), i; @@ -2123,10 +2124,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11Devic } } -static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11DeviceContext1 *iface, UINT *rect_count, D3D11_RECT *rects) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int actual_count; TRACE("iface %p, rect_count %p, rects %p.\n", iface, rect_count, rects); @@ -2148,10 +2149,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De memset(&rects[actual_count], 0, (*rect_count - actual_count) * sizeof(*rects)); } -static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -2174,10 +2175,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceContext1 *iface, ID3D11HullShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_hull_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -2200,10 +2201,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo ID3D11HullShader_AddRef(*shader = &shader_impl->ID3D11HullShader_iface); } -static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -2227,10 +2228,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -2254,10 +2255,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", @@ -2281,10 +2282,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceContext1 *iface, ID3D11DomainShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_domain_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -2307,10 +2308,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo ID3D11DomainShader_AddRef(*shader = &shader_impl->ID3D11DomainShader_iface); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -2334,10 +2335,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -2361,10 +2362,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -2387,10 +2388,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11UnorderedAccessView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -2413,10 +2414,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews( wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceContext1 *iface, ID3D11ComputeShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_compute_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -2439,10 +2440,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo ID3D11ComputeShader_AddRef(*shader = &shader_impl->ID3D11ComputeShader_iface); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -2466,10 +2467,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11Device wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D11DeviceContext *iface, +static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", @@ -2493,9 +2494,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D1 wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceContext *iface) +static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceContext1 *iface) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; unsigned int i; @@ -2552,11 +2553,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon wined3d_device_set_unordered_access_view(device->wined3d_device, i, NULL, ~0u); wined3d_device_set_cs_uav(device->wined3d_device, i, NULL, ~0u); } - ID3D11DeviceContext_OMSetDepthStencilState(iface, NULL, 0); - ID3D11DeviceContext_OMSetBlendState(iface, NULL, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); - ID3D11DeviceContext_RSSetViewports(iface, 0, NULL); - ID3D11DeviceContext_RSSetScissorRects(iface, 0, NULL); - ID3D11DeviceContext_RSSetState(iface, NULL); + ID3D11DeviceContext1_OMSetDepthStencilState(iface, NULL, 0); + ID3D11DeviceContext1_OMSetBlendState(iface, NULL, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext1_RSSetViewports(iface, 0, NULL); + ID3D11DeviceContext1_RSSetScissorRects(iface, 0, NULL); + ID3D11DeviceContext1_RSSetState(iface, NULL); for (i = 0; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) { wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); @@ -2565,26 +2566,26 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon wined3d_mutex_unlock(); } -static void STDMETHODCALLTYPE d3d11_immediate_context_Flush(ID3D11DeviceContext *iface) +static void STDMETHODCALLTYPE d3d11_immediate_context_Flush(ID3D11DeviceContext1 *iface) { FIXME("iface %p stub!\n", iface); } -static D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE d3d11_immediate_context_GetType(ID3D11DeviceContext *iface) +static D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE d3d11_immediate_context_GetType(ID3D11DeviceContext1 *iface) { TRACE("iface %p.\n", iface); return D3D11_DEVICE_CONTEXT_IMMEDIATE; } -static UINT STDMETHODCALLTYPE d3d11_immediate_context_GetContextFlags(ID3D11DeviceContext *iface) +static UINT STDMETHODCALLTYPE d3d11_immediate_context_GetContextFlags(ID3D11DeviceContext1 *iface) { FIXME("iface %p stub!\n", iface); return 0; } -static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_FinishCommandList(ID3D11DeviceContext *iface, +static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_FinishCommandList(ID3D11DeviceContext1 *iface, BOOL restore, ID3D11CommandList **command_list) { FIXME("iface %p, restore %#x, command_list %p stub!\n", iface, restore, command_list); @@ -2592,7 +2593,143 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_FinishCommandList(ID3D1 return E_NOTIMPL; } -static const struct ID3D11DeviceContextVtbl d3d11_immediate_context_vtbl = +static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3D11DeviceContext1 *iface, + ID3D11Resource *resource, UINT subresource, UINT dst_x, UINT dst_y, UINT dst_z, ID3D11Resource *src_resource, + UINT src_subresource, const D3D11_BOX *src_box, UINT flags) +{ + FIXME("iface %p, resource %p, subresource %u, dst_x %u, dst_y %u, dst_z %u, src_resource %p, src_subresource %u, " + "src_box %p, flags %#x stub!\n", iface, resource, subresource, dst_x, dst_y, dst_z, src_resource, + src_subresource, src_box, flags); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11DeviceContext1 *iface, + ID3D11Resource *resource, UINT subresource, const D3D11_BOX *box, const void *data, + UINT rowpitch, UINT depth_pitch, UINT flags) +{ + FIXME("iface %p, resource %p, subresource %u, box %p, data %p, rowpitch %u, depth_pitch %u, flags %#x stub!\n", + iface, resource, subresource, box, data, rowpitch, depth_pitch, flags); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_DiscardResource(ID3D11DeviceContext1 *iface, + ID3D11Resource *resource) +{ + FIXME("iface %p, resource %p stub!\n", iface, resource); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_DiscardView(ID3D11DeviceContext1 *iface, ID3D11View *view) +{ + FIXME("iface %p, view %p stub!\n", iface, view); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer * const *buffers, const UINT *first_constant, + const UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer * const *buffers, const UINT *first_constant, + const UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer * const *buffers, const UINT *first_constant, + const UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer * const *buffers, const UINT *first_constant, + const UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer * const *buffers, const UINT *first_constant, + const UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer * const *buffers, const UINT *first_constant, + const UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers, UINT *first_constant, UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers, UINT *first_constant, UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers, UINT *first_constant, UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers, UINT *first_constant, UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers, UINT *first_constant, UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers1(ID3D11DeviceContext1 *iface, + UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers, UINT *first_constant, UINT *num_constants) +{ + FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, first_constant %p, num_constants %p stub!\n", + iface, start_slot, buffer_count, buffers, first_constant, num_constants); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3D11DeviceContext1 *iface, + ID3DDeviceContextState *state, ID3DDeviceContextState **prev_state) +{ + FIXME("iface %p, state %p, prev_state %p stub!\n", iface, state, prev_state); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_ClearView(ID3D11DeviceContext1 *iface, ID3D11View *view, + const FLOAT color[4], const D3D11_RECT *rect, UINT num_rects) +{ + FIXME("iface %p, view %p, color %p, rect %p, num_rects %u stub!\n", iface, view, color, rect, num_rects); +} + +static void STDMETHODCALLTYPE d3d11_immediate_context_DiscardView1(ID3D11DeviceContext1 *iface, ID3D11View *view, + const D3D11_RECT *rects, UINT num_rects) +{ + FIXME("iface %p, view %p, rects %p, num_rects %u stub!\n", iface, view, rects, num_rects); +} + +static const struct ID3D11DeviceContext1Vtbl d3d11_immediate_context_vtbl = { /* IUnknown methods */ d3d11_immediate_context_QueryInterface, @@ -2712,11 +2849,31 @@ static const struct ID3D11DeviceContextVtbl d3d11_immediate_context_vtbl = d3d11_immediate_context_GetType, d3d11_immediate_context_GetContextFlags, d3d11_immediate_context_FinishCommandList, + /* ID3D11DeviceContext1 methods */ + d3d11_immediate_context_CopySubresourceRegion1, + d3d11_immediate_context_UpdateSubresource1, + d3d11_immediate_context_DiscardResource, + d3d11_immediate_context_DiscardView, + d3d11_immediate_context_VSSetConstantBuffers1, + d3d11_immediate_context_HSSetConstantBuffers1, + d3d11_immediate_context_DSSetConstantBuffers1, + d3d11_immediate_context_GSSetConstantBuffers1, + d3d11_immediate_context_PSSetConstantBuffers1, + d3d11_immediate_context_CSSetConstantBuffers1, + d3d11_immediate_context_VSGetConstantBuffers1, + d3d11_immediate_context_HSGetConstantBuffers1, + d3d11_immediate_context_DSGetConstantBuffers1, + d3d11_immediate_context_GSGetConstantBuffers1, + d3d11_immediate_context_PSGetConstantBuffers1, + d3d11_immediate_context_CSGetConstantBuffers1, + d3d11_immediate_context_SwapDeviceContextState, + d3d11_immediate_context_ClearView, + d3d11_immediate_context_DiscardView1, }; static void d3d11_immediate_context_init(struct d3d11_immediate_context *context, struct d3d_device *device) { - context->ID3D11DeviceContext_iface.lpVtbl = &d3d11_immediate_context_vtbl; + context->ID3D11DeviceContext1_iface.lpVtbl = &d3d11_immediate_context_vtbl; context->refcount = 1; ID3D11Device1_AddRef(&device->ID3D11Device1_iface); @@ -3529,7 +3686,7 @@ static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device1 *if TRACE("iface %p, immediate_context %p.\n", iface, immediate_context); - *immediate_context = &device->immediate_context.ID3D11DeviceContext_iface; + *immediate_context = (ID3D11DeviceContext *)&device->immediate_context.ID3D11DeviceContext1_iface; ID3D11DeviceContext_AddRef(*immediate_context); } @@ -4156,7 +4313,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, iface, blend_state, debug_float4(blend_factor), sample_mask); blend_state_object = unsafe_impl_from_ID3D10BlendState(blend_state); - d3d11_immediate_context_OMSetBlendState(&device->immediate_context.ID3D11DeviceContext_iface, + d3d11_immediate_context_OMSetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface, blend_state_object ? &blend_state_object->ID3D11BlendState_iface : NULL, blend_factor, sample_mask); } @@ -4170,7 +4327,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device1 iface, depth_stencil_state, stencil_ref); ds_state_object = unsafe_impl_from_ID3D10DepthStencilState(depth_stencil_state); - d3d11_immediate_context_OMSetDepthStencilState(&device->immediate_context.ID3D11DeviceContext_iface, + d3d11_immediate_context_OMSetDepthStencilState(&device->immediate_context.ID3D11DeviceContext1_iface, ds_state_object ? &ds_state_object->ID3D11DepthStencilState_iface : NULL, stencil_ref); } @@ -4212,7 +4369,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device1 *iface, ID3D TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); rasterizer_state_object = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state); - d3d11_immediate_context_RSSetState(&device->immediate_context.ID3D11DeviceContext_iface, + d3d11_immediate_context_RSSetState(&device->immediate_context.ID3D11DeviceContext1_iface, rasterizer_state_object ? &rasterizer_state_object->ID3D11RasterizerState_iface : NULL); } @@ -4309,7 +4466,7 @@ static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device1 *ifac iface, resource, subresource_idx, box, data, row_pitch, depth_pitch); ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource); - d3d11_immediate_context_UpdateSubresource(&device->immediate_context.ID3D11DeviceContext_iface, + d3d11_immediate_context_UpdateSubresource(&device->immediate_context.ID3D11DeviceContext1_iface, d3d11_resource, subresource_idx, (const D3D11_BOX *)box, data, row_pitch, depth_pitch); ID3D11Resource_Release(d3d11_resource); } @@ -4882,7 +5039,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); - d3d11_immediate_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext_iface, + d3d11_immediate_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_blend_state, blend_factor, sample_mask); if (d3d11_blend_state) @@ -4900,7 +5057,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); - d3d11_immediate_context_OMGetDepthStencilState(&device->immediate_context.ID3D11DeviceContext_iface, + d3d11_immediate_context_OMGetDepthStencilState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_iface, stencil_ref); if (d3d11_iface) @@ -5079,7 +5236,7 @@ static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) TRACE("iface %p.\n", iface); - d3d11_immediate_context_ClearState(&device->immediate_context.ID3D11DeviceContext_iface); + d3d11_immediate_context_ClearState(&device->immediate_context.ID3D11DeviceContext1_iface); } static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface) @@ -6080,7 +6237,7 @@ void d3d_device_init(struct d3d_device *device, void *outer_unknown) device->outer_unk = outer_unknown; d3d11_immediate_context_init(&device->immediate_context, device); - ID3D11DeviceContext_Release(&device->immediate_context.ID3D11DeviceContext_iface); + ID3D11DeviceContext1_Release(&device->immediate_context.ID3D11DeviceContext1_iface); device->blend_factor[0] = 1.0f; device->blend_factor[1] = 1.0f; -- 2.17.0

April 30, 2018

[PATCH 1/2] d3d11: Add ID3D11Device1 stub.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/async.c | 14 +-- dlls/d3d11/buffer.c | 14 +-- dlls/d3d11/d3d11_private.h | 48 +++---- dlls/d3d11/device.c | 250 +++++++++++++++++++++++-------------- dlls/d3d11/inputlayout.c | 12 +- dlls/d3d11/shader.c | 84 ++++++------- dlls/d3d11/state.c | 56 ++++----- dlls/d3d11/tests/d3d11.c | 12 +- dlls/d3d11/texture.c | 40 +++--- dlls/d3d11/view.c | 52 ++++---- 10 files changed, 327 insertions(+), 255 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 41238aca3c..fd0936c7ec 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -74,7 +74,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_AddRef(ID3D11Query *iface) if (refcount == 1) { - ID3D11Device_AddRef(query->device); + ID3D11Device1_AddRef(query->device); wined3d_mutex_lock(); wined3d_query_incref(query->wined3d_query); wined3d_mutex_unlock(); @@ -92,13 +92,13 @@ static ULONG STDMETHODCALLTYPE d3d11_query_Release(ID3D11Query *iface) if (!refcount) { - ID3D11Device *device = query->device; + ID3D11Device1 *device = query->device; wined3d_mutex_lock(); wined3d_query_decref(query->wined3d_query); wined3d_mutex_unlock(); - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -110,7 +110,7 @@ static void STDMETHODCALLTYPE d3d11_query_GetDevice(ID3D11Query *iface, ID3D11De TRACE("iface %p, device %p.\n", iface, device); - *device = query->device; + *device = (ID3D11Device *)query->device; ID3D11Device_AddRef(*device); } @@ -254,7 +254,7 @@ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10De TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(query->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(query->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, @@ -470,8 +470,8 @@ static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device wined3d_mutex_unlock(); query->predicate = predicate; - query->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(query->device); + query->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(query->device); return S_OK; } diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 09778e20ad..7511b4536e 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -71,7 +71,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface) if (refcount == 1) { - ID3D11Device_AddRef(buffer->device); + ID3D11Device1_AddRef(buffer->device); wined3d_mutex_lock(); wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); @@ -89,14 +89,14 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_Release(ID3D11Buffer *iface) if (!refcount) { - ID3D11Device *device = buffer->device; + ID3D11Device1 *device = buffer->device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -108,7 +108,7 @@ static void STDMETHODCALLTYPE d3d11_buffer_GetDevice(ID3D11Buffer *iface, ID3D11 TRACE("iface %p, device %p.\n", iface, device); - *device = buffer->device; + *device = (ID3D11Device *)buffer->device; ID3D11Device_AddRef(*device); } @@ -242,7 +242,7 @@ static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10 TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(buffer->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(buffer->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface, @@ -470,8 +470,8 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev } wined3d_mutex_unlock(); - buffer->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(buffer->device); + buffer->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(buffer->device); return S_OK; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 94e9e39fb3..299319b0d3 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -125,7 +125,7 @@ struct d3d_texture1d IUnknown *dxgi_surface; struct wined3d_texture *wined3d_texture; D3D11_TEXTURE1D_DESC desc; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DESC *desc, @@ -144,7 +144,7 @@ struct d3d_texture2d IUnknown *dxgi_surface; struct wined3d_texture *wined3d_texture; D3D11_TEXTURE2D_DESC desc; - ID3D11Device *device; + ID3D11Device1 *device; }; static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) @@ -167,7 +167,7 @@ struct d3d_texture3d struct wined3d_private_store private_store; struct wined3d_texture *wined3d_texture; D3D11_TEXTURE3D_DESC desc; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, @@ -185,7 +185,7 @@ struct d3d_buffer struct wined3d_private_store private_store; struct wined3d_buffer *wined3d_buffer; D3D11_BUFFER_DESC desc; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_buffer_create(struct d3d_device *device, const D3D11_BUFFER_DESC *desc, @@ -204,7 +204,7 @@ struct d3d_depthstencil_view struct wined3d_rendertarget_view *wined3d_view; D3D11_DEPTH_STENCIL_VIEW_DESC desc; ID3D11Resource *resource; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource *resource, @@ -223,7 +223,7 @@ struct d3d_rendertarget_view struct wined3d_rendertarget_view *wined3d_view; D3D11_RENDER_TARGET_VIEW_DESC desc; ID3D11Resource *resource; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource, @@ -242,7 +242,7 @@ struct d3d_shader_resource_view struct wined3d_shader_resource_view *wined3d_view; D3D11_SHADER_RESOURCE_VIEW_DESC desc; ID3D11Resource *resource; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resource *resource, @@ -262,7 +262,7 @@ struct d3d11_unordered_access_view struct wined3d_unordered_access_view *wined3d_view; D3D11_UNORDERED_ACCESS_VIEW_DESC desc; ID3D11Resource *resource; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d11_unordered_access_view_create(struct d3d_device *device, ID3D11Resource *resource, @@ -279,7 +279,7 @@ struct d3d_input_layout struct wined3d_private_store private_store; struct wined3d_vertex_declaration *wined3d_decl; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_input_layout_create(struct d3d_device *device, @@ -298,7 +298,7 @@ struct d3d_vertex_shader struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, @@ -314,7 +314,7 @@ struct d3d11_hull_shader struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, @@ -329,7 +329,7 @@ struct d3d11_domain_shader struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, @@ -345,7 +345,7 @@ struct d3d_geometry_shader struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_geometry_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, @@ -364,7 +364,7 @@ struct d3d_pixel_shader struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, @@ -380,7 +380,7 @@ struct d3d11_compute_shader struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, @@ -400,7 +400,7 @@ struct d3d11_class_linkage LONG refcount; struct wined3d_private_store private_store; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d11_class_linkage_create(struct d3d_device *device, @@ -417,7 +417,7 @@ struct d3d_blend_state struct wined3d_blend_state *wined3d_state; D3D11_BLEND_DESC desc; struct wine_rb_entry entry; - ID3D11Device *device; + ID3D11Device1 *device; }; static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) @@ -440,7 +440,7 @@ struct d3d_depthstencil_state struct wined3d_private_store private_store; D3D11_DEPTH_STENCIL_DESC desc; struct wine_rb_entry entry; - ID3D11Device *device; + ID3D11Device1 *device; }; static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface) @@ -466,7 +466,7 @@ struct d3d_rasterizer_state struct wined3d_rasterizer_state *wined3d_state; D3D11_RASTERIZER_DESC desc; struct wine_rb_entry entry; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc, @@ -485,7 +485,7 @@ struct d3d_sampler_state struct wined3d_sampler *wined3d_sampler; D3D11_SAMPLER_DESC desc; struct wine_rb_entry entry; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_DESC *desc, @@ -504,7 +504,7 @@ struct d3d_query struct wined3d_query *wined3d_query; BOOL predicate; D3D11_QUERY_DESC desc; - ID3D11Device *device; + ID3D11Device1 *device; }; HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate, @@ -526,7 +526,7 @@ struct d3d11_immediate_context struct d3d_device { IUnknown IUnknown_inner; - ID3D11Device ID3D11Device_iface; + ID3D11Device1 ID3D11Device1_iface; ID3D10Device1 ID3D10Device1_iface; ID3D10Multithread ID3D10Multithread_iface; IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; @@ -550,9 +550,9 @@ struct d3d_device UINT stencil_ref; }; -static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface) +static inline struct d3d_device *impl_from_ID3D11Device1(ID3D11Device1 *iface) { - return CONTAINING_RECORD(iface, struct d3d_device, ID3D11Device_iface); + return CONTAINING_RECORD(iface, struct d3d_device, ID3D11Device1_iface); } static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d3155d56bf..0b99222854 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -74,7 +74,7 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContex if (refcount == 1) { - ID3D11Device_AddRef(&device->ID3D11Device_iface); + ID3D11Device1_AddRef(&device->ID3D11Device1_iface); } return refcount; @@ -90,7 +90,7 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceConte if (!refcount) { - ID3D11Device_Release(&device->ID3D11Device_iface); + ID3D11Device1_Release(&device->ID3D11Device1_iface); } return refcount; @@ -102,7 +102,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceCont TRACE("iface %p, device %p.\n", iface, device); - *device = &device_object->ID3D11Device_iface; + *device = (ID3D11Device *)&device_object->ID3D11Device1_iface; ID3D11Device_AddRef(*device); } @@ -2719,7 +2719,7 @@ static void d3d11_immediate_context_init(struct d3d11_immediate_context *context context->ID3D11DeviceContext_iface.lpVtbl = &d3d11_immediate_context_vtbl; context->refcount = 1; - ID3D11Device_AddRef(&device->ID3D11Device_iface); + ID3D11Device1_AddRef(&device->ID3D11Device1_iface); wined3d_private_store_init(&context->private_store); } @@ -2731,28 +2731,28 @@ static void d3d11_immediate_context_destroy(struct d3d11_immediate_context *cont /* ID3D11Device methods */ -static HRESULT STDMETHODCALLTYPE d3d11_device_QueryInterface(ID3D11Device *iface, REFIID riid, void **out) +static HRESULT STDMETHODCALLTYPE d3d11_device_QueryInterface(ID3D11Device1 *iface, REFIID riid, void **out) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); return IUnknown_QueryInterface(device->outer_unk, riid, out); } -static ULONG STDMETHODCALLTYPE d3d11_device_AddRef(ID3D11Device *iface) +static ULONG STDMETHODCALLTYPE d3d11_device_AddRef(ID3D11Device1 *iface) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); return IUnknown_AddRef(device->outer_unk); } -static ULONG STDMETHODCALLTYPE d3d11_device_Release(ID3D11Device *iface) +static ULONG STDMETHODCALLTYPE d3d11_device_Release(ID3D11Device1 *iface) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); return IUnknown_Release(device->outer_unk); } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device *iface, const D3D11_BUFFER_DESC *desc, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device1 *iface, const D3D11_BUFFER_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Buffer **buffer) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_buffer *object; HRESULT hr; @@ -2766,10 +2766,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device *iface, return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device1 *iface, const D3D11_TEXTURE1D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture1D **texture) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_texture1d *object; HRESULT hr; @@ -2783,10 +2783,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device *ifac return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device1 *iface, const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture2D **texture) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_texture2d *object; HRESULT hr; @@ -2800,10 +2800,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device *ifac return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device1 *iface, const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture3D **texture) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_texture3d *object; HRESULT hr; @@ -2817,10 +2817,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device *ifac return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Device1 *iface, ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11ShaderResourceView **view) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_shader_resource_view *object; HRESULT hr; @@ -2837,10 +2837,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Dev return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11Device1 *iface, ID3D11Resource *resource, const D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, ID3D11UnorderedAccessView **view) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d11_unordered_access_view *object; HRESULT hr; @@ -2854,10 +2854,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11De return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Device1 *iface, ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11RenderTargetView **view) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_rendertarget_view *object; HRESULT hr; @@ -2874,10 +2874,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device1 *iface, ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11DepthStencilView **view) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_depthstencil_view *object; HRESULT hr; @@ -2891,11 +2891,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Devic return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device1 *iface, const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, ID3D11InputLayout **input_layout) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_input_layout *object; HRESULT hr; @@ -2912,10 +2912,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device *if return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device *iface, const void *byte_code, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device1 *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11VertexShader **shader) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_vertex_shader *object; HRESULT hr; @@ -2933,10 +2933,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device *i return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device *iface, const void *byte_code, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device1 *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11GeometryShader **shader) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_geometry_shader *object; HRESULT hr; @@ -2955,12 +2955,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutput(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutput(ID3D11Device1 *iface, const void *byte_code, SIZE_T byte_code_length, const D3D11_SO_DECLARATION_ENTRY *so_entries, UINT entry_count, const UINT *buffer_strides, UINT strides_count, UINT rasterizer_stream, ID3D11ClassLinkage *class_linkage, ID3D11GeometryShader **shader) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_geometry_shader *object; HRESULT hr; @@ -2984,10 +2984,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutp return hr; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device *iface, const void *byte_code, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device1 *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11PixelShader **shader) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_pixel_shader *object; HRESULT hr; @@ -3005,10 +3005,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device *if return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device *iface, const void *byte_code, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device1 *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11HullShader **shader) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d11_hull_shader *object; HRESULT hr; @@ -3026,10 +3026,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *iface, const void *byte_code, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device1 *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11DomainShader **shader) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d11_domain_shader *object; HRESULT hr; @@ -3047,10 +3047,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *i return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device *iface, const void *byte_code, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device1 *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11ComputeShader **shader) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d11_compute_shader *object; HRESULT hr; @@ -3068,10 +3068,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device * return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device1 *iface, ID3D11ClassLinkage **class_linkage) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d11_class_linkage *object; HRESULT hr; @@ -3085,10 +3085,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device *i return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device1 *iface, const D3D11_BLEND_DESC *desc, ID3D11BlendState **blend_state) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_blend_state *object; HRESULT hr; @@ -3102,10 +3102,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Device1 *iface, const D3D11_DEPTH_STENCIL_DESC *desc, ID3D11DepthStencilState **depth_stencil_state) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_depthstencil_state *object; HRESULT hr; @@ -3119,10 +3119,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Devi return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device1 *iface, const D3D11_RASTERIZER_DESC *desc, ID3D11RasterizerState **rasterizer_state) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_rasterizer_state *object; HRESULT hr; @@ -3136,10 +3136,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device1 *iface, const D3D11_SAMPLER_DESC *desc, ID3D11SamplerState **sampler_state) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_sampler_state *object; HRESULT hr; @@ -3153,10 +3153,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device *i return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device1 *iface, const D3D11_QUERY_DESC *desc, ID3D11Query **query) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_query *object; HRESULT hr; @@ -3175,10 +3175,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device *iface, return S_FALSE; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device *iface, const D3D11_QUERY_DESC *desc, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device1 *iface, const D3D11_QUERY_DESC *desc, ID3D11Predicate **predicate) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct d3d_query *object; HRESULT hr; @@ -3197,7 +3197,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device *ifac return S_FALSE; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device *iface, const D3D11_COUNTER_DESC *desc, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device1 *iface, const D3D11_COUNTER_DESC *desc, ID3D11Counter **counter) { FIXME("iface %p, desc %p, counter %p stub!\n", iface, desc, counter); @@ -3205,7 +3205,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device *iface, return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device *iface, UINT flags, +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device1 *iface, UINT flags, ID3D11DeviceContext **context) { FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context); @@ -3213,7 +3213,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device *iface, HANDLE resource, REFIID riid, +static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device1 *iface, HANDLE resource, REFIID riid, void **out) { FIXME("iface %p, resource %p, riid %s, out %p stub!\n", iface, resource, debugstr_guid(riid), out); @@ -3221,10 +3221,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device *iface, DXGI_FORMAT format, +static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device1 *iface, DXGI_FORMAT format, UINT *format_support) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct wined3d_device_creation_parameters params; enum wined3d_format_id wined3d_format; struct wined3d *wined3d; @@ -3280,10 +3280,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device *i return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D11Device *iface, +static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D11Device1 *iface, DXGI_FORMAT format, UINT sample_count, UINT *quality_level_count) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); struct wined3d_device_creation_parameters params; struct wined3d *wined3d; HRESULT hr; @@ -3320,12 +3320,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D return hr; } -static void STDMETHODCALLTYPE d3d11_device_CheckCounterInfo(ID3D11Device *iface, D3D11_COUNTER_INFO *info) +static void STDMETHODCALLTYPE d3d11_device_CheckCounterInfo(ID3D11Device1 *iface, D3D11_COUNTER_INFO *info) { FIXME("iface %p, info %p stub!\n", iface, info); } -static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device *iface, const D3D11_COUNTER_DESC *desc, +static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device1 *iface, const D3D11_COUNTER_DESC *desc, D3D11_COUNTER_TYPE *type, UINT *active_counter_count, char *name, UINT *name_length, char *units, UINT *units_length, char *description, UINT *description_length) { @@ -3337,10 +3337,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device *iface, return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device *iface, D3D11_FEATURE feature, +static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device1 *iface, D3D11_FEATURE feature, void *feature_support_data, UINT feature_support_data_size) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); WINED3DCAPS wined3d_caps; HRESULT hr; @@ -3451,7 +3451,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * } } -static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device *iface, REFGUID guid, +static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device1 *iface, REFGUID guid, UINT *data_size, void *data) { IDXGIDevice *dxgi_device; @@ -3459,7 +3459,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device *iface TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (FAILED(hr = ID3D11Device_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + if (FAILED(hr = ID3D11Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) return hr; hr = IDXGIDevice_GetPrivateData(dxgi_device, guid, data_size, data); IDXGIDevice_Release(dxgi_device); @@ -3467,7 +3467,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device *iface return hr; } -static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device *iface, REFGUID guid, +static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device1 *iface, REFGUID guid, UINT data_size, const void *data) { IDXGIDevice *dxgi_device; @@ -3475,7 +3475,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device *iface TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (FAILED(hr = ID3D11Device_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + if (FAILED(hr = ID3D11Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) return hr; hr = IDXGIDevice_SetPrivateData(dxgi_device, guid, data_size, data); IDXGIDevice_Release(dxgi_device); @@ -3483,7 +3483,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device *iface return hr; } -static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Device *iface, REFGUID guid, +static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Device1 *iface, REFGUID guid, const IUnknown *data) { IDXGIDevice *dxgi_device; @@ -3491,7 +3491,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Devi TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - if (FAILED(hr = ID3D11Device_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + if (FAILED(hr = ID3D11Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) return hr; hr = IDXGIDevice_SetPrivateDataInterface(dxgi_device, guid, data); IDXGIDevice_Release(dxgi_device); @@ -3499,33 +3499,33 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Devi return hr; } -static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device *iface) +static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device1 *iface) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); TRACE("iface %p.\n", iface); return device->feature_level; } -static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device *iface) +static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device1 *iface) { FIXME("iface %p stub!\n", iface); return 0; } -static HRESULT STDMETHODCALLTYPE d3d11_device_GetDeviceRemovedReason(ID3D11Device *iface) +static HRESULT STDMETHODCALLTYPE d3d11_device_GetDeviceRemovedReason(ID3D11Device1 *iface) { WARN("iface %p stub!\n", iface); return S_OK; } -static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device *iface, +static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device1 *iface, ID3D11DeviceContext **immediate_context) { - struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_device *device = impl_from_ID3D11Device1(iface); TRACE("iface %p, immediate_context %p.\n", iface, immediate_context); @@ -3533,21 +3533,78 @@ static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device *ifa ID3D11DeviceContext_AddRef(*immediate_context); } -static HRESULT STDMETHODCALLTYPE d3d11_device_SetExceptionMode(ID3D11Device *iface, UINT flags) +static HRESULT STDMETHODCALLTYPE d3d11_device_SetExceptionMode(ID3D11Device1 *iface, UINT flags) { FIXME("iface %p, flags %#x stub!\n", iface, flags); return E_NOTIMPL; } -static UINT STDMETHODCALLTYPE d3d11_device_GetExceptionMode(ID3D11Device *iface) +static UINT STDMETHODCALLTYPE d3d11_device_GetExceptionMode(ID3D11Device1 *iface) { FIXME("iface %p stub!\n", iface); return 0; } -static const struct ID3D11DeviceVtbl d3d11_device_vtbl = +static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device1 *iface, ID3D11DeviceContext1 **context) +{ + FIXME("iface %p, context %p stub!\n", iface, context); +} + +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Device1 *iface, UINT flags, + ID3D11DeviceContext1 **context) +{ + FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device1 *iface, + const D3D11_BLEND_DESC1 *desc, ID3D11BlendState1 **state) +{ + FIXME("iface %p, desc %p, state %p stub!\n", iface, desc, state); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Device1 *iface, + const D3D11_RASTERIZER_DESC1 *desc, ID3D11RasterizerState1 **state) +{ + FIXME("iface %p, desc %p, state %p stub!\n", iface, desc, state); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Device1 *iface, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT feature_levels_count, UINT sdk_version, + REFIID emulated_interface, D3D_FEATURE_LEVEL *chosen_feature_level, ID3DDeviceContextState **state) +{ + FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " + "emulated_interface %s, chosen_feature_level %p, state %p stub!\n", iface, flags, feature_levels, + feature_levels_count, sdk_version, debugstr_guid(emulated_interface), chosen_feature_level, state); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device1 *iface, HANDLE handle, + REFIID riid, void **resource) +{ + FIXME("iface %p, handle %p, riid %s, resource %p stub!\n", iface, handle, debugstr_guid(riid), resource); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResourceByName(ID3D11Device1 *iface, const WCHAR *name, + DWORD access, REFIID riid, void **resource) +{ + FIXME("iface %p, name %s, access %#x, riid %s, resource %p stub!\n", iface, debugstr_w(name), access, + debugstr_guid(riid), resource); + + return E_NOTIMPL; +} + +static const struct ID3D11Device1Vtbl d3d11_device_vtbl = { /* IUnknown methods */ d3d11_device_QueryInterface, @@ -3594,6 +3651,14 @@ static const struct ID3D11DeviceVtbl d3d11_device_vtbl = d3d11_device_GetImmediateContext, d3d11_device_SetExceptionMode, d3d11_device_GetExceptionMode, + /* ID3D11Device1 methods */ + d3d11_device_GetImmediateContext1, + d3d11_device_CreateDeferredContext1, + d3d11_device_CreateBlendState1, + d3d11_device_CreateRasterizerState1, + d3d11_device_CreateDeviceContextState, + d3d11_device_OpenSharedResource1, + d3d11_device_OpenSharedResourceByName, }; /* Inner IUnknown methods */ @@ -3609,10 +3674,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_ID3D11Device) + if (IsEqualGUID(riid, &IID_ID3D11Device1) + || IsEqualGUID(riid, &IID_ID3D11Device) || IsEqualGUID(riid, &IID_IUnknown)) { - *out = &device->ID3D11Device_iface; + *out = &device->ID3D11Device1_iface; } else if (IsEqualGUID(riid, &IID_ID3D10Device1) || IsEqualGUID(riid, &IID_ID3D10Device)) @@ -4984,7 +5050,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_GetPrivateData(ID3D10Device1 *ifac TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d11_device_GetPrivateData(&device->ID3D11Device_iface, guid, data_size, data); + return d3d11_device_GetPrivateData(&device->ID3D11Device1_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *iface, @@ -4994,7 +5060,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *ifac TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d11_device_SetPrivateData(&device->ID3D11Device_iface, guid, data_size, data); + return d3d11_device_SetPrivateData(&device->ID3D11Device1_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Device1 *iface, @@ -5004,7 +5070,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Devi TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d11_device_SetPrivateDataInterface(&device->ID3D11Device_iface, guid, data); + return d3d11_device_SetPrivateDataInterface(&device->ID3D11Device1_iface, guid, data); } static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) @@ -5542,7 +5608,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CheckFormatSupport(ID3D10Device1 * TRACE("iface %p, format %s, format_support %p.\n", iface, debug_dxgi_format(format), format_support); - return d3d11_device_CheckFormatSupport(&device->ID3D11Device_iface, format, format_support); + return d3d11_device_CheckFormatSupport(&device->ID3D11Device1_iface, format, format_support); } static HRESULT STDMETHODCALLTYPE d3d10_device_CheckMultisampleQualityLevels(ID3D10Device1 *iface, @@ -5553,7 +5619,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CheckMultisampleQualityLevels(ID3D TRACE("iface %p, format %s, sample_count %u, quality_level_count %p.\n", iface, debug_dxgi_format(format), sample_count, quality_level_count); - return d3d11_device_CheckMultisampleQualityLevels(&device->ID3D11Device_iface, format, + return d3d11_device_CheckMultisampleQualityLevels(&device->ID3D11Device1_iface, format, sample_count, quality_level_count); } @@ -5915,7 +5981,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic if (texture_flags) FIXME("Unhandled flags %#x.\n", texture_flags); - if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device_iface, + if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device1_iface, &desc, NULL, &texture_iface))) { WARN("Failed to create 2D texture, hr %#x.\n", hr); @@ -5940,7 +6006,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain); - if (FAILED(hr = d3d11_device_QueryInterface(&device->ID3D11Device_iface, + if (FAILED(hr = d3d11_device_QueryInterface(&device->ID3D11Device1_iface, &IID_IWineDXGIDevice, (void **)&wine_device))) { ERR("Device should implement IWineDXGIDevice.\n"); @@ -6004,7 +6070,7 @@ static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_en void d3d_device_init(struct d3d_device *device, void *outer_unknown) { device->IUnknown_inner.lpVtbl = &d3d_device_inner_unknown_vtbl; - device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl; + device->ID3D11Device1_iface.lpVtbl = &d3d11_device_vtbl; device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl; device->IWineDXGIDeviceParent_iface.lpVtbl = &d3d_dxgi_device_parent_vtbl; diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index ef1d2e687d..7b2d9b457d 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -134,7 +134,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *ifac if (refcount == 1) { - ID3D11Device_AddRef(layout->device); + ID3D11Device1_AddRef(layout->device); wined3d_mutex_lock(); wined3d_vertex_declaration_incref(layout->wined3d_decl); wined3d_mutex_unlock(); @@ -152,13 +152,13 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa if (!refcount) { - ID3D11Device *device = layout->device; + ID3D11Device1 *device = layout->device; wined3d_mutex_lock(); wined3d_vertex_declaration_decref(layout->wined3d_decl); wined3d_mutex_unlock(); - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -171,7 +171,7 @@ static void STDMETHODCALLTYPE d3d11_input_layout_GetDevice(ID3D11InputLayout *if TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_AddRef(*device = layout->device); + ID3D11Device_AddRef(*device = (ID3D11Device *)layout->device); } static HRESULT STDMETHODCALLTYPE d3d11_input_layout_GetPrivateData(ID3D11InputLayout *iface, @@ -262,7 +262,7 @@ static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *if TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(layout->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(layout->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *iface, @@ -357,7 +357,7 @@ static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d } wined3d_mutex_unlock(); - ID3D11Device_AddRef(layout->device = &device->ID3D11Device_iface); + ID3D11Device1_AddRef(layout->device = &device->ID3D11Device1_iface); return S_OK; } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index b15bd5cd64..de0607d2d4 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -330,7 +330,7 @@ static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_AddRef(ID3D11VertexShader *if if (refcount == 1) { - ID3D11Device_AddRef(shader->device); + ID3D11Device1_AddRef(shader->device); wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); @@ -348,14 +348,14 @@ static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_Release(ID3D11VertexShader *i if (!refcount) { - ID3D11Device *device = shader->device; + ID3D11Device1 *device = shader->device; wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -368,7 +368,7 @@ static void STDMETHODCALLTYPE d3d11_vertex_shader_GetDevice(ID3D11VertexShader * TRACE("iface %p, device %p.\n", iface, device); - *device = shader->device; + *device = (ID3D11Device *)shader->device; ID3D11Device_AddRef(*device); } @@ -460,7 +460,7 @@ static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader * TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10VertexShader *iface, @@ -575,8 +575,8 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d } wined3d_mutex_unlock(); - shader->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(shader->device); + shader->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(shader->device); return S_OK; } @@ -657,7 +657,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_AddRef(ID3D11HullShader *iface) if (refcount == 1) { - ID3D11Device_AddRef(shader->device); + ID3D11Device1_AddRef(shader->device); wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); @@ -675,7 +675,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_Release(ID3D11HullShader *iface if (!refcount) { - ID3D11Device *device = shader->device; + ID3D11Device1 *device = shader->device; wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); @@ -683,7 +683,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_Release(ID3D11HullShader *iface /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -696,7 +696,7 @@ static void STDMETHODCALLTYPE d3d11_hull_shader_GetDevice(ID3D11HullShader *ifac TRACE("iface %p, device %p.\n", iface, device); - *device = shader->device; + *device = (ID3D11Device *)shader->device; ID3D11Device_AddRef(*device); } @@ -788,8 +788,8 @@ static HRESULT d3d11_hull_shader_init(struct d3d11_hull_shader *shader, struct d } wined3d_mutex_unlock(); - shader->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(shader->device); + shader->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(shader->device); return S_OK; } @@ -860,7 +860,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_AddRef(ID3D11DomainShader *if if (refcount == 1) { - ID3D11Device_AddRef(shader->device); + ID3D11Device1_AddRef(shader->device); wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); @@ -878,7 +878,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_Release(ID3D11DomainShader *i if (!refcount) { - ID3D11Device *device = shader->device; + ID3D11Device1 *device = shader->device; wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); @@ -886,7 +886,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_Release(ID3D11DomainShader *i /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -899,7 +899,7 @@ static void STDMETHODCALLTYPE d3d11_domain_shader_GetDevice(ID3D11DomainShader * TRACE("iface %p, device %p.\n", iface, device); - *device = shader->device; + *device = (ID3D11Device *)shader->device; ID3D11Device_AddRef(*device); } @@ -991,8 +991,8 @@ static HRESULT d3d11_domain_shader_init(struct d3d11_domain_shader *shader, stru } wined3d_mutex_unlock(); - shader->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(shader->device); + shader->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(shader->device); return S_OK; } @@ -1073,7 +1073,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_AddRef(ID3D11GeometryShader if (refcount == 1) { - ID3D11Device_AddRef(shader->device); + ID3D11Device1_AddRef(shader->device); wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); @@ -1091,7 +1091,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_Release(ID3D11GeometryShade if (!refcount) { - ID3D11Device *device = shader->device; + ID3D11Device1 *device = shader->device; wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); @@ -1099,7 +1099,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_Release(ID3D11GeometryShade /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -1112,7 +1112,7 @@ static void STDMETHODCALLTYPE d3d11_geometry_shader_GetDevice(ID3D11GeometryShad TRACE("iface %p, device %p.\n", iface, device); - *device = shader->device; + *device = (ID3D11Device *)shader->device; ID3D11Device_AddRef(*device); } @@ -1204,7 +1204,7 @@ static void STDMETHODCALLTYPE d3d10_geometry_shader_GetDevice(ID3D10GeometryShad TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10GeometryShader *iface, @@ -1530,8 +1530,8 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, } wined3d_mutex_unlock(); - shader->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(shader->device); + shader->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(shader->device); return S_OK; } @@ -1625,7 +1625,7 @@ static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_AddRef(ID3D11PixelShader *ifac if (refcount == 1) { - ID3D11Device_AddRef(shader->device); + ID3D11Device1_AddRef(shader->device); wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); @@ -1643,14 +1643,14 @@ static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_Release(ID3D11PixelShader *ifa if (!refcount) { - ID3D11Device *device = shader->device; + ID3D11Device1 *device = shader->device; wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -1663,7 +1663,7 @@ static void STDMETHODCALLTYPE d3d11_pixel_shader_GetDevice(ID3D11PixelShader *if TRACE("iface %p, device %p.\n", iface, device); - *device = shader->device; + *device = (ID3D11Device *)shader->device; ID3D11Device_AddRef(*device); } @@ -1755,7 +1755,7 @@ static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *if TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelShader *iface, @@ -1849,8 +1849,8 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d } wined3d_mutex_unlock(); - shader->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(shader->device); + shader->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(shader->device); return S_OK; } @@ -1930,7 +1930,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_AddRef(ID3D11ComputeShader * if (refcount == 1) { - ID3D11Device_AddRef(shader->device); + ID3D11Device1_AddRef(shader->device); wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); @@ -1948,7 +1948,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_Release(ID3D11ComputeShader if (!refcount) { - ID3D11Device *device = shader->device; + ID3D11Device1 *device = shader->device; wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); @@ -1956,7 +1956,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_Release(ID3D11ComputeShader /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -1969,7 +1969,7 @@ static void STDMETHODCALLTYPE d3d11_compute_shader_GetDevice(ID3D11ComputeShader TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_AddRef(*device = shader->device); + ID3D11Device_AddRef(*device = (ID3D11Device *)shader->device); } static HRESULT STDMETHODCALLTYPE d3d11_compute_shader_GetPrivateData(ID3D11ComputeShader *iface, @@ -2060,7 +2060,7 @@ static HRESULT d3d11_compute_shader_init(struct d3d11_compute_shader *shader, st } wined3d_mutex_unlock(); - ID3D11Device_AddRef(shader->device = &device->ID3D11Device_iface); + ID3D11Device1_AddRef(shader->device = &device->ID3D11Device1_iface); return S_OK; } @@ -2140,12 +2140,12 @@ static ULONG STDMETHODCALLTYPE d3d11_class_linkage_Release(ID3D11ClassLinkage *i if (!refcount) { - ID3D11Device *device = class_linkage->device; + ID3D11Device1 *device = class_linkage->device; wined3d_private_store_cleanup(&class_linkage->private_store); heap_free(class_linkage); - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -2158,7 +2158,7 @@ static void STDMETHODCALLTYPE d3d11_class_linkage_GetDevice(ID3D11ClassLinkage * TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_AddRef(*device = class_linkage->device); + ID3D11Device_AddRef(*device = (ID3D11Device *)class_linkage->device); } static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_GetPrivateData(ID3D11ClassLinkage *iface, @@ -2239,7 +2239,7 @@ HRESULT d3d11_class_linkage_create(struct d3d_device *device, struct d3d11_class object->refcount = 1; wined3d_private_store_init(&object->private_store); - ID3D11Device_AddRef(object->device = &device->ID3D11Device_iface); + ID3D11Device1_AddRef(object->device = &device->ID3D11Device1_iface); TRACE("Created class linkage %p.\n", object); *class_linkage = object; diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index a14c9d3cb4..29c6fa1beb 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -66,7 +66,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) if (refcount == 1) { - ID3D11Device_AddRef(state->device); + ID3D11Device1_AddRef(state->device); wined3d_mutex_lock(); wined3d_blend_state_incref(state->wined3d_state); wined3d_mutex_unlock(); @@ -84,13 +84,13 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface if (!refcount) { - ID3D11Device *device = state->device; + ID3D11Device1 *device = state->device; wined3d_mutex_lock(); wined3d_blend_state_decref(state->wined3d_state); wined3d_mutex_unlock(); - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -103,7 +103,7 @@ static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState *ifac TRACE("iface %p, device %p.\n", iface, device); - *device = state->device; + *device = (ID3D11Device *)state->device; ID3D11Device_AddRef(*device); } @@ -206,7 +206,7 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState1 *ifa TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState1 *iface, @@ -294,7 +294,7 @@ static const struct ID3D10BlendState1Vtbl d3d10_blend_state_vtbl = static void STDMETHODCALLTYPE d3d_blend_state_wined3d_object_destroyed(void *parent) { struct d3d_blend_state *state = parent; - struct d3d_device *device = impl_from_ID3D11Device(state->device); + struct d3d_device *device = impl_from_ID3D11Device1(state->device); wine_rb_remove(&device->blend_states, &state->entry); wined3d_private_store_cleanup(&state->private_store); @@ -395,7 +395,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC } wined3d_mutex_unlock(); - ID3D11Device_AddRef(object->device = &device->ID3D11Device_iface); + ID3D11Device1_AddRef(object->device = &device->ID3D11Device1_iface); TRACE("Created blend state %p.\n", object); *state = object; @@ -466,7 +466,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci static void d3d_depthstencil_state_cleanup(struct d3d_depthstencil_state *state) { wined3d_private_store_cleanup(&state->private_store); - ID3D11Device_Release(state->device); + ID3D11Device1_Release(state->device); } static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStencilState *iface) @@ -478,7 +478,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc if (!refcount) { - struct d3d_device *device = impl_from_ID3D11Device(state->device); + struct d3d_device *device = impl_from_ID3D11Device1(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->depthstencil_states, &state->entry); d3d_depthstencil_state_cleanup(state); @@ -496,7 +496,7 @@ static void STDMETHODCALLTYPE d3d11_depthstencil_state_GetDevice(ID3D11DepthSten TRACE("iface %p, device %p.\n", iface, device); - *device = state->device; + *device = (ID3D11Device *)state->device; ID3D11Device_AddRef(*device); } @@ -600,7 +600,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDevice(ID3D10DepthSten TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_GetPrivateData(ID3D10DepthStencilState *iface, @@ -671,8 +671,8 @@ static HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, wined3d_private_store_init(&state->private_store); state->desc = *desc; - state->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(state->device); + state->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(state->device); return S_OK; } @@ -831,7 +831,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta if (refcount == 1) { - ID3D11Device_AddRef(state->device); + ID3D11Device1_AddRef(state->device); wined3d_mutex_lock(); wined3d_rasterizer_state_incref(state->wined3d_state); wined3d_mutex_unlock(); @@ -849,13 +849,13 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt if (!refcount) { - ID3D11Device *device = state->device; + ID3D11Device1 *device = state->device; wined3d_mutex_lock(); wined3d_rasterizer_state_decref(state->wined3d_state); wined3d_mutex_unlock(); - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -868,7 +868,7 @@ static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDevice(ID3D11RasterizerS TRACE("iface %p, device %p.\n", iface, device); - *device = state->device; + *device = (ID3D11Device *)state->device; ID3D11Device_AddRef(*device); } @@ -972,7 +972,7 @@ static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerS TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10RasterizerState *iface, @@ -1037,7 +1037,7 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = static void STDMETHODCALLTYPE d3d_rasterizer_state_wined3d_object_destroyed(void *parent) { struct d3d_rasterizer_state *state = parent; - struct d3d_device *device = impl_from_ID3D11Device(state->device); + struct d3d_device *device = impl_from_ID3D11Device1(state->device); wine_rb_remove(&device->rasterizer_states, &state->entry); wined3d_private_store_cleanup(&state->private_store); @@ -1081,7 +1081,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str return hr; } - ID3D11Device_AddRef(state->device = &device->ID3D11Device_iface); + ID3D11Device1_AddRef(state->device = &device->ID3D11Device1_iface); return S_OK; } @@ -1194,7 +1194,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *if if (refcount == 1) { - ID3D11Device_AddRef(state->device); + ID3D11Device1_AddRef(state->device); wined3d_mutex_lock(); wined3d_sampler_incref(state->wined3d_sampler); wined3d_mutex_unlock(); @@ -1212,13 +1212,13 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i if (!refcount) { - ID3D11Device *device = state->device; + ID3D11Device1 *device = state->device; wined3d_mutex_lock(); wined3d_sampler_decref(state->wined3d_sampler); wined3d_mutex_unlock(); - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -1231,7 +1231,7 @@ static void STDMETHODCALLTYPE d3d11_sampler_state_GetDevice(ID3D11SamplerState * TRACE("iface %p, device %p.\n", iface, device); - *device = state->device; + *device = (ID3D11Device *)state->device; ID3D11Device_AddRef(*device); } @@ -1335,7 +1335,7 @@ static void STDMETHODCALLTYPE d3d10_sampler_state_GetDevice(ID3D10SamplerState * TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10SamplerState *iface, @@ -1400,7 +1400,7 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = static void STDMETHODCALLTYPE d3d_sampler_wined3d_object_destroyed(void *parent) { struct d3d_sampler_state *state = parent; - struct d3d_device *device = impl_from_ID3D11Device(state->device); + struct d3d_device *device = impl_from_ID3D11Device1(state->device); wine_rb_remove(&device->sampler_states, &state->entry); wined3d_private_store_cleanup(&state->private_store); @@ -1494,8 +1494,8 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3 return hr; } - state->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(state->device); + state->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(state->device); return S_OK; } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8ca6634626..8feba4ffb4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5927,9 +5927,9 @@ static void test_device_context_state(void) { ID3DDeviceContextState *context_state, *previous_context_state; ID3D11SamplerState *sampler, *tmp_sampler; + ID3D11DeviceContext1 *context = NULL; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; - ID3D11DeviceContext1 *context; ID3D11Device *d3d11_device; ID3D11Device1 *device; ULONG refcount; @@ -5949,11 +5949,17 @@ static void test_device_context_state(void) return; } - check_interface(device, &IID_ID3D10Device, FALSE, FALSE); - check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); + todo_wine check_interface(device, &IID_ID3D10Device, FALSE, FALSE); + todo_wine check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); feature_level = ID3D11Device1_GetFeatureLevel(device); ID3D11Device1_GetImmediateContext1(device, &context); + todo_wine ok(!!context, "Failed to get immediate context.\n"); + if (!context) + { + ID3D11Device1_Release(device); + return; + } sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 0730dbc8c6..2c460b408d 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -78,7 +78,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface) if (refcount == 1) { - ID3D11Device_AddRef(texture->device); + ID3D11Device1_AddRef(texture->device); wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); wined3d_mutex_unlock(); @@ -96,14 +96,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_Release(ID3D11Texture1D *iface) if (!refcount) { - ID3D11Device *device = texture->device; + ID3D11Device1 *device = texture->device; wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -115,7 +115,7 @@ static void STDMETHODCALLTYPE d3d11_texture1d_GetDevice(ID3D11Texture1D *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = texture->device; + *device = (ID3D11Device *)texture->device; ID3D11Device_AddRef(*device); } @@ -287,7 +287,7 @@ static void STDMETHODCALLTYPE d3d10_texture1d_GetDevice(ID3D10Texture1D *iface, TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_texture1d_GetPrivateData(ID3D10Texture1D *iface, @@ -510,8 +510,8 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE } wined3d_mutex_unlock(); - texture->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(texture->device); + texture->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(texture->device); TRACE("Created texture %p.\n", texture); *out = texture; @@ -566,7 +566,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface) if (refcount == 1) { - ID3D11Device_AddRef(texture->device); + ID3D11Device1_AddRef(texture->device); wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); wined3d_mutex_unlock(); @@ -584,14 +584,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) if (!refcount) { - ID3D11Device *device = texture->device; + ID3D11Device1 *device = texture->device; wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -603,7 +603,7 @@ static void STDMETHODCALLTYPE d3d11_texture2d_GetDevice(ID3D11Texture2D *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = texture->device; + *device = (ID3D11Device *)texture->device; ID3D11Device_AddRef(*device); } @@ -789,7 +789,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface, TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface, @@ -1066,7 +1066,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE } wined3d_mutex_unlock(); - ID3D11Device_AddRef(texture->device = &device->ID3D11Device_iface); + ID3D11Device1_AddRef(texture->device = &device->ID3D11Device1_iface); TRACE("Created texture %p.\n", texture); *out = texture; @@ -1120,7 +1120,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface) if (refcount == 1) { - ID3D11Device_AddRef(texture->device); + ID3D11Device1_AddRef(texture->device); wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); wined3d_mutex_unlock(); @@ -1146,14 +1146,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface) if (!refcount) { - ID3D11Device *device = texture->device; + ID3D11Device1 *device = texture->device; wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -1165,7 +1165,7 @@ static void STDMETHODCALLTYPE d3d11_texture3d_GetDevice(ID3D11Texture3D *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = texture->device; + *device = (ID3D11Device *)texture->device; ID3D11Device_AddRef(*device); } @@ -1287,7 +1287,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface, TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *iface, @@ -1495,8 +1495,8 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi wined3d_mutex_unlock(); texture->desc.MipLevels = levels; - texture->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(texture->device); + texture->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(texture->device); return S_OK; } diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 2787c08ce0..5b3f1d02d0 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1006,7 +1006,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencil if (refcount == 1) { - ID3D11Device_AddRef(view->device); + ID3D11Device1_AddRef(view->device); wined3d_mutex_lock(); wined3d_rendertarget_view_incref(view->wined3d_view); wined3d_mutex_unlock(); @@ -1024,13 +1024,13 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci if (!refcount) { - ID3D11Device *device = view->device; + ID3D11Device1 *device = view->device; wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); wined3d_mutex_unlock(); - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -1043,7 +1043,7 @@ static void STDMETHODCALLTYPE d3d11_depthstencil_view_GetDevice(ID3D11DepthStenc TRACE("iface %p, device %p.\n", iface, device); - *device = view->device; + *device = (ID3D11Device *)view->device; ID3D11Device_AddRef(*device); } @@ -1160,7 +1160,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStenc TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(view->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(view->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface, @@ -1355,8 +1355,8 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - view->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(view->device); + view->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(view->device); return S_OK; } @@ -1449,7 +1449,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTarget if (refcount == 1) { - ID3D11Device_AddRef(view->device); + ID3D11Device1_AddRef(view->device); wined3d_mutex_lock(); wined3d_rendertarget_view_incref(view->wined3d_view); wined3d_mutex_unlock(); @@ -1467,13 +1467,13 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge if (!refcount) { - ID3D11Device *device = view->device; + ID3D11Device1 *device = view->device; wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); wined3d_mutex_unlock(); - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -1486,7 +1486,7 @@ static void STDMETHODCALLTYPE d3d11_rendertarget_view_GetDevice(ID3D11RenderTarg TRACE("iface %p, device %p.\n", iface, device); - *device = view->device; + *device = (ID3D11Device *)view->device; ID3D11Device_AddRef(*device); } @@ -1603,7 +1603,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTarg TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(view->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(view->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface, @@ -1803,8 +1803,8 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - view->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(view->device); + view->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(view->device); return S_OK; } @@ -1898,7 +1898,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderRes if (refcount == 1) { - ID3D11Device_AddRef(view->device); + ID3D11Device1_AddRef(view->device); wined3d_mutex_lock(); wined3d_shader_resource_view_incref(view->wined3d_view); wined3d_mutex_unlock(); @@ -1916,13 +1916,13 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe if (!refcount) { - ID3D11Device *device = view->device; + ID3D11Device1 *device = view->device; wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); wined3d_mutex_unlock(); - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -1935,7 +1935,7 @@ static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDevice(ID3D11ShaderR TRACE("iface %p, device %p.\n", iface, device); - *device = view->device; + *device = (ID3D11Device *)view->device; ID3D11Device_AddRef(*device); } @@ -2053,7 +2053,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderR TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_QueryInterface(view->device, &IID_ID3D10Device, (void **)device); + ID3D11Device1_QueryInterface(view->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView1 *iface, @@ -2304,8 +2304,8 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - view->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(view->device); + view->device = &device->ID3D11Device1_iface; + ID3D11Device1_AddRef(view->device); return S_OK; } @@ -2384,7 +2384,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_AddRef(ID3D11Unordere if (refcount == 1) { - ID3D11Device_AddRef(view->device); + ID3D11Device1_AddRef(view->device); wined3d_mutex_lock(); wined3d_unordered_access_view_incref(view->wined3d_view); wined3d_mutex_unlock(); @@ -2402,13 +2402,13 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder if (!refcount) { - ID3D11Device *device = view->device; + ID3D11Device1 *device = view->device; wined3d_mutex_lock(); wined3d_unordered_access_view_decref(view->wined3d_view); wined3d_mutex_unlock(); - ID3D11Device_Release(device); + ID3D11Device1_Release(device); } return refcount; @@ -2421,7 +2421,7 @@ static void STDMETHODCALLTYPE d3d11_unordered_access_view_GetDevice(ID3D11Unorde TRACE("iface %p, device %p.\n", iface, device); - ID3D11Device_AddRef(*device = view->device); + ID3D11Device_AddRef(*device = (ID3D11Device *)view->device); } static HRESULT STDMETHODCALLTYPE d3d11_unordered_access_view_GetPrivateData(ID3D11UnorderedAccessView *iface, @@ -2614,7 +2614,7 @@ static HRESULT d3d11_unordered_access_view_init(struct d3d11_unordered_access_vi wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D11Device_AddRef(view->device = &device->ID3D11Device_iface); + ID3D11Device1_AddRef(view->device = &device->ID3D11Device1_iface); return S_OK; } -- 2.17.0

April 30, 2018

Re: WineConf 2018

by Henri Verbeet

Since the registration deadline is tomorrow, I figured it was time for a small update. We currently have received 56 registrations, for a total of 64 people. That's slightly up from previous years. If you haven't signed up yet, and after the May 1 deadline decide you would still like to join us, you're still welcome. However, you'd be responsible for arranging your own accommodation. If you happen to be in the area, and only want to join in the social parts of the conference, like the Friday afternoon programme or the Saturday evening barbecue, that's fine too, just let us know. We still have a fair number of free slots for talks. If you happen to know someone who's a good speaker, willing to give a talk on a subject of interest to the Wine community, or perhaps have a good idea for something with a slightly different format than a traditional talk, please let me know, and we'll do our best to convince Aric and Jeremy to allow it. :D If you happen to have decent quality video equipment, and would be willing to use that to record the conference, please contact me. I know François has offered to bring his 360-degree camera, and would be happy with anything we can get, but would be most comfortable with a traditional video camera or perhaps a DSLR/ILC without recording limit. I'm currently trying to work something out for the audio equipment. If you'd like to join us for any part of the Friday afternoon programme [1], but haven't signed up yet, don't hesitate. A number of you have already contacted me, but there is also still room for a fair number of people. Henri [1] https://www.winehq.org/pipermail/wineconf/2018-April/001147.html

April 30, 2018

Re: [v2 PATCH] user32/menu: Return locked menu data when looking for menu items.

by Huw Davies

On Wed, Apr 25, 2018 at 07:27:36PM +0300, Nikolay Sivov wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > > This hopefully addresses comments I got for original patch. It takes > handle on input, and returns locked menu data and item pointer in a single > structure. > > dlls/user32/menu.c | 566 ++++++++++++++++++++++++++++----------------- > 1 file changed, 359 insertions(+), 207 deletions(-) > > diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c > index 537c2ebe1a..5778af2a0a 100644 > --- a/dlls/user32/menu.c > +++ b/dlls/user32/menu.c > @@ -584,7 +584,12 @@ static UINT MENU_GetStartOfPrevColumn( > return i; > } > > - > +struct menu_item_desc > +{ > + MENUITEM *item; > + POPUPMENU *menu; > + UINT id; > +}; > > /*********************************************************************** > * MENU_FindItem > @@ -592,18 +597,29 @@ static UINT MENU_GetStartOfPrevColumn( > * Find a menu item. Return a pointer on the item, and modifies *hmenu > * in case the item was in a sub-menu. > */ > -static MENUITEM *MENU_FindItem( HMENU *hmenu, UINT *nPos, UINT wFlags ) > +static BOOL MENU_FindItem(HMENU hmenu, UINT wFlags, struct menu_item_desc *desc) > { IMHO using the 'id' member of desc as an [in,out] param is confusing, not least because of its name. I'd suggest changing the name to 'pos' and using it as [out]-only, then adding a UINT 'id' parameter to the function. Huw.

April 30, 2018

Re: [PATCH v2] shell32: handle writing an iconresource entry in SHGetSetFolderCustomSettings

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38102 Your paranoid android. === w2003std (32 bit shlfolder) === shlfolder.c:4957: Test failed: MKDIR: Expected wndproc to be called shlfolder.c:4869: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 8) shlfolder.c:4957: Test failed: CREATE: Expected wndproc to be called shlfolder.c:4869: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) shlfolder.c:4957: Test failed: RMDIR: Expected wndproc to be called shlfolder.c:4869: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) shlfolder.c:4957: Test failed: MKDIR: Expected wndproc to be called shlfolder.c:4869: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 6ac) shlfolder.c:4957: Test failed: CREATE: Expected wndproc to be called shlfolder.c:4869: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 6ac) shlfolder.c:4957: Test failed: RMDIR: Expected wndproc to be called shlfolder.c:4869: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 6ac)

April 30, 2018

[PATCH v2] shell32: handle writing an iconresource entry in SHGetSetFolderCustomSettings

by Louis Lenders

v2: added check for null pointers and remove two todo_wine`s This fixes https://bugs.winehq.org/show_bug.cgi?id=44959 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/shlfolder.c | 38 ++++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shlfolder.c | 4 ++-- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 9143f1e..a25ceae 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -605,14 +605,44 @@ HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT ci } /*********************************************************************** - * SHGetSetFolderCustomSettings + * SHGetSetFolderCustomSettings (SHELL32.709) * - * Only Unicode above Server 2003 + * Only Unicode above Server 2003, writes/reads from a Desktop.ini */ HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, PCWSTR path, DWORD flag ) { - FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); - return E_NOTIMPL; + static const WCHAR iconresourceW[] = {'I','c','o','n','R','e','s','o','u','r','c','e',0}; + static const WCHAR desktop_iniW[] = {'D','e','s','k','t','o','p','.','i','n','i',0}; + WCHAR bufferW[MAX_PATH]; + HRESULT hr; + + hr = E_FAIL; + bufferW[0] = 0; + + if (!fcs || !path) + return hr; + + if (flag & FCS_FORCEWRITE) + { + if (fcs->dwMask & FCSM_ICONFILE) + { + lstrcpyW(bufferW, path); + PathAddBackslashW(bufferW); + lstrcatW(bufferW, desktop_iniW); + + if (WritePrivateProfileStringW(wszDotShellClassInfo, iconresourceW, fcs->pszIconFile, bufferW)) + { + TRACE("Wrote an iconresource entry %s into %s\n", debugstr_w(fcs->pszIconFile), debugstr_w(bufferW)); + hr = S_OK; + } + else + ERR("Failed to write (to) Desktop.ini file\n"); + } + } + else + FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); + + return hr; } /*********************************************************************** diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 89a01b7..4ce9a4e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5278,7 +5278,7 @@ static void test_SHGetSetFolderCustomSettings(void) fcs.pszIconFile = iconpathW; hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_FORCEWRITE); /*creates and writes to a Desktop.ini*/ - todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); memset(&fcs, 0, sizeof(fcs)); fcs.dwSize = sizeof(fcs); @@ -5292,7 +5292,7 @@ static void test_SHGetSetFolderCustomSettings(void) todo_wine ok(!lstrcmpiW(iconpathW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconpathW), wine_dbgstr_w(fcs.pszIconFile)); hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ); - todo_wine ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); + ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); lstrcpyW(bufferW, pathW); lstrcatW(bufferW, desktop_iniW); -- 2.7.4

April 30, 2018

[PATCH] user32/tests: Drop nonsensical broadcast tests that fail on Windows 10

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/tests/broadcast.c | 107 ---------------------------------- 1 file changed, 107 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index afdb536816..1a216955bb 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -128,13 +128,6 @@ if (0) /* TODO: Check the hang flags */ ok(0, "Returned: %d\n", ret); } - recips = BSM_APPLICATIONS; - ResetEvent(hevent); - ret = broadcast( BSF_POSTMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, 0 ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - SetLastError( 0xdeadbeef ); recips = BSM_APPLICATIONS; ret = broadcast( BSF_POSTMESSAGE|BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, 0 ); @@ -147,18 +140,6 @@ if (0) /* TODO: Check the hang flags */ ok(ret==1, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( 0, &recips, WM_NULL, 100, 0 ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); } /* BSF_SENDNOTIFYMESSAGE and BSF_QUERY are both synchronous within the same process @@ -209,13 +190,6 @@ if (0) /* TODO: Check the hang flags */ ok(0, "Returned: %d\n", ret); } - recips = BSM_APPLICATIONS; - ResetEvent(hevent); - ret = broadcastex( BSF_POSTMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - recips = BSM_APPLICATIONS; ret = broadcastex( BSF_POSTMESSAGE|BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, 0, NULL ); ok(ret==1, "Returned: %d\n", ret); @@ -227,84 +201,6 @@ if (0) /* TODO: Check the hang flags */ ok(ret==1, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcastex( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcastex( 0, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); -} - -static void test_noprivileges(void) -{ - HANDLE token; - DWORD recips; - BOOL ret; - - static const DWORD BSM_ALL_RECIPS = BSM_VXDS | BSM_NETDRIVER | - BSM_INSTALLABLEDRIVERS | BSM_APPLICATIONS; - - if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) - { - skip("Can't open security token for process\n"); - return; - } - if (!AdjustTokenPrivileges(token, TRUE, NULL, 0, NULL, NULL)) - { - skip("Can't adjust security token for process\n"); - return; - } - - trace("Trying privileged edition!\n"); - SetLastError(0xcafebabe); - recips = BSM_ALLDESKTOPS; - ResetEvent(hevent); - ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - ok(recips == BSM_ALLDESKTOPS || - recips == BSM_ALL_RECIPS, /* win2k3 */ - "Received by: %08x\n", recips); - PulseEvent(hevent); - - SetLastError(0xcafebabe); - recips = BSM_ALLCOMPONENTS; - ResetEvent(hevent); - ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - ok(recips == BSM_ALLCOMPONENTS || - recips == BSM_ALL_RECIPS, /* win2k3 */ - "Received by: %08x\n", recips); - PulseEvent(hevent); - - SetLastError(0xcafebabe); - recips = BSM_ALLDESKTOPS|BSM_APPLICATIONS; - ResetEvent(hevent); - ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || - recips == BSM_APPLICATIONS, /* win2k3 */ - "Received by: %08x\n", recips); - PulseEvent(hevent); - - SetLastError(0xcafebabe); - recips = BSM_ALLDESKTOPS|BSM_APPLICATIONS; - ResetEvent(hevent); - ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || - recips == BSM_APPLICATIONS, /* win2k3 */ - "Received by: %08x\n", recips); - PulseEvent(hevent); } START_TEST(broadcast) @@ -323,7 +219,4 @@ START_TEST(broadcast) trace("Running BroadcastSystemMessageExW tests\n"); test_parametersEx(BroadcastSystemMessageExW); - - trace("Attempting privileges checking tests\n"); - test_noprivileges(); } -- 2.17.0

April 30, 2018

Re: [PATCH] user32/tests: Add a trailing '\n' to an ok() call.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38099 Your paranoid android. === wvistau64 (32 bit win) === win.c:10173: Test failed: hwnd 0005020E topmost state is wrong win.c:10176: Test failed: hwnd 0005012C topmost state is wrong win.c:10248: Test failed: 00050204: expected next 0005012C, got 00000000 win.c:10263: Test failed: 00030084: expected next 00030082, got 00000000 win.c:10273: Test failed: 00030084: expected next 00030082, got 00000000 win.c:10288: Test failed: 00030084: expected next 00030082, got 00000000 win.c:10312: Test failed: 00030084: expected next 00030082, got 00000000 win.c:10321: Test failed: 00030084: expected next 00030082, got 00000000

April 30, 2018