April 2017 - Wine-Commits - list.winehq.org

Sebastian Lackner : wined3d: Fix double free in geometry_shader_init.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 9b00f0182bc0afc9a30420163e96f85612486b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b00f0182bc0afc9a30420163… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 19 18:55:32 2017 +0200 wined3d: Fix double free in geometry_shader_init. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3681a8d..7dc276f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3433,21 +3433,23 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 const struct wined3d_shader_desc *desc, const struct wined3d_stream_output_desc *so_desc, void *parent, const struct wined3d_parent_ops *parent_ops) { + struct wined3d_stream_output_element *elements = NULL; HRESULT hr; + if (so_desc && !(elements = wined3d_calloc(so_desc->element_count, sizeof(*elements)))) + return E_OUTOFMEMORY; + if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops))) + { + HeapFree(GetProcessHeap(), 0, elements); return hr; + } if (so_desc) { - struct wined3d_stream_output_desc *d = &shader->u.gs.so_desc; - *d = *so_desc; - if (!(d->elements = wined3d_calloc(so_desc->element_count, sizeof(*d->elements)))) - { - wined3d_cs_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); - return E_OUTOFMEMORY; - } - memcpy(d->elements, so_desc->elements, so_desc->element_count * sizeof(*d->elements)); + shader->u.gs.so_desc = *so_desc; + shader->u.gs.so_desc.elements = elements; + memcpy(elements, so_desc->elements, so_desc->element_count * sizeof(*elements)); } return WINED3D_OK;

1 0

