February 2017 - Wine-commits

Józef Kucia : wined3d: Implement dcl_thread_group instruction.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 772370d3aae3263882d86ab407f6d6095cf0f491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772370d3aae3263882d86ab40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:34 2017 +0100 wined3d: Implement dcl_thread_group instruction. GLSL 1.30 is not enough for layout qualifiers. 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/wined3d/glsl_shader.c | 10 ++++++++-- dlls/wined3d/shader.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 6 ++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2778a9f..cac8749 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -353,7 +353,8 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_version *version) { - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] + || (version && version->type == WINED3D_SHADER_TYPE_COMPUTE)) return 150; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4) return 130; @@ -6584,6 +6585,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, const struct wined3d_shader *shader) { + const struct wined3d_shader_thread_group_size *thread_group_size = &shader->u.cs.thread_group_size; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_gl_info *gl_info = context->gl_info; const DWORD *function = shader->function; @@ -6601,6 +6603,10 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.string_buffers = string_buffers; shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + + shader_addline(buffer, "layout(local_size_x = %u, local_size_y = %u, local_size_z = %u) in;\n", + thread_group_size->x, thread_group_size->y, thread_group_size->z); + shader_addline(buffer, "void main()\n{\n"); shader_generate_main(shader, buffer, reg_maps, function, &priv_ctx); shader_addline(buffer, "}\n"); @@ -9203,7 +9209,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, - /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, + /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_RAW */ NULL, /* WINED3DSIH_DCL_UAV_STRUCTURED */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 490c985..814da17 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1033,6 +1033,18 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { reg_maps->temporary_count = ins.declaration.count; } + else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) + { + if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) + { + shader->u.cs.thread_group_size = ins.declaration.thread_group_size; + } + else + { + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index acd822e..81061cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3560,6 +3560,11 @@ struct wined3d_pixel_shader DWORD color0_reg; }; +struct wined3d_compute_shader +{ + struct wined3d_shader_thread_group_size thread_group_size; +}; + struct wined3d_shader { LONG ref; @@ -3597,6 +3602,7 @@ struct wined3d_shader struct wined3d_vertex_shader vs; struct wined3d_geometry_shader gs; struct wined3d_pixel_shader ps; + struct wined3d_compute_shader cs; } u; };

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_Dispatch().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: cb51abec90d723dd0ae2784f91903b3ceb7e3028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb51abec90d723dd0ae2784f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:35 2017 +0100 d3d11: Implement d3d11_immediate_context_Dispatch(). 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 | 9 ++++++++- dlls/d3d11/tests/d3d11.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 167fd78..731a0e1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -859,8 +859,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceContext *iface, UINT thread_group_count_x, UINT thread_group_count_y, UINT thread_group_count_z) { - FIXME("iface %p, thread_group_count_x %u, thread_group_count_y %u, thread_group_count_z %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, thread_group_count_x %u, thread_group_count_y %u, thread_group_count_z %u.\n", iface, thread_group_count_x, thread_group_count_y, thread_group_count_z); + + wined3d_mutex_lock(); + wined3d_device_dispatch_compute(device->wined3d_device, + thread_group_count_x, thread_group_count_y, thread_group_count_z); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DispatchIndirect(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index da5b02c..eec7ff5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12536,12 +12536,12 @@ static void test_cs_uav_store(void) ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 1.0f, 2); + check_texture_float(texture, 1.0f, 2); input.x = 0.5f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 0.5f, 2); + check_texture_float(texture, 0.5f, 2); ID3D11ComputeShader_Release(cs); @@ -12549,19 +12549,19 @@ static void test_cs_uav_store(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_CSSetShader(context, NULL, NULL, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 0.5f, 2); + check_texture_float(texture, 0.5f, 2); hr = ID3D11Device_CreateComputeShader(device, cs_1_group_code, sizeof(cs_1_group_code), NULL, &cs); ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 2.0f, 2); + check_texture_float(texture, 2.0f, 2); input.x = 4.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 4.0f, 2); + check_texture_float(texture, 4.0f, 2); ID3D11ComputeShader_Release(cs); @@ -12572,17 +12572,17 @@ static void test_cs_uav_store(void) input.x = 1.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, texture_desc.Width, texture_desc.Height, 1); - todo_wine check_texture_float(texture, 1.0f, 2); + check_texture_float(texture, 1.0f, 2); input.x = 0.5f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 16, 32, 1); SetRect(&rect, 0, 0, 16, 32); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 0.5f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 0.5f, 2); SetRect(&rect, 0, 32, texture_desc.Width, texture_desc.Height); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); SetRect(&rect, 16, 0, texture_desc.Width, texture_desc.Height); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); ID3D11ComputeShader_Release(cs); @@ -12594,16 +12594,16 @@ static void test_cs_uav_store(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 15, 15, 1); SetRect(&rect, 0, 0, 60, 60); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 0.6f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 0.6f, 2); SetRect(&rect, 0, 60, texture_desc.Width, texture_desc.Height); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); SetRect(&rect, 60, 0, texture_desc.Width, texture_desc.Height); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); input.x = 0.7f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 16, 16, 1); - todo_wine check_texture_float(texture, 0.7f, 2); + check_texture_float(texture, 0.7f, 2); ID3D11ComputeShader_Release(cs); @@ -12614,12 +12614,12 @@ static void test_cs_uav_store(void) input.x = 0.3f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 0.3f, 2); + check_texture_float(texture, 0.3f, 2); input.x = 0.1f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 2, 2, 2); - todo_wine check_texture_float(texture, 0.1f, 2); + check_texture_float(texture, 0.1f, 2); ID3D11ComputeShader_Release(cs); @@ -12772,21 +12772,21 @@ static void test_ps_cs_uav_binding(void) ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(cs_texture, 1.0f, 2); + check_texture_float(cs_texture, 1.0f, 2); check_texture_float(ps_texture, 0.0f, 2); draw_quad(&test_context); - todo_wine check_texture_float(cs_texture, 1.0f, 2); + check_texture_float(cs_texture, 1.0f, 2); check_texture_float(ps_texture, 1.0f, 2); input.x = 0.5f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(cs_texture, 0.5f, 2); + check_texture_float(cs_texture, 0.5f, 2); check_texture_float(ps_texture, 1.0f, 2); input.x = 2.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); draw_quad(&test_context); - todo_wine check_texture_float(cs_texture, 0.5f, 2); + check_texture_float(cs_texture, 0.5f, 2); check_texture_float(ps_texture, 2.0f, 2); input.x = 8.0f; @@ -12794,10 +12794,10 @@ static void test_ps_cs_uav_binding(void) input.x = 4.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(cs_texture, 8.0f, 2); + check_texture_float(cs_texture, 8.0f, 2); check_texture_float(ps_texture, 2.0f, 2); draw_quad(&test_context); - todo_wine check_texture_float(cs_texture, 8.0f, 2); + check_texture_float(cs_texture, 8.0f, 2); check_texture_float(ps_texture, 4.0f, 2); ID3D11ComputeShader_Release(cs);

