March 2016 - Wine-Commits - list.winehq.org

Matteo Bruni : d3d11/tests: Add a feature_level parameter to init_test_context().
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: dd72b43ae5db6d61f227ad38d9f595f7a3e131f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd72b43ae5db6d61f227ad38d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 16 00:24:12 2016 +0100 d3d11/tests: Add a feature_level parameter to init_test_context(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 636bec9..4982ebc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -320,15 +320,16 @@ struct d3d11_test_context ID3D11Buffer *vb; }; -#define init_test_context(c) init_test_context_(__LINE__, c) -static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *context) +#define init_test_context(c, l) init_test_context_(__LINE__, c, l) +static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *context, + const D3D_FEATURE_LEVEL *feature_level) { D3D11_VIEWPORT vp; HRESULT hr; memset(context, 0, sizeof(*context)); - if (!(context->device = create_device(NULL))) + if (!(context->device = create_device(feature_level))) { skip_(__FILE__, line)("Failed to create device.\n"); return FALSE; @@ -3187,7 +3188,7 @@ static void test_blend(void) static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -3756,7 +3757,7 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 2.0f, 2.0f, 2.0f, 9.0f, level_2_colors}, }; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -4109,7 +4110,7 @@ static void test_scissor(void) 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -4309,7 +4310,7 @@ static void test_il_append_aligned(void) }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -4445,7 +4446,7 @@ static void test_fragment_coords(void) static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; struct vec4 cutoff = {320.0f, 240.0f, 0.0f, 0.0f}; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -4577,7 +4578,7 @@ static void test_update_subresource(void) 0xff000000, 0xff7f7f7f, 0xffffffff, 0x00000000, }; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -4746,7 +4747,7 @@ static void test_copy_subresource_region(void) 0xffffffff, 0xffffffff, 0xff000000, 0x00000000, }; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -5014,7 +5015,7 @@ static void test_multisample_init(void) UINT count = 0; HRESULT hr; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device;

1 0