Józef Kucia : wined3d: Use correct layer count for 3D textures.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 583255f2b2ff97e26348b3db4d00a9fe80b28688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=583255f2b2ff97e26348b3db4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 12:26:59 2017 +0200 wined3d: Use correct layer count for 3D textures. Fixes a regression introduced by commit 9ffacc434e90d80dbdfb107b10f02a759f2266f3. 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/view.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index cb3578a..3abd85b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -422,7 +422,7 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view struct wined3d_context *context, DWORD location) { struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx; + unsigned int i, sub_resource_idx, layer_count; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -433,7 +433,8 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view texture = texture_from_resource(resource); sub_resource_idx = view->sub_resource_idx; - for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_prepare_location(texture, sub_resource_idx, context, location); } @@ -441,7 +442,7 @@ void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *v struct wined3d_context *context, DWORD location) { struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx; + unsigned int i, sub_resource_idx, layer_count; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -452,14 +453,15 @@ void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *v texture = texture_from_resource(resource); sub_resource_idx = view->sub_resource_idx; - for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_load_location(texture, sub_resource_idx, context, location); } void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) { struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx; + unsigned int i, sub_resource_idx, layer_count; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -470,7 +472,8 @@ void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_vie texture = texture_from_resource(resource); sub_resource_idx = view->sub_resource_idx; - for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_validate_location(texture, sub_resource_idx, location); }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSGetShader().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: c08da43ddd37196cb94484fccc967fb819031570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08da43ddd37196cb94484fcc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:20 2017 +0200 d3d11: Implement d3d11_immediate_context_DSGetShader(). 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 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d6881de..175e271 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1989,8 +1989,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceContext *iface, ID3D11DomainShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_domain_shader *shader_impl; + struct wined3d_shader *wined3d_shader; + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances || class_instance_count) + FIXME("Dynamic linking not implemented yet.\n"); + + wined3d_mutex_lock(); + if (!(wined3d_shader = wined3d_device_get_domain_shader(device->wined3d_device))) + { + wined3d_mutex_unlock(); + *shader = NULL; + return; + } + + shader_impl = wined3d_shader_get_parent(wined3d_shader); + wined3d_mutex_unlock(); + ID3D11DomainShader_AddRef(*shader = &shader_impl->ID3D11DomainShader_iface); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSSetShader().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: cefc48e8823c126e02050ac88cd09e71d67acfb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cefc48e8823c126e02050ac88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:16 2017 +0200 d3d11: Implement d3d11_immediate_context_DSSetShader(). 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 b5b2678..193a07f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -308,6 +308,7 @@ struct d3d11_domain_shader HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, struct d3d11_domain_shader **shader) DECLSPEC_HIDDEN; +struct d3d11_domain_shader *unsafe_impl_from_ID3D11DomainShader(ID3D11DomainShader *iface) DECLSPEC_HIDDEN; /* ID3D11GeometryShader, ID3D10GeometryShader */ struct d3d_geometry_shader diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6f71d4d..d2eaec8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1173,8 +1173,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceContext *iface, ID3D11DomainShader *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 d3d11_domain_shader *ds = unsafe_impl_from_ID3D11DomainShader(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_domain_shader(device->wined3d_device, ds ? ds->wined3d_shader : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 7531586..6266a34 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -984,6 +984,15 @@ HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_c return S_OK; } +struct d3d11_domain_shader *unsafe_impl_from_ID3D11DomainShader(ID3D11DomainShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_domain_shader_vtbl); + + return impl_from_ID3D11DomainShader(iface); +} + /* ID3D11GeometryShader methods */ static inline struct d3d_geometry_shader *impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface)

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_domain_shader().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 69d771618c23c88ed094712dcf0125e52b31f777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d771618c23c88ed094712dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:15 2017 +0200 wined3d: Introduce wined3d_device_set_domain_shader(). 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/device.c | 17 +++++++++++++++++ dlls/wined3d/state.c | 2 ++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 21 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 154197c..a3924c0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2671,6 +2671,23 @@ void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader_decref(prev); } +void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) +{ + struct wined3d_shader *prev; + + TRACE("device %p, shader %p.\n", device, shader); + + prev = device->update_state->shader[WINED3D_SHADER_TYPE_DOMAIN]; + if (shader == prev) + return; + if (shader) + wined3d_shader_incref(shader); + device->update_state->shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_DOMAIN, shader); + if (prev) + wined3d_shader_decref(prev); +} + void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5c22a04..06e2fbb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5208,6 +5208,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_FRAMEBUFFER, { STATE_FRAMEBUFFER, context_state_fb }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), context_state_drawbuf},WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_HULL), { STATE_SHADER(WINED3D_SHADER_TYPE_HULL), state_shader }, WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN), { STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN), state_shader }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), state_shader }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), state_compute_shader}, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, @@ -5990,6 +5991,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_INDEXBUFFER, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), STATE_SHADER(WINED3D_SHADER_TYPE_HULL), + STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN), STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index dd8b743..3331066 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -123,6 +123,7 @@ @ cdecl wined3d_device_set_cursor_properties(ptr long long ptr long) @ cdecl wined3d_device_set_depth_stencil_view(ptr ptr) @ cdecl wined3d_device_set_dialog_box_mode(ptr long) +@ cdecl wined3d_device_set_domain_shader(ptr ptr) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) @ cdecl wined3d_device_set_gs_cb(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bbcea55..c2729fb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2296,6 +2296,7 @@ HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *devi void __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); +void __cdecl wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader);

1 0

Józef Kucia : wined3d: Use layout binding qualifiers with legacy contexts.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: d007ca28cb7aa2731104d39d1059b762678577d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d007ca28cb7aa2731104d39d1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:12 2017 +0200 wined3d: Use layout binding qualifiers with legacy contexts. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 856a5b5..f875d06 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -567,7 +567,7 @@ static BOOL shader_glsl_use_layout_qualifier(const struct wined3d_gl_info *gl_in static BOOL shader_glsl_use_layout_binding_qualifier(const struct wined3d_gl_info *gl_info) { - return !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]; + return gl_info->supported[ARB_SHADING_LANGUAGE_420PACK] && shader_glsl_use_layout_qualifier(gl_info); } static void shader_glsl_init_uniform_block_bindings(const struct wined3d_gl_info *gl_info,

1 0

Józef Kucia : wined3d: Formalize requirements for layout qualifiers.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: d5b9271e826e102725d92d650d8ad25178fcec65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b9271e826e102725d92d650… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:10 2017 +0200 wined3d: Formalize requirements 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 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 57b9138..dffbf18 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -557,6 +557,14 @@ void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint pro print_glsl_info_log(gl_info, program, TRUE); } +static BOOL shader_glsl_use_layout_qualifier(const struct wined3d_gl_info *gl_info) +{ + /* Layout qualifiers were introduced in GLSL 1.40. The Nvidia Legacy GPU + * driver (series 340.xx) doesn't parse layout qualifiers in older GLSL + * versions. */ + return shader_glsl_get_version(gl_info) >= 140; +} + static BOOL shader_glsl_use_layout_binding_qualifier(const struct wined3d_gl_info *gl_info) { return !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]; @@ -2021,7 +2029,8 @@ static BOOL needs_legacy_glsl_syntax(const struct wined3d_gl_info *gl_info) static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_info *gl_info) { - return !needs_legacy_glsl_syntax(gl_info) && gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION]; + return gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION] + && shader_glsl_use_layout_qualifier(gl_info) && !needs_legacy_glsl_syntax(gl_info); } static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info)