1 0

Józef Kucia : wined3d: Merge WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW and WINED3D_CS_OP_SET_COMPUTE_UAV.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 572aa0e0ea3ac020308ee0766ad956cc4651b70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=572aa0e0ea3ac020308ee0766… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:36 2017 +0100 wined3d: Merge WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW and WINED3D_CS_OP_SET_COMPUTE_UAV. 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/wined3d/context.c | 6 +++-- dlls/wined3d/cs.c | 51 +++++++++--------------------------------- dlls/wined3d/device.c | 40 ++++++++++++--------------------- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 16 ++++++------- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 24 ++++++++++++-------- 7 files changed, 55 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=572aa0e0ea3ac020308ee…

1 0

Huw Davies : wbemdisp: Implement ISWbemObjectSet::ItemIndex.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 61f0bda129d24bdae6bec8e64f8f4fcc7203e4ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f0bda129d24bdae6bec8e64… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 9 12:03:04 2017 +0000 wbemdisp: Implement ISWbemObjectSet::ItemIndex. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index fece94f..4a67942 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -538,8 +538,39 @@ static HRESULT WINAPI objectset_ItemIndex( LONG lIndex, ISWbemObject **objWbemObject ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + LONG count; + HRESULT hr; + IEnumVARIANT *enum_var; + VARIANT var; + + TRACE( "%p, %d, %p\n", objectset, lIndex, objWbemObject ); + + *objWbemObject = NULL; + hr = ISWbemObjectSet_get_Count( iface, &count ); + if (FAILED(hr)) return hr; + + if (lIndex >= count) return WBEM_E_NOT_FOUND; + + hr = ISWbemObjectSet_get__NewEnum( iface, (IUnknown **)&enum_var ); + if (FAILED(hr)) return hr; + + IEnumVARIANT_Reset( enum_var ); + hr = IEnumVARIANT_Skip( enum_var, lIndex ); + if (SUCCEEDED(hr)) + hr = IEnumVARIANT_Next( enum_var, 1, &var, NULL ); + IEnumVARIANT_Release( enum_var ); + + if (SUCCEEDED(hr)) + { + if (V_VT( &var ) == VT_DISPATCH) + hr = IDispatch_QueryInterface( V_DISPATCH( &var ), &IID_ISWbemObject, (void **)objWbemObject ); + else + hr = WBEM_E_NOT_FOUND; + VariantClear( &var ); + } + + return hr; } static const ISWbemObjectSetVtbl objectset_vtbl =