Sebastian Lackner : services: Pass a process argument to wait_for_startup function.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: ed54b881738c616674d7025b32f704a159decd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed54b881738c616674d7025b3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:33:09 2016 +0100 services: Pass a process argument to wait_for_startup function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 47 ++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 325e7f3..8f53e7e 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -714,7 +714,7 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry, return ERROR_SUCCESS; } -static DWORD service_start_process(struct service_entry *service_entry, HANDLE *process) +static DWORD service_start_process(struct service_entry *service_entry) { PROCESS_INFORMATION pi; STARTUPINFOW si; @@ -765,37 +765,30 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * service_entry->status.dwProcessId = pi.dwProcessId; service_entry->process->process = pi.hProcess; - *process = pi.hProcess; CloseHandle( pi.hThread ); return ERROR_SUCCESS; } -static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDLE process_handle) +static DWORD process_wait_for_startup(struct process_entry *process) { - HANDLE handles[2] = { service_entry->process->status_changed_event, process_handle }; - DWORD state, ret; - - WINE_TRACE("%p\n", service_entry); + HANDLE handles[2] = { process->status_changed_event, process->process }; + DWORD ret; ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); - if (ret != WAIT_OBJECT_0) - return ERROR_SERVICE_REQUEST_TIMEOUT; - service_lock(service_entry); - state = service_entry->status.dwCurrentState; - service_unlock(service_entry); - if (state == SERVICE_START_PENDING) - { - WINE_TRACE("Service state changed to SERVICE_START_PENDING\n"); - return ERROR_SUCCESS; - } - else if (state == SERVICE_RUNNING) - { - WINE_TRACE("Service started successfully\n"); - return ERROR_SUCCESS; - } + return (ret == WAIT_OBJECT_0) ? ERROR_SUCCESS : ERROR_SERVICE_REQUEST_TIMEOUT; +} + +static DWORD service_is_running(struct service_entry *service) +{ + DWORD state; + + service_lock(service); + state = service->status.dwCurrentState; + service_unlock(service); - return ERROR_SERVICE_REQUEST_TIMEOUT; + return (state == SERVICE_START_PENDING || state == SERVICE_RUNNING) ? + ERROR_SUCCESS : ERROR_SERVICE_REQUEST_TIMEOUT; } /****************************************************************************** @@ -874,7 +867,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * struct process_entry *process = service->process; DWORD err; LPWSTR name; - HANDLE process_handle = NULL; err = scmdatabase_lock_startup(service->db); if (err != ERROR_SUCCESS) @@ -907,7 +899,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * } else { - err = service_start_process(service, &process_handle); + err = service_start_process(service); if (err == ERROR_SUCCESS) { if (!process_send_start_message(process, service->name, service_argv, service_argc)) @@ -915,7 +907,10 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * } if (err == ERROR_SUCCESS) - err = service_wait_for_startup(service, process_handle); + err = process_wait_for_startup(process); + + if (err == ERROR_SUCCESS) + err = service_is_running(service); } if (err == ERROR_SUCCESS)

1 0

Sebastian Lackner : services: Pass a process argument to send_control function.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: fa593d4d87ca2938ef706a5a782744e38738eae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa593d4d87ca2938ef706a5a7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:32:34 2016 +0100 services: Pass a process argument to send_control function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index cdac948..59bbe7f 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1035,25 +1035,25 @@ BOOL process_send_command(struct process_entry *process, const void *data, DWORD } /****************************************************************************** - * service_send_control + * process_send_control */ -static BOOL service_send_control(struct service_entry *service, DWORD dwControl, DWORD *result) +static BOOL process_send_control(struct process_entry *process, const WCHAR *name, DWORD dwControl, DWORD *result) { service_start_info *ssi; DWORD len; BOOL r; /* calculate how much space we need to send the startup info */ - len = strlenW(service->name) + 1; + len = strlenW(name) + 1; ssi = HeapAlloc(GetProcessHeap(),0,FIELD_OFFSET(service_start_info, data[len])); ssi->cmd = WINESERV_SENDCONTROL; ssi->control = dwControl; ssi->total_size = FIELD_OFFSET(service_start_info, data[len]); - ssi->name_size = strlenW(service->name) + 1; - strcpyW( ssi->data, service->name ); + ssi->name_size = strlenW(name) + 1; + strcpyW(ssi->data, name); - r = process_send_command(service->process, ssi, ssi->total_size, result); + r = process_send_command(process, ssi, ssi->total_size, result); HeapFree( GetProcessHeap(), 0, ssi ); return r; } @@ -1176,7 +1176,7 @@ DWORD __cdecl svcctl_ControlService( if (ret != WAIT_OBJECT_0) return ERROR_SERVICE_REQUEST_TIMEOUT; - service_send_control(service->service_entry, dwControl, &result); + process_send_control(service->service_entry->process, service->service_entry->name, dwControl, &result); if (lpServiceStatus) {

1 0

Józef Kucia : d3d11: Introduce debug_float4().
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: bd332f53f2d7b618e313572159cd7e70e4efb0fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd332f53f2d7b618e31357215… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:40 2016 +0100 d3d11: Introduce debug_float4(). 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 | 33 ++++++++++++++++----------------- dlls/d3d11/utils.c | 8 ++++++++ 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 0d2a162..80a16f3 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -60,6 +60,7 @@ extern const struct wined3d_parent_ops d3d_null_wined3d_parent_ops DECLSPEC_HIDD /* TRACE helper functions */ const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology) DECLSPEC_HIDDEN; const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +const char *debug_float4(const float *values) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a454261..5498c8b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -603,21 +603,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord } static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11DeviceContext *iface, - ID3D11BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) + ID3D11BlendState *blend_state, const float blend_factor[4], UINT sample_mask) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; const D3D11_BLEND_DESC *desc; - TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask 0x%08x.\n", - iface, blend_state, blend_factor, sample_mask); + TRACE("iface %p, blend_state %p, blend_factor %s, sample_mask 0x%08x.\n", + iface, blend_state, debug_float4(blend_factor), sample_mask); if (!blend_factor) blend_factor = default_blend_factor; if (blend_factor[0] != 1.0f || blend_factor[1] != 1.0f || blend_factor[2] != 1.0f || blend_factor[3] != 1.0f) - FIXME("Ignoring blend factor {%.8e %.8e %.8e %.8e}.\n", - blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); + FIXME("Ignoring blend factor %s.\n", debug_float4(blend_factor)); wined3d_mutex_lock(); memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); @@ -946,15 +945,15 @@ 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]) + ID3D11RenderTargetView *render_target_view, const float color_rgba[4]) { 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]); + TRACE("iface %p, render_target_view %p, color_rgba %s.\n", + iface, render_target_view, debug_float4(color_rgba)); wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, @@ -971,10 +970,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUi } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewFloat(ID3D11DeviceContext *iface, - ID3D11UnorderedAccessView *unordered_access_view, const FLOAT values[4]) + ID3D11UnorderedAccessView *unordered_access_view, const float values[4]) { - FIXME("iface %p, unordered_access_view %p, values {%.8e %.8e %.8e %.8e} stub!\n", - iface, unordered_access_view, values[0], values[1], values[2], values[3]); + 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, @@ -3202,13 +3201,13 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device1 *ifa } static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, - ID3D10BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) + ID3D10BlendState *blend_state, const float blend_factor[4], UINT sample_mask) { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_blend_state *blend_state_object; - TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask 0x%08x.\n", - iface, blend_state, blend_factor, sample_mask); + TRACE("iface %p, blend_state %p, blend_factor %s, sample_mask 0x%08x.\n", + 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, @@ -3378,15 +3377,15 @@ static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device1 *ifac } static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 *iface, - ID3D10RenderTargetView *render_target_view, const FLOAT color_rgba[4]) + ID3D10RenderTargetView *render_target_view, const float color_rgba[4]) { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_rendertarget_view *view = unsafe_impl_from_ID3D10RenderTargetView(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]); + TRACE("iface %p, render_target_view %p, color_rgba %s.\n", + iface, render_target_view, debug_float4(color_rgba)); wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 6d50de5..6473722 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -154,6 +154,14 @@ const char *debug_dxgi_format(DXGI_FORMAT format) #undef WINE_D3D_TO_STR +const char *debug_float4(const float *values) +{ + if (!values) + return "(null)"; + return wine_dbg_sprintf("{%.8e, %.8e, %.8e, %.8e}", + values[0], values[1], values[2], values[3]); +} + DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) { switch(format)

