October 2015 - Wine-commits

Michael Stefaniuc : user.exe16: Fix a misplaced closing bracket ( PVS-Studio).
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 7be37c9874a74b508836bf9ddd311fe1e5eba5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be37c9874a74b508836bf9dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 14 21:36:33 2015 +0200 user.exe16: Fix a misplaced closing bracket (PVS-Studio). Previous code was setting ret to 1 for negative return values of vsnprintf; that would fail on glibc 2.0.6 and older. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index d16a1b4..aba797d 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -3244,7 +3244,7 @@ DWORD WINAPI FormatMessage16( argliststart=args+insertnr-1; /* CMF - This makes a BIG assumption about va_list */ - while ((ret = vsnprintf(b, sz, fmtstr, (va_list) argliststart) < 0) || (ret >= sz)) { + while ((ret = vsnprintf(b, sz, fmtstr, (va_list) argliststart)) < 0 || ret >= sz) { sz = (ret == -1 ? sz + 100 : ret + 1); b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); }

1 0

Nikolay Sivov : oleaut32/tests: Don't use HRESULT codes for BOOL retval ( PVS-Studio).
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: feb607ecf67561ff09322cb420611e25c7a02ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb607ecf67561ff09322cb42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 12:36:42 2015 +0300 oleaut32/tests: Don't use HRESULT codes for BOOL retval (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9b05fe7..4ba453c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -230,7 +230,7 @@ static HRESULT WINAPI RecordInfo_GetFieldNames(IRecordInfo *iface, ULONG *pcName static BOOL WINAPI RecordInfo_IsMatchingType(IRecordInfo *iface, IRecordInfo *info2) { ok(0, "unexpected call\n"); - return E_NOTIMPL; + return FALSE; } static PVOID WINAPI RecordInfo_RecordCreate(IRecordInfo *iface)

1 0

Nikolay Sivov : shell32: Simplify conditional expression (PVS-Studio).
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 5853e7769c4d4e0546f017d21e634a6b22add183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5853e7769c4d4e0546f017d21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 12:37:10 2015 +0300 shell32: Simplify conditional expression (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/debughlp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index 3d417f8..a7ae616 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -53,7 +53,7 @@ LPCITEMIDLIST _dbg_ILGetNext(LPCITEMIDLIST pidl) static BOOL _dbg_ILIsDesktop(LPCITEMIDLIST pidl) { - return ( !pidl || (pidl && pidl->mkid.cb == 0x00) ); + return ( !pidl || pidl->mkid.cb == 0x00 ); } static

1 0

Nikolay Sivov : shlwapi: Fix SHPropertyBag_ReadLONG prototype (PVS-Studio) .
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: f51e7900eb5714edfff2b9b411b10e7d4999bf34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51e7900eb5714edfff2b9b41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 12:44:20 2015 +0300 shlwapi: Fix SHPropertyBag_ReadLONG prototype (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 4 ++-- dlls/shlwapi/tests/ordinal.c | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index df15c40..3c8af5c 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -5187,9 +5187,9 @@ HRESULT WINAPI IUnknown_QueryServiceForWebBrowserApp(IUnknown* lpUnknown, * pValue: address to receive the property value as a 32-bit signed integer * * RETURNS - * 0 for Success + * HRESULT codes */ -BOOL WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG pValue) +HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG pValue) { VARIANT var; HRESULT hr; diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 17edf65..68526cd 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1633,21 +1633,19 @@ static void test_SHPropertyBag_ReadLONG(void) out = 0xfeedface; rc = pSHPropertyBag_ReadLONG(NULL, szName1, &out); - ok(rc == E_INVALIDARG || broken(rc == 0), "incorrect return %x\n",rc); + ok(rc == E_INVALIDARG || broken(rc == S_OK), "incorrect return %x\n",rc); ok(out == 0xfeedface, "value should not have changed\n"); rc = pSHPropertyBag_ReadLONG(&pb->IPropertyBag_iface, NULL, &out); - ok(rc == E_INVALIDARG || broken(rc == 0) || broken(rc == 1), "incorrect return %x\n",rc); + ok(rc == E_INVALIDARG || broken(rc == S_OK) || broken(rc == S_FALSE), "incorrect return %x\n",rc); ok(out == 0xfeedface, "value should not have changed\n"); rc = pSHPropertyBag_ReadLONG(&pb->IPropertyBag_iface, szName1, NULL); - ok(rc == E_INVALIDARG || broken(rc == 0) || broken(rc == 1), "incorrect return %x\n",rc); + ok(rc == E_INVALIDARG || broken(rc == S_OK) || broken(rc == S_FALSE), "incorrect return %x\n",rc); rc = pSHPropertyBag_ReadLONG(&pb->IPropertyBag_iface, szName1, &out); - ok(rc == DISP_E_BADVARTYPE || broken(rc == 0) || broken(rc == 1), "incorrect return %x\n",rc); + ok(rc == DISP_E_BADVARTYPE || broken(rc == S_OK) || broken(rc == S_FALSE), "incorrect return %x\n",rc); ok(out == 0xfeedface || broken(out == 0xfeedfa00), "value should not have changed %x\n",out); IUnknown_Release((IUnknown*)pb); } - - static void test_SHSetWindowBits(void) { HWND hwnd;

1 0

Nikolay Sivov : shlwapi/tests: Fix a couple of prototypes to match implementation (PVS-Studio).
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: bef3298e8912aee117761f7cf82e21160d3af92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef3298e8912aee117761f7cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 13:07:02 2015 +0300 shlwapi/tests: Fix a couple of prototypes to match implementation (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 84b3f4d..ab4ae47 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -27,8 +27,8 @@ #include "shlwapi.h" #include "wininet.h" -static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD); -static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); +static BOOL (WINAPI *pPathIsValidCharA)(char,DWORD); +static BOOL (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR); static HRESULT (WINAPI *pPathCreateFromUrlA)(LPCSTR, LPSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pPathCreateFromUrlW)(LPCWSTR, LPWSTR, LPDWORD, DWORD);

1 0

Riccardo Bortolato : d3d8: Use wined3d_rendertarget_view_create instead of wined3d_rendertarget_view_create_from_surface in d3d8_surface_get_rendertarget_view.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 7fc43d3c0946576ab18eb0d08187558aedc56b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc43d3c0946576ab18eb0d08… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 13 18:45:39 2015 +0200 d3d8: Use wined3d_rendertarget_view_create instead of wined3d_rendertarget_view_create_from_surface in d3d8_surface_get_rendertarget_view. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index cce8b87..077502d 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -348,12 +348,23 @@ static const struct wined3d_parent_ops d3d8_view_wined3d_parent_ops = struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8_surface *surface) { + struct wined3d_resource *resource; + struct wined3d_resource_desc resource_desc; + struct wined3d_rendertarget_view_desc desc; HRESULT hr; if (surface->wined3d_rtv) return surface->wined3d_rtv; - if (FAILED(hr = wined3d_rendertarget_view_create_from_surface(surface->wined3d_surface, + resource = wined3d_texture_get_resource(surface->wined3d_texture); + wined3d_resource_get_desc(resource, &resource_desc); + + desc.format_id = resource_desc.format; + desc.u.texture.level_idx = surface->sub_resource_idx; + desc.u.texture.layer_idx = 0; + desc.u.texture.layer_count = 1; + + if (FAILED(hr = wined3d_rendertarget_view_create(&desc, resource, surface, &d3d8_view_wined3d_parent_ops, &surface->wined3d_rtv))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_IASetPrimitiveTopology().
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 6d984251aff4f78c88f00343e2670be816961919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d984251aff4f78c88f00343e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 14 02:08:11 2015 +0200 d3d11: Implement d3d11_immediate_context_IASetPrimitiveTopology(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8a7a794..a06f3e6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -39,6 +39,12 @@ static inline struct d3d11_immediate_context *impl_from_ID3D11DeviceContext(ID3D return CONTAINING_RECORD(iface, struct d3d11_immediate_context, ID3D11DeviceContext_iface); } +static inline struct d3d_device *device_from_immediate_ID3D11DeviceContext(ID3D11DeviceContext *iface) +{ + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); + return CONTAINING_RECORD(context, struct d3d_device, immediate_context); +} + static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11DeviceContext *iface, REFIID riid, void **out) { @@ -249,7 +255,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface, D3D11_PRIMITIVE_TOPOLOGY topology) { - FIXME("iface %p, topology %u stub!\n", iface, topology); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, topology %u.\n", iface, topology); + + wined3d_mutex_lock(); + wined3d_device_set_primitive_type(device->wined3d_device, (enum wined3d_primitive_type)topology); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_IASetInputLayout().
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 5ff257f226361ae7c11f122a227da408c9516f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff257f226361ae7c11f122a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 14 02:08:12 2015 +0200 d3d11: Implement d3d11_immediate_context_IASetInputLayout(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 9 ++++++++- dlls/d3d11/inputlayout.c | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 02fa1dc..956ebf0 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -222,6 +222,7 @@ HRESULT d3d_input_layout_create(struct d3d_device *device, const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, struct d3d_input_layout **layout) DECLSPEC_HIDDEN; +struct d3d_input_layout *unsafe_impl_from_ID3D11InputLayout(ID3D11InputLayout *iface) DECLSPEC_HIDDEN; struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN; /* ID3D11VertexShader, ID3D10VertexShader */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a06f3e6..71ed27c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -202,7 +202,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11DeviceContext *iface, ID3D11InputLayout *input_layout) { - FIXME("iface %p, input_layout %p stub!\n", iface, input_layout); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_input_layout *layout = unsafe_impl_from_ID3D11InputLayout(input_layout); + + TRACE("iface %p, input_layout %p.\n", iface, input_layout); + + wined3d_mutex_lock(); + wined3d_device_set_vertex_declaration(device->wined3d_device, layout ? layout->wined3d_decl : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index bb98d30..d481dd2 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -379,6 +379,15 @@ HRESULT d3d_input_layout_create(struct d3d_device *device, return S_OK; } +struct d3d_input_layout *unsafe_impl_from_ID3D11InputLayout(ID3D11InputLayout *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_input_layout_vtbl); + + return impl_from_ID3D11InputLayout(iface); +} + struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Partially implement d3d11_immediate_context_VSSetShader().
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: d53c5020c3fd9a72ef89355f996906945f6ff77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53c5020c3fd9a72ef89355f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 14 02:08:13 2015 +0200 d3d11: Partially implement d3d11_immediate_context_VSSetShader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 12 +++++++++++- dlls/d3d11/shader.c | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 956ebf0..cd8a336 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -239,6 +239,7 @@ struct d3d_vertex_shader HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, struct d3d_vertex_shader **shader) DECLSPEC_HIDDEN; +struct d3d_vertex_shader *unsafe_impl_from_ID3D11VertexShader(ID3D11VertexShader *iface) DECLSPEC_HIDDEN; struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN; /* ID3D11GeometryShader, ID3D10GeometryShader */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 71ed27c..9736d96 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -159,8 +159,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceContext *iface, ID3D11VertexShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_vertex_shader *vs = unsafe_impl_from_ID3D11VertexShader(shader); + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances) + FIXME("Dynamic linking is not implemented yet.\n"); + + wined3d_mutex_lock(); + wined3d_device_set_vertex_shader(device->wined3d_device, vs ? vs->wined3d_shader : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 27083de..3778443 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -430,6 +430,15 @@ HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_cod return S_OK; } +struct d3d_vertex_shader *unsafe_impl_from_ID3D11VertexShader(ID3D11VertexShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_vertex_shader_vtbl); + + return impl_from_ID3D11VertexShader(iface); +} + struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Partially implement d3d11_immediate_context_PSSetShader().
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: acd78b54c015e82d4eab39f1e04ce9564414dbc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd78b54c015e82d4eab39f1e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 14 02:08:14 2015 +0200 d3d11: Partially implement d3d11_immediate_context_PSSetShader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 12 +++++++++++- dlls/d3d11/shader.c | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cd8a336..ce4f965 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -272,6 +272,7 @@ struct d3d_pixel_shader HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, struct d3d_pixel_shader **shader) DECLSPEC_HIDDEN; +struct d3d_pixel_shader *unsafe_impl_from_ID3D11PixelShader(ID3D11PixelShader *iface) DECLSPEC_HIDDEN; struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN; HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9736d96..4c310be 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -145,8 +145,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceContext *iface, ID3D11PixelShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_pixel_shader *ps = unsafe_impl_from_ID3D11PixelShader(shader); + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances) + FIXME("Dynamic linking is not implemented yet.\n"); + + wined3d_mutex_lock(); + wined3d_device_set_pixel_shader(device->wined3d_device, ps ? ps->wined3d_shader : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetSamplers(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 3778443..37ca7aa 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1066,6 +1066,15 @@ HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code return S_OK; } +struct d3d_pixel_shader *unsafe_impl_from_ID3D11PixelShader(ID3D11PixelShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_pixel_shader_vtbl); + + return impl_from_ID3D11PixelShader(iface); +} + struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) { if (!iface)

1 0