1 0

Nikolay Sivov : riched20: Return proper interface pointers.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 440b92131f6c7173b3bdcef71a6fb0796f729a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440b92131f6c7173b3bdcef71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 16:17:15 2017 +0300 riched20: Return proper interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/clipboard.c | 4 ++-- dlls/riched20/tests/txtsrv.c | 2 +- dlls/riched20/txthost.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index d4560db..578fb02 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -66,7 +66,7 @@ static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFII if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { IEnumFORMATETC_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IEnumFORMATETC_iface; return S_OK; } *ppvObj = NULL; @@ -183,7 +183,7 @@ static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID r if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { IDataObject_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IDataObject_iface; return S_OK; } *ppvObj = NULL; diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 4be3106..73ca7cd 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -99,7 +99,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, ITextHostTestImpl *This = impl_from_ITextHost(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, pIID_ITextHost)) { - *ppvObject = This; + *ppvObject = &This->ITextHost_iface; ITextHost_AddRef((ITextHost *)*ppvObject); return S_OK; } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index b99c933..0e51ecf 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -76,7 +76,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, REFIID riid ITextHostImpl *This = impl_from_ITextHost(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) { - *ppvObject = This; + *ppvObject = &This->ITextHost_iface; ITextHost_AddRef((ITextHost *)*ppvObject); return S_OK; }

1 0