1 0

Józef Kucia : d3d11: Forward d3d10_device_OMSetDepthStencilState() to d3d11_immediate_context_OMSetDepthStencilState().
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 36c8209a58393ebcaa29fa013df1d2e9e1eb0934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c8209a58393ebcaa29fa013… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:39 2016 +0100 d3d11: Forward d3d10_device_OMSetDepthStencilState() to d3d11_immediate_context_OMSetDepthStencilState(). 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ef4a7f4..a454261 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3219,12 +3219,14 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device1 ID3D10DepthStencilState *depth_stencil_state, UINT stencil_ref) { struct d3d_device *device = impl_from_ID3D10Device(iface); + struct d3d_depthstencil_state *ds_state_object; TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", iface, depth_stencil_state, stencil_ref); - device->depth_stencil_state = unsafe_impl_from_ID3D10DepthStencilState(depth_stencil_state); - device->stencil_ref = stencil_ref; + ds_state_object = unsafe_impl_from_ID3D10DepthStencilState(depth_stencil_state); + d3d11_immediate_context_OMSetDepthStencilState(&device->immediate_context.ID3D11DeviceContext_iface, + ds_state_object ? &ds_state_object->ID3D11DepthStencilState_iface : NULL, stencil_ref); } static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device1 *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMSetDepthStencilState().
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 46ba44dcb1985def29ffaf4eb0a4a36b9840f467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ba44dcb1985def29ffaf4eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:38 2016 +0100 d3d11: Implement d3d11_immediate_context_OMSetDepthStencilState(). 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 | 2 ++ dlls/d3d11/device.c | 50 +++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d11/state.c | 9 +++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index a83a754..0d2a162 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -319,6 +319,8 @@ struct d3d_depthstencil_state HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN; +struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState( + ID3D11DepthStencilState *iface) DECLSPEC_HIDDEN; struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8e29303..ef4a7f4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -670,7 +670,55 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3D11DeviceContext *iface, ID3D11DepthStencilState *depth_stencil_state, UINT stencil_ref) { - FIXME("iface %p, depth_stencil_state %p, stencil_ref %u stub!\n", iface, depth_stencil_state, stencil_ref); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + const D3D11_DEPTH_STENCILOP_DESC *stencil_desc; + const D3D11_DEPTH_STENCIL_DESC *desc; + + TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", + iface, depth_stencil_state, stencil_ref); + + wined3d_mutex_lock(); + device->stencil_ref = stencil_ref; + if (!(device->depth_stencil_state = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, TRUE); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZWRITEENABLE, D3D11_DEPTH_WRITE_MASK_ALL); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZFUNC, D3D11_COMPARISON_LESS); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILENABLE, FALSE); + wined3d_mutex_unlock(); + return; + } + + desc = &device->depth_stencil_state->desc; + + if (desc->FrontFace.StencilFailOp != desc->BackFace.StencilFailOp + || desc->FrontFace.StencilDepthFailOp != desc->BackFace.StencilDepthFailOp + || desc->FrontFace.StencilPassOp != desc->BackFace.StencilPassOp + || desc->FrontFace.StencilFunc != desc->BackFace.StencilFunc) + FIXME("Two-sided stencil testing not supported.\n"); + + stencil_desc = &desc->FrontFace; + + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, desc->DepthEnable); + if (desc->DepthEnable) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZWRITEENABLE, desc->DepthWriteMask); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZFUNC, desc->DepthFunc); + } + + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILENABLE, desc->StencilEnable); + if (desc->StencilEnable) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILMASK, desc->StencilReadMask); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILWRITEMASK, desc->StencilWriteMask); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILFAIL, stencil_desc->StencilFailOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILZFAIL, + stencil_desc->StencilDepthFailOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILPASS, stencil_desc->StencilPassOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILFUNC, stencil_desc->StencilFunc); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILREF, stencil_ref); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 2fc0297..665d142 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -597,6 +597,15 @@ HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct return S_OK; } +struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_depthstencil_state_vtbl); + + return impl_from_ID3D11DepthStencilState(iface); +} + struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Fill unused fields in D3D11_DEPTH_STENCIL_DESC with default values.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 6848a32c3d7c8669385089898b01ab914efd0864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6848a32c3d7c8669385089898… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:35 2016 +0100 d3d11: Fill unused fields in D3D11_DEPTH_STENCIL_DESC with default values. 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 | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 845a33e..8e29303 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2233,13 +2233,37 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Devi * it as a key in the rbtree. */ memset(&tmp_desc, 0, sizeof(tmp_desc)); tmp_desc.DepthEnable = desc->DepthEnable; - tmp_desc.DepthWriteMask = desc->DepthWriteMask; - tmp_desc.DepthFunc = desc->DepthFunc; + if (desc->DepthEnable) + { + tmp_desc.DepthWriteMask = desc->DepthWriteMask; + tmp_desc.DepthFunc = desc->DepthFunc; + } + else + { + tmp_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; + tmp_desc.DepthFunc = D3D11_COMPARISON_LESS; + } tmp_desc.StencilEnable = desc->StencilEnable; - tmp_desc.StencilReadMask = desc->StencilReadMask; - tmp_desc.StencilWriteMask = desc->StencilWriteMask; - tmp_desc.FrontFace = desc->FrontFace; - tmp_desc.BackFace = desc->BackFace; + if (desc->StencilEnable) + { + tmp_desc.StencilReadMask = desc->StencilReadMask; + tmp_desc.StencilWriteMask = desc->StencilWriteMask; + tmp_desc.FrontFace = desc->FrontFace; + tmp_desc.BackFace = desc->BackFace; + } + else + { + tmp_desc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK; + tmp_desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK; + tmp_desc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilFunc = D3D11_COMPARISON_ALWAYS; + tmp_desc.BackFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS; + } wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->depthstencil_states, &tmp_desc)))

1 0

Sebastian Lackner : ieframe: Fix implementation of impl_from_ITargetFrame2.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 68c36efd18a62f8759c4d086a99272ec8c9d0278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c36efd18a62f8759c4d086a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:36:36 2016 +0100 ieframe: Fix implementation of impl_from_ITargetFrame2. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 1027313eb..88bc7e6 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1243,7 +1243,7 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = { static inline HlinkFrame *impl_from_ITargetFrame2(ITargetFrame2 *iface) { - return CONTAINING_RECORD(iface, HlinkFrame, IHlinkFrame_iface); + return CONTAINING_RECORD(iface, HlinkFrame, ITargetFrame2_iface); } static HRESULT WINAPI TargetFrame2_QueryInterface(ITargetFrame2 *iface, REFIID riid, void **ppv)

1 0

Matteo Bruni : d3d11/tests: Test relative addressing in constant buffers.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 3a8d3fb13cffb9815e826f9b9f123cc093d3924c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8d3fb13cffb9815e826f9b9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 16 00:24:13 2016 +0100 d3d11/tests: Test relative addressing in constant buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4982ebc..81cb87f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5208,6 +5208,204 @@ static void test_clear_depth_stencil_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_cb_relative_addressing(void) +{ + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + ID3D11Buffer *colors_cb, *index_cb; + unsigned int i, index[4] = {0}; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + DWORD color; + HRESULT hr; + + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 +int color_index; + +cbuffer colors +{ + float4 colors[8]; +}; + +struct vs_in +{ + float4 position : POSITION; +}; + +struct vs_out +{ + float4 position : SV_POSITION; + float4 color : COLOR; +}; + +vs_out main(const vs_in v) +{ + vs_out o; + + o.position = v.position; + o.color = colors[color_index]; + + return o; +} +#endif + 0x43425844, 0xc2eb30bf, 0x2868c855, 0xaa34b609, 0x1f4957d4, 0x00000001, 0x00000164, 0x00000003, + 0x0000002c, 0x00000060, 0x000000b4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x58454853, 0x000000a8, 0x00010050, + 0x0000002a, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000859, 0x00208e46, + 0x00000001, 0x00000008, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x06000036, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x07000036, 0x001020f2, 0x00000001, 0x04208e46, 0x00000001, 0x0010000a, 0x00000000, + 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 +struct ps_in +{ + float4 position : SV_POSITION; + float4 color : COLOR; +}; + +float4 main(const ps_in v) : SV_TARGET +{ + return v.color; +} +#endif + 0x43425844, 0x1a6def50, 0x9c069300, 0x7cce68f0, 0x621239b9, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x0000003c, 0x00000050, + 0x0000000f, 0x0100086a, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const struct + { + struct vec2 position; + } + quad[] = + { + {{-1.0f, -1.0f}}, + {{-1.0f, 1.0f}}, + {{ 1.0f, -1.0f}}, + {{ 1.0f, 1.0f}}, + }; + static const struct + { + float color[4]; + } + colors[10] = + { + {{0.0f, 0.0f, 0.0f, 1.0f}}, + {{0.0f, 0.0f, 1.0f, 0.0f}}, + {{0.0f, 0.0f, 1.0f, 1.0f}}, + {{0.0f, 1.0f, 0.0f, 0.0f}}, + {{0.0f, 1.0f, 0.0f, 1.0f}}, + {{0.0f, 1.0f, 1.0f, 0.0f}}, + {{0.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 0.0f, 0.0f, 0.0f}}, + {{1.0f, 0.0f, 0.0f, 1.0f}}, + {{1.0f, 0.0f, 1.0f, 0.0f}}, + }; + static const struct + { + unsigned int index; + DWORD expected; + } + test_data[] = + { + {0, 0xff000000}, + {1, 0x00ff0000}, + {2, 0xffff0000}, + {3, 0x0000ff00}, + {4, 0xff00ff00}, + {5, 0x00ffff00}, + {6, 0xffffff00}, + {7, 0x000000ff}, + + {8, 0xff0000ff}, + {9, 0x00ff00ff}, + }; + static const float white_color[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &test_context.vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(colors); + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + resource_data.pSysMem = &colors; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &colors_cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(index); + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &index_cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &test_context.vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_VSSetConstantBuffers(context, 0, 1, &index_cb); + ID3D11DeviceContext_VSSetConstantBuffers(context, 1, 1, &colors_cb); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + { + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white_color); + + index[0] = test_data[i].index; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)index_cb, 0, NULL, &index, 0, 0); + + draw_quad(&test_context); + + color = get_texture_color(test_context.backbuffer, 319, 239); + ok(compare_color(color, test_data[i].expected, 1), + "Got unexpected color 0x%08x for index %u.\n", color, test_data[i].index); + } + + ID3D11Buffer_Release(index_cb); + ID3D11Buffer_Release(colors_cb); + ID3D11PixelShader_Release(ps); + + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -5242,4 +5440,5 @@ START_TEST(d3d11) test_multisample_init(); test_check_multisample_quality_levels(); test_clear_depth_stencil_view(); + test_cb_relative_addressing(); }

1 0

Sebastian Lackner : setupapi: Fix parsing of inf files containing garbage at the beginning of the file.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: e8aa851fe438a2c5e254879fe6170df7866b98c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8aa851fe438a2c5e254879fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 05:34:14 2016 +0100 setupapi: Fix parsing of inf files containing garbage at the beginning of the file. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 14 +++++++++++++- dlls/setupapi/tests/parser.c | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index e8c8fd3..5cc3ef5 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -114,6 +114,7 @@ struct parser int cur_section; /* index of section being parsed*/ struct line *line; /* current line */ unsigned int line_pos; /* current line position in file */ + unsigned int broken_line; /* first line containing invalid data (if any) */ unsigned int error; /* error code */ unsigned int token_len; /* current token len */ WCHAR token[MAX_FIELD_LEN+1]; /* current token */ @@ -600,12 +601,15 @@ static const WCHAR *line_start_state( struct parser *parser, const WCHAR *pos ) set_state( parser, SECTION_NAME ); return p + 1; default: - if (!isspaceW(*p)) + if (isspaceW(*p)) break; + if (parser->cur_section != -1) { parser->start = p; set_state( parser, KEY_NAME ); return p; } + if (!parser->broken_line) + parser->broken_line = parser->line_pos; break; } } @@ -886,6 +890,7 @@ static DWORD parse_buffer( struct inf_file *file, const WCHAR *buffer, const WCH parser.stack_pos = 0; parser.cur_section = -1; parser.line_pos = 1; + parser.broken_line = 0; parser.error = 0; parser.token_len = 0; @@ -916,6 +921,13 @@ static DWORD parse_buffer( struct inf_file *file, const WCHAR *buffer, const WCH /* find the [strings] section */ file->strings_section = find_section( file, Strings ); + + if (file->strings_section == -1 && parser.broken_line) + { + if (error_line) *error_line = parser.broken_line; + return ERROR_EXPECTED_SECTION_NAME; + } + return 0; } diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index f929f01..67c9887 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -133,6 +133,18 @@ static const struct { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { "garbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { "garbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { ";comment\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { ";comment\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { " \t\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { " \t\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { "garbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { "garbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, + { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, + { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, }; static void test_invalid_files(void)

1 0