wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Stefan Dösinger : d3d8: Call IDirect3DSwapChain8:: Present in IDirect3DDevice8::Present.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 20d5be042c577b8dfcca431fa4688cad192196df URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d5be042c577b8dfcca431fa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 14 11:09:55 2015 +0200 d3d8: Call IDirect3DSwapChain8::Present in IDirect3DDevice8::Present. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 4 ++++ dlls/d3d8/device.c | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 3069487..9a5de92 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -176,6 +176,10 @@ struct d3d8_device LONG device_state; /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; + + /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, + * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ + struct d3d8_swapchain *implicit_swapchain; }; HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0648f51..20ce900 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -705,20 +705,17 @@ static HRESULT WINAPI d3d8_device_Present(IDirect3DDevice8 *iface, const RECT *s const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); - if (device->device_state != D3D8_DEVICE_STATE_OK) - return D3DERR_DEVICELOST; - - wined3d_mutex_lock(); - hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, - dst_window_override, dirty_region, 0); - wined3d_mutex_unlock(); - - return hr; + /* Fraps does not hook IDirect3DDevice8::Present regardless of the hotpatch + * attribute. It only hooks IDirect3DSwapChain8::Present. Yet it properly + * shows a framerate on Windows in applications that only call the device + * method, like e.g. the dx8 sdk samples. The conclusion is that native + * calls the swapchain's public method from the device. */ + return IDirect3DSwapChain8_Present(&device->implicit_swapchain->IDirect3DSwapChain8_iface, + src_rect, dst_rect, dst_window_override, dirty_region); } static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, @@ -3114,6 +3111,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) { struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_swapchain *wined3d_swapchain; HRESULT hr; device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; @@ -3200,6 +3198,9 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine goto err; } + wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0); + device->implicit_swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + device->d3d_parent = &parent->IDirect3D8_iface; IDirect3D8_AddRef(device->d3d_parent);

1 0

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

15 Oct '15

Module: wine Branch: master Commit: 3b54ec6a344f7d7216eae2204b455770b06eb2c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b54ec6a344f7d7216eae2204… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 14 02:08:16 2015 +0200 d3d11: Implement d3d11_immediate_context_DrawInstanced(). 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 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e757169..5f1ab7e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -259,10 +259,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11DeviceContext *iface, UINT instance_vertex_count, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) { - FIXME("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, " - "start_instance_location %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, " + "start_instance_location %u.\n", iface, instance_vertex_count, instance_count, start_vertex_location, start_instance_location); + + wined3d_mutex_lock(); + wined3d_device_draw_primitive_instanced(device->wined3d_device, start_vertex_location, + instance_vertex_count, start_instance_location, instance_count); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D11DeviceContext *iface,

1 0

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

15 Oct '15

Module: wine Branch: master Commit: 1b9ce7671e93416d119a8f8cf8af07f33469c021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9ce7671e93416d119a8f8cf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 14 02:08:15 2015 +0200 d3d11: Implement d3d11_immediate_context_ClearRenderTargetView(). 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/view.c | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index ce4f965..c28359e 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -186,6 +186,7 @@ struct d3d_rendertarget_view HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc, struct d3d_rendertarget_view **view) DECLSPEC_HIDDEN; +struct d3d_rendertarget_view *unsafe_impl_from_ID3D11RenderTargetView(ID3D11RenderTargetView *iface) DECLSPEC_HIDDEN; struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; /* ID3D11ShaderResourceView, ID3D10ShaderResourceView */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4c310be..e757169 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -467,8 +467,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D11DeviceContext *iface, ID3D11RenderTargetView *render_target_view, const FLOAT color_rgba[4]) { - FIXME("iface %p, render_target_view %p, color_rgba {%.8e %.8e %.8e %.8e} stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(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; + + TRACE("iface %p, render_target_view %p, color_rgba {%.8e %.8e %.8e %.8e}.\n", iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, &color))) + ERR("Failed to clear view, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUint(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index ce33749..f3769b5 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1169,6 +1169,15 @@ HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource * return S_OK; } +struct d3d_rendertarget_view *unsafe_impl_from_ID3D11RenderTargetView(ID3D11RenderTargetView *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_rendertarget_view_vtbl); + + return impl_from_ID3D11RenderTargetView(iface); +} + struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *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

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: 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: 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

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

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

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

← Newer
1
...
32
33
34
35
36
37
38
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015