Jacek Caban : user32: Allow creating windows using null driver for invisible winstations.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: af4294a9af1b5b9f9ee7f3fa7561b6ade6e5ac05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4294a9af1b5b9f9ee7f3fa7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 15:12:58 2017 +0100 user32: Allow creating windows using null driver for invisible winstations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index c4cbb8a..d59a2ea 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -39,6 +39,8 @@ static USER_DRIVER null_driver, lazy_load_driver; const USER_DRIVER *USER_Driver = &lazy_load_driver; static char driver_load_error[80]; +static BOOL CDECL nodrv_CreateWindow( HWND hwnd ); + static HMODULE load_desktop_driver( HWND hwnd ) { static const WCHAR display_device_guid_propW[] = { @@ -152,6 +154,16 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ThreadDetach); #undef GET_USER_FUNC } + else + { + USEROBJECTFLAGS flags; + HWINSTA winstation; + + winstation = GetProcessWindowStation(); + if (!GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL) + || (flags.dwFlags & WSF_VISIBLE)) + driver->pCreateWindow = nodrv_CreateWindow; + } prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); if (prev != &lazy_load_driver) @@ -360,7 +372,7 @@ static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) return TRUE; } -static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) +static BOOL CDECL nodrv_CreateWindow( HWND hwnd ) { static int warned; HWND parent = GetAncestor( hwnd, GA_PARENT ); @@ -374,6 +386,11 @@ static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) return FALSE; } +static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) +{ + return TRUE; +} + static void CDECL nulldrv_DestroyWindow( HWND hwnd ) { }

1 0

Jacek Caban : services/tests: Test creating windows inside non-interactive service.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 2c24272804b57137fa051f1196e3b86904bc12cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c24272804b57137fa051f119… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 15:13:09 2017 +0100 services/tests: Test creating windows inside non-interactive service. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/Makefile.in | 2 +- programs/services/tests/service.c | 65 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/programs/services/tests/Makefile.in b/programs/services/tests/Makefile.in index b39e612..3abec74 100644 --- a/programs/services/tests/Makefile.in +++ b/programs/services/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = services.exe -IMPORTS = advapi32 +IMPORTS = user32 advapi32 C_SRCS = \ service.c diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 70f3262..0e9bcd7 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -19,6 +19,8 @@ #include <windef.h> #include <winsvc.h> #include <stdio.h> +#include <winbase.h> +#include <winuser.h> #include "wine/test.h" @@ -62,6 +64,67 @@ static void service_ok(int cnd, const char *msg, ...) send_msg(cnd ? "OK" : "FAIL", buf); } +static void test_winstation(void) +{ + HWINSTA winstation; + USEROBJECTFLAGS flags; + BOOL r; + + winstation = GetProcessWindowStation(); + service_ok(winstation != NULL, "winstation = NULL\n"); + + r = GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL); + service_ok(r, "GetUserObjectInformation(UOI_NAME) failed: %u\n", GetLastError()); + service_ok(!(flags.dwFlags & WSF_VISIBLE), "winstation has flags %x\n", flags.dwFlags); +} + +/* + * Test creating window in a service process. Although services run in non-interactive, + * they may create windows that will never be visible. + */ +static void test_create_window(void) +{ + DWORD style; + ATOM class; + HWND hwnd; + BOOL r; + + static WNDCLASSEXA wndclass = { + sizeof(WNDCLASSEXA), + 0, + DefWindowProcA, + 0, 0, NULL, NULL, NULL, NULL, NULL, + "service_test", + NULL + }; + + hwnd = GetDesktopWindow(); + service_ok(IsWindow(hwnd), "GetDesktopWindow returned invalid window %p\n", hwnd); + + class = RegisterClassExA(&wndclass); + service_ok(class, "RegisterClassFailed\n"); + + hwnd = CreateWindowA("service_test", "service_test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 515, 530, NULL, NULL, NULL, NULL); + service_ok(hwnd != NULL, "CreateWindow failed: %u\n", GetLastError()); + + style = GetWindowLongW(hwnd, GWL_STYLE); + service_ok(!(style & WS_VISIBLE), "style = %x, expected invisible\n", style); + + r = ShowWindow(hwnd, SW_SHOW); + service_ok(!r, "ShowWindow returned %x\n", r); + + style = GetWindowLongW(hwnd, GWL_STYLE); + service_ok(style & WS_VISIBLE, "style = %x, expected visible\n", style); + + r = ShowWindow(hwnd, SW_SHOW); + service_ok(r, "ShowWindow returned %x\n", r); + + r = DestroyWindow(hwnd); + service_ok(r, "DestroyWindow failed: %08x\n", GetLastError()); +} + static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_data, void *context) { SERVICE_STATUS status; @@ -84,6 +147,8 @@ static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_da SetEvent(service_stop_event); return NO_ERROR; case 128: + test_winstation(); + test_create_window(); service_event("CUSTOM"); return 0xdeadbeef; default:

1 0

Francois Gouget : mshtml/tests: A couple of spelling fixes in ok() messages.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 948991f23afbb57e33dffd7bb0ee630e521000bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=948991f23afbb57e33dffd7bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 12:10:02 2017 +0100 mshtml/tests: A couple of spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 2cfc414..467b3eb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -8693,12 +8693,12 @@ static void test_com_aggregation(const CLSID *clsid) SET_CALLED(outer_QI_IPersistMoniker); hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&unk2); - ok(hres == S_OK, "Coult not get IDispatch iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres); SET_EXPECT(outer_QI_test); hres = IUnknown_QueryInterface(unk2, &outer_test_iid, (void**)&unk3); CHECK_CALLED(outer_QI_test); - ok(hres == S_OK, "Coult not get IInternetProtocol iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); ok(unk3 == (IUnknown*)0xdeadbeef, "unexpected unk2\n"); IUnknown_Release(unk2);

1 0

Francois Gouget : shdocvw: Add a __WINE_ALLOC_SIZE attribute to heap_alloc ().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: f3d33f57a7e3aa5a36da24a3a5b567fea22868c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d33f57a7e3aa5a36da24a3a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:53:29 2017 +0100 shdocvw: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shdocvw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 341cdc5..a2736d8 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -53,7 +53,7 @@ static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_r /* memory allocation functions */ -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); }

1 0

