November 2015 - Wine-commits

Józef Kucia : d3d11: Implement d3d11_immediate_context_VSSetSamplers().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 099b7f549fd69997ca5d43cbc47f6ba0ae49d217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099b7f549fd69997ca5d43cbc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:42 2015 +0100 d3d11: Implement d3d11_immediate_context_VSSetSamplers(). 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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 32d5bb2..042fdd6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -442,8 +442,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler = unsafe_impl_from_ID3D11SamplerState(samplers[i]); + + wined3d_device_set_vs_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_Begin(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_GSSetSamplers().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 53751bcc5df7f33697f6e447d5f4254f31ef76e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53751bcc5df7f33697f6e447d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:43 2015 +0100 d3d11: Implement d3d11_immediate_context_GSSetSamplers(). 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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 042fdd6..8b59ee0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -508,8 +508,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler = unsafe_impl_from_ID3D11SamplerState(samplers[i]); + + wined3d_device_set_gs_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargets(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_RSGetState().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 73dba1a946e8d1e6808f4e1d695cb9b53a020b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73dba1a946e8d1e6808f4e1d6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:44 2015 +0100 d3d11: Implement d3d11_immediate_context_RSGetState(). 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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8b59ee0..fefeb60 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1148,7 +1148,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceC static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceContext *iface, ID3D11RasterizerState **rasterizer_state) { - FIXME("iface %p, rasterizer_state %p stub!\n", iface, rasterizer_state); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); + + if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D11RasterizerState_iface : NULL)) + ID3D11RasterizerState_AddRef(*rasterizer_state); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_IAGetInputLayout().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: e013179f9eba2e7db5ab138d67922c0a81f10eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e013179f9eba2e7db5ab138d6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:45 2015 +0100 d3d11: Implement d3d11_immediate_context_IAGetInputLayout(). 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 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index fefeb60..71408cf 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1029,7 +1029,24 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetInputLayout(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 wined3d_vertex_declaration *wined3d_declaration; + struct d3d_input_layout *input_layout_impl; + + TRACE("iface %p, input_layout %p.\n", iface, input_layout); + + wined3d_mutex_lock(); + if (!(wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + { + wined3d_mutex_unlock(); + *input_layout = NULL; + return; + } + + input_layout_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); + wined3d_mutex_unlock(); + *input_layout = &input_layout_impl->ID3D11InputLayout_iface; + ID3D11InputLayout_AddRef(*input_layout); } static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_SetPredication().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 8daf9a65f6c1a2465cfc6d74f5a49d67297562e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8daf9a65f6c1a2465cfc6d74f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:46 2015 +0100 d3d11: Implement d3d11_immediate_context_SetPredication(). 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/async.c | 8 ++++++++ dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 11 ++++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 1e96fb3..66640a2 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -163,6 +163,14 @@ static const struct ID3D11QueryVtbl d3d11_query_vtbl = d3d11_query_GetDesc, }; +struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_query_vtbl); + return CONTAINING_RECORD(iface, struct d3d_query, ID3D11Query_iface); +} + /* ID3D10Query methods */ static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 474943b..873e17d 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -372,6 +372,7 @@ struct d3d_query HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate, struct d3d_query **query) DECLSPEC_HIDDEN; +struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; /* ID3D11DeviceContext - immediate context */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 71408cf..8321593 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -483,7 +483,16 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11DeviceContext *iface, ID3D11Predicate *predicate, BOOL value) { - FIXME("iface %p, predicate %p, value %#x stub!\n", iface, predicate, value); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_query *query; + + TRACE("iface %p, predicate %p, value %#x.\n", iface, predicate, value); + + query = unsafe_impl_from_ID3D11Query((ID3D11Query *)predicate); + + wined3d_mutex_lock(); + wined3d_device_set_predication(device->wined3d_device, query ? query->wined3d_query : NULL, value); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_GetPredication().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: e427f6125bbfb155bca9bd1562053efcc1e01f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e427f6125bbfb155bca9bd156… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:47 2015 +0100 d3d11: Implement d3d11_immediate_context_GetPredication(). 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 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8321593..cca4e24 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1113,7 +1113,24 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_GetPredication(ID3D11DeviceContext *iface, ID3D11Predicate **predicate, BOOL *value) { - FIXME("iface %p, predicate %p, value %p stub!\n", iface, predicate, value); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_query *wined3d_predicate; + struct d3d_query *predicate_impl; + + TRACE("iface %p, predicate %p, value %p.\n", iface, predicate, value); + + wined3d_mutex_lock(); + if (!(wined3d_predicate = wined3d_device_get_predication(device->wined3d_device, value))) + { + wined3d_mutex_unlock(); + *predicate = NULL; + return; + } + + predicate_impl = wined3d_query_get_parent(wined3d_predicate); + wined3d_mutex_unlock(); + *predicate = (ID3D11Predicate *)&predicate_impl->ID3D11Query_iface; + ID3D11Predicate_AddRef(*predicate); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_VSGetSamplers().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: cf9f6473183e07c54941ba0dcfffb7d9939577b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9f6473183e07c54941ba0dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:48 2015 +0100 d3d11: Implement d3d11_immediate_context_VSGetSamplers(). 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 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cca4e24..4cdd126 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1106,8 +1106,29 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct wined3d_sampler *wined3d_sampler; + struct d3d_sampler_state *sampler_impl; + + if (!(wined3d_sampler = wined3d_device_get_vs_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + samplers[i] = &sampler_impl->ID3D11SamplerState_iface; + ID3D11SamplerState_AddRef(samplers[i]); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_GetPredication(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_PSGetSamplers().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 60112f42ad2f1ac019c3984ff018e185d8bb27ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=60112f42ad2f1ac019c3984ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:49 2015 +0100 d3d11: Implement d3d11_immediate_context_PSGetSamplers(). 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 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4cdd126..174754d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1017,8 +1017,29 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct wined3d_sampler *wined3d_sampler; + struct d3d_sampler_state *sampler_impl; + + if (!(wined3d_sampler = wined3d_device_get_ps_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + samplers[i] = &sampler_impl->ID3D11SamplerState_iface; + ID3D11SamplerState_AddRef(samplers[i]); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d10core/tests: Fix typo.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 773e3fc9931cfb41be3cfe080d77b2eb1ef0cd01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773e3fc9931cfb41be3cfe080… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:40:25 2015 +0100 d3d10core/tests: Fix typo. 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/d3d10core/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6c6d8bb..d6b6bfb 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2720,7 +2720,7 @@ float4 main(float4 color : COLOR) : SV_TARGET for (i = 0; i < D3D10_SO_BUFFER_SLOT_COUNT; ++i) { ok(tmp_buffer[i] == so_buffer[i], "Got unexpected stream output %p in slot %u, expected %p.\n", - tmp_buffer[i], i, buffer[i]); + tmp_buffer[i], i, so_buffer[i]); ID3D10Buffer_Release(tmp_buffer[i]); todo_wine ok(offset[i] == ~0u, "Got unexpected stream output offset %u in slot %u.\n", offset[i], i); }

1 0

Hans Leidekker : maintainers: Add Web Services, Windows Management Instrumentation and WinHTTP sections.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: e86470d426ae472f10fb1e06f374d8590d6be690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86470d426ae472f10fb1e06f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:33 2015 +0100 maintainers: Add Web Services, Windows Management Instrumentation and WinHTTP sections. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 19c390d..bb55d55 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -203,11 +203,21 @@ Uniscribe M: Aric Stewart <aric(a)codeweavers.com> F: dlls/usp10/ +Web Services +M: Hans Leidekker <hans(a)codeweavers.com> +F: dlls/webservices/ + Windows Imaging Component M: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/windowscodecs/ F: dlls/windowscodecsext/ +Windows Management Instrumentation +M: Hans Leidekker <hans(a)codeweavers.com> +F: dlls/wbemdisp/ +F: dlls/wbemprox/ +F: dlls/wmiutils/ + Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> P: Sebastian Lackner <sebastian(a)fds-team.de> @@ -217,6 +227,10 @@ Winemaker M: André Hentschel <nerv(a)dawncrow.de> F: tools/winemaker +WinHTTP +M: Hans Leidekker <hans(a)codeweavers.com> +F: dlls/winhttp/ + WPcap M: André Hentschel <nerv(a)dawncrow.de> F: dlls/wpcap/

1 0