1 0

Hans Leidekker : webservices: Implement WsResetListener.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: a3999d77efd41faf995c29bb138ff9a7f98bb5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3999d77efd41faf995c29bb1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 20 10:45:46 2017 +0200 webservices: Implement WsResetListener. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 32 ++++++++++++++++++++++++ dlls/webservices/tests/listener.c | 51 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index a236ab9..99402ff 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -361,6 +361,38 @@ HRESULT WINAPI WsCloseListener( WS_LISTENER *handle, const WS_ASYNC_CONTEXT *ctx } /************************************************************************** + * WsResetListener [webservices.@] + */ +HRESULT WINAPI WsResetListener( WS_LISTENER *handle, WS_ERROR *error ) +{ + struct listener *listener = (struct listener *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!listener) return E_INVALIDARG; + + EnterCriticalSection( &listener->cs ); + + if (listener->magic != LISTENER_MAGIC) + { + LeaveCriticalSection( &listener->cs ); + return E_INVALIDARG; + } + + if (listener->state != WS_LISTENER_STATE_CREATED && listener->state != WS_LISTENER_STATE_CLOSED) + { + LeaveCriticalSection( &listener->cs ); + return WS_E_INVALID_OPERATION; + } + + reset_listener( listener ); + + LeaveCriticalSection( &listener->cs ); + return S_OK; +} + +/************************************************************************** * WsGetListenerProperty [webservices.@] */ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ID id, void *buf, diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c index c4a2747..9aaf330 100644 --- a/dlls/webservices/tests/listener.c +++ b/dlls/webservices/tests/listener.c @@ -190,9 +190,60 @@ static void test_WsCreateChannelForListener(void) WsFreeListener( listener ); } +static void test_WsResetListener(void) +{ + WCHAR str[] = + {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; + WS_STRING url = { sizeof(str)/sizeof(str[0]), str }; + WS_LISTENER *listener; + WS_LISTENER_STATE state; + WS_LISTENER_PROPERTY prop; + ULONG size, timeout = 1000; + HRESULT hr; + + hr = WsResetListener( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prop.id = WS_LISTENER_PROPERTY_CONNECT_TIMEOUT; + prop.value = &timeout; + prop.valueSize = sizeof(timeout); + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, &prop, 1, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); + + timeout = 0xdeadbeef; + size = sizeof(timeout); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CONNECT_TIMEOUT, &timeout, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( timeout == 1000, "got %u\n", timeout ); + + WsFreeListener( listener ); +} + START_TEST(listener) { test_WsCreateListener(); test_WsOpenListener(); test_WsCreateChannelForListener(); + test_WsResetListener(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 522cc56..f55bef8 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -136,7 +136,7 @@ @ stdcall WsResetChannel(ptr ptr) @ stdcall WsResetError(ptr) @ stdcall WsResetHeap(ptr ptr) -@ stub WsResetListener +@ stdcall WsResetListener(ptr ptr) @ stdcall WsResetMessage(ptr ptr) @ stub WsResetMetadata @ stub WsResetServiceHost

1 0

Hans Leidekker : webservices: Implement WsCreateChannelForListener.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 9cacff8e077e01cbf2d325abf54bc8bda9f1a13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cacff8e077e01cbf2d325abf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 20 10:45:45 2017 +0200 webservices: Implement WsCreateChannelForListener. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 39 ++++++++++++++++++++++++++++++++------- dlls/webservices/tests/listener.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 89070f6..e777e8c 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -213,8 +213,35 @@ HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding return E_NOTIMPL; } - if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) - return hr; + if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) return hr; + + *handle = (WS_CHANNEL *)channel; + return S_OK; +} + +/************************************************************************** + * WsCreateChannelForListener [webservices.@] + */ +HRESULT WINAPI WsCreateChannelForListener( WS_LISTENER *listener_handle, const WS_CHANNEL_PROPERTY *properties, + ULONG count, WS_CHANNEL **handle, WS_ERROR *error ) +{ + struct channel *channel; + WS_CHANNEL_TYPE type; + WS_CHANNEL_BINDING binding; + HRESULT hr; + + TRACE( "%p %p %u %p %p\n", listener_handle, properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!listener_handle || !handle) return E_INVALIDARG; + + if ((hr = WsGetListenerProperty( listener_handle, WS_LISTENER_PROPERTY_CHANNEL_TYPE, &type, + sizeof(type), NULL )) != S_OK) return hr; + + if ((hr = WsGetListenerProperty( listener_handle, WS_LISTENER_PROPERTY_CHANNEL_BINDING, &binding, + sizeof(binding), NULL )) != S_OK) return hr; + + if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) return hr; *handle = (WS_CHANNEL *)channel; return S_OK; @@ -393,11 +420,10 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return hr; } -static HRESULT close_channel( struct channel *channel ) +static void close_channel( struct channel *channel ) { reset_channel( channel ); channel->state = WS_CHANNEL_STATE_CLOSED; - return S_OK; } /************************************************************************** @@ -406,7 +432,6 @@ static HRESULT close_channel( struct channel *channel ) HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; - HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -422,10 +447,10 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, return E_INVALIDARG; } - hr = close_channel( channel ); + close_channel( channel ); LeaveCriticalSection( &channel->cs ); - return hr; + return S_OK; } static HRESULT parse_url( const WCHAR *url, ULONG len, URL_COMPONENTS *uc ) diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c index ab2fba9..c4a2747 100644 --- a/dlls/webservices/tests/listener.c +++ b/dlls/webservices/tests/listener.c @@ -154,8 +154,45 @@ static void test_WsOpenListener(void) WsFreeListener( listener ); } +static void test_WsCreateChannelForListener(void) +{ + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_CHANNEL_TYPE type; + WS_CHANNEL_STATE state; + HRESULT hr; + + hr = WsCreateChannelForListener( NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( NULL, NULL, 0, &channel, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + channel = NULL; + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( channel != NULL, "channel not set\n" ); + + type = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); + + state = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); + + WsFreeChannel( channel ); + WsFreeListener( listener ); +} + START_TEST(listener) { test_WsCreateListener(); test_WsOpenListener(); + test_WsCreateChannelForListener(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index ff35777..522cc56 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -21,7 +21,7 @@ @ stub WsCopyError @ stdcall WsCopyNode(ptr ptr ptr) @ stdcall WsCreateChannel(long long ptr long ptr ptr ptr) -@ stub WsCreateChannelForListener +@ stdcall WsCreateChannelForListener(ptr ptr long ptr ptr) @ stdcall WsCreateError(ptr long ptr) @ stub WsCreateFaultFromError @ stdcall WsCreateHeap(long long ptr long ptr ptr)

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_domain_shader().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 5bc49dd525ce10d1a4170b86b526f0d78ed63908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc49dd525ce10d1a4170b86b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:19 2017 +0200 wined3d: Introduce wined3d_device_get_domain_shader(). 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/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 961bda6..b5f4bdd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2695,6 +2695,13 @@ void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struc wined3d_shader_decref(prev); } +struct wined3d_shader * CDECL wined3d_device_get_domain_shader(const struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return device->state.shader[WINED3D_SHADER_TYPE_DOMAIN]; +} + void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e5edcb4..84ba5d4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -59,6 +59,7 @@ @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) +@ cdecl wined3d_device_get_domain_shader(ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6733087..29a8431 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2196,6 +2196,7 @@ struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); +struct wined3d_shader * __cdecl wined3d_device_get_domain_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device);

1 0