Jetro Jormalainen : dinput: Give correct count of devices still to be enumerated.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 04bddb6c93dc3554fceff9612c56b62a43443b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04bddb6c93dc3554fceff9612… Author: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Date: Wed Feb 8 22:07:53 2017 +0200 dinput: Give correct count of devices still to be enumerated. EnumDevicesBySemantics should give count of all devices instead of just keyboard and mouse still to be enumerated when calling callback. Signed-off-by: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 63 +++++++++++++++++++++++++++++++++++++-------- dlls/dinput8/tests/dinput.c | 11 +++++++- 2 files changed, 62 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 06af92f..65ce52c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -930,7 +930,9 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( LPDIRECTINPUTDEVICE8A lpdid; DWORD callbackFlags; int i, j; - + int device_count = 0; + int remain; + DIDEVICEINSTANCEA *didevis = 0; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_a(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); @@ -958,19 +960,37 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess == S_OK) { - IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); - - if (lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef) == DIENUM_STOP) - return DI_OK; + if (device_count++) + didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEW)*device_count); + else + didevis = HeapAlloc(GetProcessHeap(), 0, sizeof(DIDEVICEINSTANCEW)*device_count); + didevis[device_count-1] = didevi; } } } + remain = device_count; + if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) + remain += sizeof(guids)/sizeof(guids[0]); + + for (i = 0; i < device_count; i++) + { + callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); + IDirectInput_CreateDevice(iface, &didevis[i].guidInstance, &lpdid, NULL); + + if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) + { + HeapFree(GetProcessHeap(), 0, didevis); + return DI_OK; + } + } + + HeapFree(GetProcessHeap(), 0, didevis); + if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; /* Enumerate keyboard and mouse */ @@ -1001,6 +1021,9 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( LPDIRECTINPUTDEVICE8W lpdid; DWORD callbackFlags; int i, j; + int device_count = 0; + int remain; + DIDEVICEINSTANCEW *didevis = 0; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); @@ -1018,19 +1041,37 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess == S_OK) { - IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); - - if (lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef) == DIENUM_STOP) - return DI_OK; + if (device_count++) + didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEW)*device_count); + else + didevis = HeapAlloc(GetProcessHeap(), 0, sizeof(DIDEVICEINSTANCEW)*device_count); + didevis[device_count-1] = didevi; } } } + remain = device_count; + if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) + remain += sizeof(guids)/sizeof(guids[0]); + + for (i = 0; i < device_count; i++) + { + callbackFlags = diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); + IDirectInput_CreateDevice(iface, &didevis[i].guidInstance, &lpdid, NULL); + + if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) + { + HeapFree(GetProcessHeap(), 0, didevis); + return DI_OK; + } + } + + HeapFree(GetProcessHeap(), 0, didevis); + if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; /* Enumerate keyboard and mouse */ diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index a6cbd34..18f3001 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -445,6 +445,7 @@ static void test_EnumDevices(void) struct enum_semantics_test { unsigned int device_count; + DWORD first_remaining; BOOL mouse; BOOL keyboard; DIACTIONFORMATA *lpdiaf; @@ -476,6 +477,12 @@ static BOOL CALLBACK enum_semantics_callback(const DIDEVICEINSTANCEA *lpddi, IDi if (context == NULL) return DIENUM_STOP; + if (!data->device_count) { + data->first_remaining = dwRemaining; + } + ok (dwRemaining == data->first_remaining - data->device_count, + "enum semantics remaining devices is wrong, expected %d, had %d\n", + data->first_remaining - data->device_count, dwRemaining); data->device_count++; if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysKeyboard)) data->keyboard = TRUE; @@ -507,7 +514,7 @@ static void test_EnumDevicesBySemantics(void) HRESULT hr; DIACTIONFORMATA diaf; const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; - struct enum_semantics_test data = { 0, FALSE, FALSE, &diaf, NULL }; + struct enum_semantics_test data = { 0, 0, FALSE, FALSE, &diaf, NULL }; int device_total = 0; hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL); @@ -539,6 +546,7 @@ static void test_EnumDevicesBySemantics(void) /* Enumerate Force feedback devices. We should get no mouse nor keyboard */ data.keyboard = FALSE; data.mouse = FALSE; + data.device_count = 0; hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_FORCEFEEDBACK); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); ok (!data.keyboard, "Keyboard should not be enumerated when asking for forcefeedback\n"); @@ -595,6 +603,7 @@ static void test_EnumDevicesBySemantics(void) /* The call fails with a zeroed GUID */ memset(&diaf.guidActionMap, 0, sizeof(GUID)); + data.device_count = 0; hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, NULL, 0); todo_wine ok(FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr);

1 0