May 2017 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Rework geometry shader inputs/ outputs handling.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 2da2b9669cd63b437f038c34475d9e26e1eb4915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da2b9669cd63b437f038c344… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:01 2017 +0200 wined3d: Rework geometry shader inputs/outputs handling. We want to always use the same name for input and output blocks in order to make matching between different shader types easier. This will be helpful for tessellation shaders. This commit changes the input and output blocks for geometry shaders to the following definitions: in shader_in_out { vec4 reg[n]; } shader_in[]; out shader_in_out { vec4 reg[n]; } shader_out; 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 | 73 +++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2da2b9669cd63b437f038…

1 0

Józef Kucia : wined3d: Pass correct input count to shader_glsl_setup_sm3_rasterizer_input().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 620e2d671860799830e4d79ff19bb0a8f5fd9365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620e2d671860799830e4d79ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:02 2017 +0200 wined3d: Pass correct input count to shader_glsl_setup_sm3_rasterizer_input(). We declare min(vec4_varyings(4, gl_info), input_count) shader outputs. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ef6b759..20e1b0b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6791,8 +6791,9 @@ static void shader_glsl_generate_sm4_rasterizer_input_setup(struct shader_glsl_p { struct wined3d_string_buffer *buffer = &priv->shader_buffer; + input_count = min(vec4_varyings(4, gl_info), input_count); if (input_count) - declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", min(vec4_varyings(4, gl_info), input_count)); + declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", input_count); shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", shader_glsl_get_prefix(shader->reg_maps.shader_version.type), shader->limits->packed_output);

1 0

Józef Kucia : wined3d: Use interface blocks for shader inputs and outputs in GLSL 1.50.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: eb30543b1a55df61c0745e851fd2753a6227d188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb30543b1a55df61c0745e851… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:03 2017 +0200 wined3d: Use interface blocks for shader inputs and outputs in GLSL 1.50. We always use interfaces blocks for SM4+ shaders. 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 | 66 +++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 20e1b0b..37a1352 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -808,7 +808,7 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 continue; } - string_buffer_sprintf(buffer, "ps_link[%u]", e->register_idx); + string_buffer_sprintf(buffer, "shader_in_out.reg[%u]", e->register_idx); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } @@ -2029,6 +2029,11 @@ static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_inf && shader_glsl_use_layout_qualifier(gl_info) && !needs_legacy_glsl_syntax(gl_info); } +static BOOL shader_glsl_use_interface_blocks(const struct wined3d_gl_info *gl_info) +{ + return shader_glsl_get_version(gl_info) >= 150; +} + static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info) { return needs_legacy_glsl_syntax(gl_info) ? "attribute" : "in"; @@ -2074,6 +2079,34 @@ static void PRINTF_ATTR(4, 5) declare_out_varying(const struct wined3d_gl_info * } } +static const char *shader_glsl_shader_input_name(const struct wined3d_gl_info *gl_info) +{ + return shader_glsl_use_interface_blocks(gl_info) ? "shader_in.reg" : "ps_link"; +} + +static const char *shader_glsl_shader_output_name(const struct wined3d_gl_info *gl_info) +{ + return shader_glsl_use_interface_blocks(gl_info) ? "shader_out.reg" : "ps_link"; +} + +static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_info, + struct wined3d_string_buffer *buffer, unsigned int element_count) +{ + if (shader_glsl_use_interface_blocks(gl_info)) + shader_addline(buffer, "in shader_in_out { vec4 reg[%u]; } shader_in;\n", element_count); + else + declare_in_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", element_count); +} + +static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, + struct wined3d_string_buffer *buffer, unsigned int element_count) +{ + if (shader_glsl_use_interface_blocks(gl_info)) + shader_addline(buffer, "out shader_in_out { vec4 reg[%u]; } shader_out;\n", element_count); + else + declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", element_count); +} + static const char *get_fragment_output(const struct wined3d_gl_info *gl_info) { return needs_legacy_glsl_syntax(gl_info) ? "gl_FragData" : "ps_out"; @@ -6367,8 +6400,9 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w { if (input->sysval_semantic) FIXME("Unhandled sysval semantic %#x.\n", input->sysval_semantic); - shader_addline(buffer, "ps_in[%u]%s = ps_link[%u]%s;\n", + shader_addline(buffer, "ps_in[%u]%s = %s[%u]%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, + shader_glsl_shader_input_name(gl_info), shader->u.ps.input_reg_map[input->register_idx], reg_mask); } } @@ -6453,9 +6487,10 @@ static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, const struct wined3d_shader_signature *input_signature, const struct wined3d_shader_reg_maps *reg_maps_in, const struct wined3d_shader_signature *output_signature, - const struct wined3d_shader_reg_maps *reg_maps_out, const char *out_array_name) + const struct wined3d_shader_reg_maps *reg_maps_out) { struct wined3d_string_buffer *destination = string_buffer_get(&priv->string_buffers); + const char *out_array_name = shader_glsl_shader_output_name(gl_info); struct wined3d_string_buffer *buffer = &priv->shader_buffer; unsigned int in_count = vec4_varyings(3, gl_info); unsigned int max_varyings = needs_legacy_glsl_syntax(gl_info) ? in_count + 2 : in_count; @@ -6553,9 +6588,8 @@ static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, unsigned int input_count, const struct wined3d_shader_signature *output_signature, - const struct wined3d_shader_reg_maps *reg_maps_out, const char *out_array_name) + const struct wined3d_shader_reg_maps *reg_maps_out) { - struct wined3d_string_buffer *destination = string_buffer_get(&priv->string_buffers); struct wined3d_string_buffer *buffer = &priv->shader_buffer; char reg_mask[6]; unsigned int i; @@ -6573,15 +6607,11 @@ static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, if (output->register_idx >= input_count) continue; - string_buffer_sprintf(destination, "%s[%u]", out_array_name, output->register_idx); - shader_glsl_write_mask_to_str(output->mask, reg_mask); - shader_addline(buffer, "%s%s = outputs[%u]%s;\n", - destination->buffer, reg_mask, output->register_idx, reg_mask); + shader_addline(buffer, "shader_out.reg[%u]%s = outputs[%u]%s;\n", + output->register_idx, reg_mask, output->register_idx, reg_mask); } - - string_buffer_release(&priv->string_buffers, destination); } static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv, @@ -6636,9 +6666,9 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv /* Then, setup the pixel shader input. */ if (reg_maps_out->shader_version.major < 4) shader_glsl_setup_vs3_output(priv, gl_info, map, input_signature, reg_maps_in, - output_signature, reg_maps_out, "ps_link"); + output_signature, reg_maps_out); else - shader_glsl_setup_sm4_shader_output(priv, input_count, output_signature, reg_maps_out, "ps_link"); + shader_glsl_setup_sm4_shader_output(priv, input_count, output_signature, reg_maps_out); } /* Context activation is done by the caller. */ @@ -6768,9 +6798,9 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl } else { - UINT in_count = min(vec4_varyings(ps_major, gl_info), ps->limits->packed_input); + unsigned int in_count = min(vec4_varyings(ps_major, gl_info), ps->limits->packed_input); - declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", in_count); + shader_glsl_declare_shader_outputs(gl_info, buffer, in_count); shader_addline(buffer, "void setup_vs_output(in vec4 outputs[%u])\n{\n", vs->limits->packed_output); shader_glsl_setup_sm3_rasterizer_input(priv, gl_info, ps->u.ps.input_reg_map, &ps->input_signature, &ps->reg_maps, 0, &vs->output_signature, &vs->reg_maps, per_vertex_point_size); @@ -6793,7 +6823,7 @@ static void shader_glsl_generate_sm4_rasterizer_input_setup(struct shader_glsl_p input_count = min(vec4_varyings(4, gl_info), input_count); if (input_count) - declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", input_count); + shader_glsl_declare_shader_outputs(gl_info, buffer, input_count); shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", shader_glsl_get_prefix(shader->reg_maps.shader_version.type), shader->limits->packed_output); @@ -6816,7 +6846,7 @@ static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, prefix, shader->limits->packed_output); shader_glsl_setup_sm4_shader_output(priv, input_count, - &shader->output_signature, &shader->reg_maps, "shader_out.reg"); + &shader->output_signature, &shader->reg_maps); shader_addline(buffer, "}\n"); } @@ -7056,7 +7086,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context unsigned int in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); if (args->vp_mode == vertexshader) - declare_in_varying(gl_info, buffer, FALSE, "vec4 %s_link[%u];\n", prefix, in_count); + shader_glsl_declare_shader_inputs(gl_info, buffer, in_count); shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); }

1 0

Józef Kucia : wined3d: Merge shader_glsl_generate_sm4_rasterizer_input_setup() into shader_glsl_generate_output_setup().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 321591f8340a82013c8a881aac84b12f4fea277e URL: http://source.winehq.org/git/wine.git/?a=commit;h=321591f8340a82013c8a881aa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:04 2017 +0200 wined3d: Merge shader_glsl_generate_sm4_rasterizer_input_setup() into shader_glsl_generate_output_setup(). 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 | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 37a1352..5305182 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6815,38 +6815,27 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl return ret; } -static void shader_glsl_generate_sm4_rasterizer_input_setup(struct shader_glsl_priv *priv, +static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, const struct wined3d_shader *shader, unsigned int input_count, - const struct wined3d_gl_info *gl_info) + const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup) { + const char *prefix = shader_glsl_get_prefix(shader->reg_maps.shader_version.type); struct wined3d_string_buffer *buffer = &priv->shader_buffer; - input_count = min(vec4_varyings(4, gl_info), input_count); + if (rasterizer_setup) + input_count = min(vec4_varyings(4, gl_info), input_count); + if (input_count) shader_glsl_declare_shader_outputs(gl_info, buffer, input_count); shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", - shader_glsl_get_prefix(shader->reg_maps.shader_version.type), shader->limits->packed_output); - - shader_glsl_setup_sm3_rasterizer_input(priv, gl_info, NULL, NULL, - NULL, input_count, &shader->output_signature, &shader->reg_maps, FALSE); - - shader_addline(buffer, "}\n"); -} - -static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, - const struct wined3d_shader *shader, unsigned int input_count, - const struct wined3d_gl_info *gl_info) -{ - const char *prefix = shader_glsl_get_prefix(shader->reg_maps.shader_version.type); - struct wined3d_string_buffer *buffer = &priv->shader_buffer; - - shader_addline(buffer, "out shader_in_out { vec4 reg[%u]; } shader_out;\n", input_count); - shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", prefix, shader->limits->packed_output); - shader_glsl_setup_sm4_shader_output(priv, input_count, - &shader->output_signature, &shader->reg_maps); + if (rasterizer_setup) + shader_glsl_setup_sm3_rasterizer_input(priv, gl_info, NULL, NULL, + NULL, input_count, &shader->output_signature, &shader->reg_maps, FALSE); + else + shader_glsl_setup_sm4_shader_output(priv, input_count, &shader->output_signature, &shader->reg_maps); shader_addline(buffer, "}\n"); } @@ -7337,12 +7326,8 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "uniform vec4 pos_fixup;\n"); if (reg_maps->shader_version.major >= 4) - { - if (args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL) - shader_glsl_generate_sm4_rasterizer_input_setup(priv, shader, args->next_shader_input_count, gl_info); - else if (args->next_shader_type == WINED3D_SHADER_TYPE_GEOMETRY) - shader_glsl_generate_sm4_output_setup(priv, shader, args->next_shader_input_count, gl_info); - } + shader_glsl_generate_sm4_output_setup(priv, shader, args->next_shader_input_count, + gl_info, args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL); shader_addline(buffer, "void main()\n{\n"); @@ -7394,7 +7379,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context if (!gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); - shader_glsl_generate_sm4_rasterizer_input_setup(priv, shader, args->output_count, gl_info); + shader_glsl_generate_sm4_output_setup(priv, shader, args->output_count, gl_info, TRUE); shader_addline(buffer, "void main()\n{\n"); if (FAILED(shader_generate_main(shader, buffer, reg_maps, &priv_ctx))) return 0;

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMGetRenderTargetsAndUnorderedAccessViews ().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: aaded07dde60da88ab2b6b901d46c2b81f204000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaded07dde60da88ab2b6b901… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:05 2017 +0200 d3d11: Implement d3d11_immediate_context_OMGetRenderTargetsAndUnorderedAccessViews(). 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 | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 136917b..69642ef 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1882,11 +1882,39 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord UINT unordered_access_view_start_slot, UINT unordered_access_view_count, ID3D11UnorderedAccessView **unordered_access_views) { - FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_unordered_access_view *wined3d_view; + struct d3d11_unordered_access_view *view_impl; + unsigned int i; + + TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " "unordered_access_view_start_slot %u, unordered_access_view_count %u, " - "unordered_access_views %p stub!\n", + "unordered_access_views %p.\n", iface, render_target_view_count, render_target_views, depth_stencil_view, unordered_access_view_start_slot, unordered_access_view_count, unordered_access_views); + + if (render_target_views || depth_stencil_view) + d3d11_immediate_context_OMGetRenderTargets(iface, render_target_view_count, + render_target_views, depth_stencil_view); + + if (unordered_access_views) + { + wined3d_mutex_lock(); + for (i = 0; i < unordered_access_view_count; ++i) + { + if (!(wined3d_view = wined3d_device_get_unordered_access_view(device->wined3d_device, + unordered_access_view_start_slot + i))) + { + unordered_access_views[i] = NULL; + continue; + } + + view_impl = wined3d_unordered_access_view_get_parent(wined3d_view); + unordered_access_views[i] = &view_impl->ID3D11UnorderedAccessView_iface; + ID3D11UnorderedAccessView_AddRef(unordered_access_views[i]); + } + wined3d_mutex_unlock(); + } } static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11DeviceContext *iface,

1 0

Owen Rudge : wsdapi: Implement WSDXMLAddChild, Sibling, BuildAnyForSingleElement, CleanupElement.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: e47e132d1bc0218e28e5d7764aec7d887d5450ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47e132d1bc0218e28e5d7764… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 3 23:55:30 2017 +0100 wsdapi: Implement WSDXMLAddChild, Sibling, BuildAnyForSingleElement, CleanupElement. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 3 +- dlls/wsdapi/wsdapi.spec | 8 +- dlls/wsdapi/xml.c | 215 ++++++++++++++++++++++++++++++++++++++++++++++++ include/wsdutil.h | 5 ++ include/wsdxmldom.h | 7 ++ 5 files changed, 233 insertions(+), 5 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 7d63fe2..764682d 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -5,4 +5,5 @@ IMPORTS = kernel32 C_SRCS = \ discovery.c \ main.c \ - memory.c + memory.c \ + xml.c diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 7145f7d..8ee17cb 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -36,10 +36,10 @@ @ stub WSDSetConfigurationOption @ stub WSDUriDecode @ stub WSDUriEncode -@ stub WSDXMLAddChild -@ stub WSDXMLAddSibling -@ stub WSDXMLBuildAnyForSingleElement -@ stub WSDXMLCleanupElement +@ stdcall WSDXMLAddChild(ptr ptr) +@ stdcall WSDXMLAddSibling(ptr ptr) +@ stdcall WSDXMLBuildAnyForSingleElement(ptr ptr ptr) +@ stdcall WSDXMLCleanupElement(ptr) @ stub WSDXMLCreateContext @ stub WSDXMLGetNameFromBuiltinNamespace @ stub WSDXMLGetValueFromAny diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c new file mode 100644 index 0000000..1cc45b8 --- /dev/null +++ b/dlls/wsdapi/xml.c @@ -0,0 +1,215 @@ +/* + * Web Services on Devices + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include "wsdapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); + +#define WSD_MAX_TEXT_LENGTH 8192 + +static LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value) +{ + int valueLen; + LPWSTR dup; + + valueLen = lstrlenW(value) + 1; + + dup = WSDAllocateLinkedMemory(parentMemoryBlock, valueLen * sizeof(WCHAR)); + + if (dup) memcpy(dup, value, valueLen * sizeof(WCHAR)); + return dup; +} + +static WSDXML_NAME *duplicate_name(void *parentMemoryBlock, WSDXML_NAME *name) +{ + WSDXML_NAME *dup; + + dup = WSDAllocateLinkedMemory(parentMemoryBlock, sizeof(WSDXML_NAME)); + + if (dup == NULL) + { + return NULL; + } + + dup->Space = name->Space; + dup->LocalName = duplicate_string(dup, name->LocalName); + + if (dup->LocalName == NULL) + { + WSDFreeLinkedMemory(dup); + return NULL; + } + + return dup; +} + +HRESULT WINAPI WSDXMLAddChild(WSDXML_ELEMENT *pParent, WSDXML_ELEMENT *pChild) +{ + WSDXML_NODE *currentNode; + + TRACE("(%p, %p)\n", pParent, pChild); + + if ((pParent == NULL) || (pChild == NULL) || (pChild->Node.Parent != NULL)) + { + return E_INVALIDARG; + } + + /* See if the parent already has a child */ + currentNode = pParent->FirstChild; + + if (currentNode == NULL) + { + pParent->FirstChild = (WSDXML_NODE *)pChild; + } + else + { + /* Find the last sibling node and make this child the next sibling */ + WSDXMLAddSibling((WSDXML_ELEMENT *)currentNode, pChild); + } + + pChild->Node.Parent = pParent; + + /* Link the memory allocations */ + WSDAttachLinkedMemory(pParent, pChild); + + return S_OK; +} + +HRESULT WINAPI WSDXMLAddSibling(WSDXML_ELEMENT *pFirst, WSDXML_ELEMENT *pSecond) +{ + WSDXML_NODE *currentNode; + + TRACE("(%p, %p)\n", pFirst, pSecond); + + if ((pFirst == NULL) || (pSecond == NULL)) + { + return E_INVALIDARG; + } + + /* See if the first node already has a sibling */ + currentNode = pFirst->Node.Next; + + if (currentNode == NULL) + { + pFirst->Node.Next = (WSDXML_NODE *)pSecond; + } + else + { + /* Find the last sibling node and make the second element the next sibling */ + while (1) + { + if (currentNode->Next == NULL) + { + currentNode->Next = (WSDXML_NODE *)pSecond; + break; + } + + currentNode = currentNode->Next; + } + } + + /* Reparent the second node under the first */ + pSecond->Node.Parent = pFirst->Node.Parent; + + /* Link the memory allocations */ + WSDAttachLinkedMemory(pFirst->Node.Parent, pSecond); + + return S_OK; +} + +HRESULT WINAPI WSDXMLBuildAnyForSingleElement(WSDXML_NAME *pElementName, LPCWSTR pszText, WSDXML_ELEMENT **ppAny) +{ + WSDXML_TEXT *child; + + TRACE("(%p, %s, %p)\n", pElementName, debugstr_w(pszText), ppAny); + + if ((pElementName == NULL) || ((pszText != NULL) && (lstrlenW(pszText) > WSD_MAX_TEXT_LENGTH))) + { + return E_INVALIDARG; + } + + if (ppAny == NULL) + { + return E_POINTER; + } + + *ppAny = WSDAllocateLinkedMemory(NULL, sizeof(WSDXML_ELEMENT)); + + if (*ppAny == NULL) + { + return E_OUTOFMEMORY; + } + + ZeroMemory(*ppAny, sizeof(WSDXML_ELEMENT)); + + (*ppAny)->Name = duplicate_name(*ppAny, pElementName); + + if ((*ppAny)->Name == NULL) + { + WSDFreeLinkedMemory(*ppAny); + return E_OUTOFMEMORY; + } + + if (pszText != NULL) + { + child = WSDAllocateLinkedMemory(*ppAny, sizeof(WSDXML_TEXT)); + + if (child == NULL) + { + WSDFreeLinkedMemory(*ppAny); + return E_OUTOFMEMORY; + } + + child->Node.Parent = *ppAny; + child->Node.Next = NULL; + child->Node.Type = TextType; + child->Text = duplicate_string(child, pszText); + + if (child->Text == NULL) + { + WSDFreeLinkedMemory(*ppAny); + return E_OUTOFMEMORY; + } + + (*ppAny)->FirstChild = (WSDXML_NODE *)child; + } + + return S_OK; +} + +HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny) +{ + TRACE("(%p)\n", pAny); + + if (pAny == NULL) + { + return E_INVALIDARG; + } + + WSDFreeLinkedMemory(pAny); + return S_OK; +} diff --git a/include/wsdutil.h b/include/wsdutil.h index 8a89eb1..2980d40 100644 --- a/include/wsdutil.h +++ b/include/wsdutil.h @@ -24,4 +24,9 @@ void WINAPI WSDAttachLinkedMemory(void *pParent, void *pChild); void WINAPI WSDDetachLinkedMemory(void *pVoid); void WINAPI WSDFreeLinkedMemory(void *pVoid); +HRESULT WINAPI WSDXMLAddChild(WSDXML_ELEMENT *pParent, WSDXML_ELEMENT *pChild); +HRESULT WINAPI WSDXMLAddSibling(WSDXML_ELEMENT *pFirst, WSDXML_ELEMENT *pSecond); +HRESULT WINAPI WSDXMLBuildAnyForSingleElement(WSDXML_NAME *pElementName, LPCWSTR pszText, WSDXML_ELEMENT **ppAny); +HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny); + #endif diff --git a/include/wsdxmldom.h b/include/wsdxmldom.h index e9fb3bd..8901236 100644 --- a/include/wsdxmldom.h +++ b/include/wsdxmldom.h @@ -26,6 +26,7 @@ typedef struct _WSDXML_PREFIX_MAPPING WSDXML_PREFIX_MAPPING; typedef struct _WSDXML_ATTRIBUTE WSDXML_ATTRIBUTE; typedef struct _WSDXML_NODE WSDXML_NODE; typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT; +typedef struct _WSDXML_TEXT WSDXML_TEXT; typedef const WSDXML_NAMESPACE *PCWSDXML_NAMESPACE; typedef const WSDXML_TYPE *PCWSDXML_TYPE; @@ -87,4 +88,10 @@ struct _WSDXML_ELEMENT WSDXML_PREFIX_MAPPING *PrefixMappings; }; +struct _WSDXML_TEXT +{ + WSDXML_NODE Node; + WCHAR *Text; +}; + #endif /* __WSDXMLDOM_H__ */

1 0

Owen Rudge : wsdapi/tests: Add tests for WSDXMLBuildAnyForSingleElement.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 9445f681b780074c95c142b9548ac60f25911a3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9445f681b780074c95c142b95… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 3 23:55:42 2017 +0100 wsdapi/tests: Add tests for WSDXMLBuildAnyForSingleElement. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 3 +- dlls/wsdapi/tests/xml.c | 109 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index 2b20c63..77434cf 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -3,4 +3,5 @@ IMPORTS = wsdapi ole32 user32 C_SRCS = \ discovery.c \ - memory.c + memory.c \ + xml.c diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c new file mode 100644 index 0000000..3f09d33 --- /dev/null +++ b/dlls/wsdapi/tests/xml.c @@ -0,0 +1,109 @@ +/* + * Web Services on Devices + * XML tests + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <windows.h> + +#include "wine/test.h" +#include "wsdapi.h" + +static void BuildAnyForSingleElement_tests(void) +{ + WSDXML_ELEMENT *element; + WSDXML_NAME name; + WSDXML_NAMESPACE ns; + WCHAR nameText[] = {'E','l','1',0}; + WCHAR text[] = {'H','e','l','l','o',0}; + static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; + static const WCHAR prefix[] = {'t',0}; + LPWSTR largeText; + const int largeTextSize = 10000 * sizeof(WCHAR); + HRESULT hr; + + /* Populate structures */ + ns.Uri = uri; + ns.PreferredPrefix = prefix; + + name.LocalName = nameText; + name.Space = &ns; + + /* Test invalid arguments */ + hr = WSDXMLBuildAnyForSingleElement(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&name, NULL, NULL); + ok(hr == E_POINTER, "BuildAnyForSingleElement failed with %08x\n", hr); + + /* Test calling the function with a text size that exceeds 8192 characters */ + largeText = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, largeTextSize + sizeof(WCHAR)); + memset(largeText, 'a', largeTextSize); + + hr = WSDXMLBuildAnyForSingleElement(&name, largeText, &element); + ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08x\n", hr); + + /* Test with valid parameters but no text */ + + hr = WSDXMLBuildAnyForSingleElement(&name, NULL, &element); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + ok(element->Name != &name, "element->Name has not been duplicated\n"); + todo_wine ok(element->Name->Space != name.Space, "element->Name->Space has not been duplicated\n"); + ok(element->Name->LocalName != name.LocalName, "element->LocalName has not been duplicated\n"); + ok(lstrcmpW(element->Name->LocalName, name.LocalName) == 0, "element->LocalName = '%s', expected '%s'\n", + wine_dbgstr_w(element->Name->LocalName), wine_dbgstr_w(name.LocalName)); + ok(element->FirstChild == NULL, "element->FirstChild == %p\n", element->FirstChild); + ok(element->Node.Next == NULL, "element->Node.Next == %p\n", element->Node.Next); + ok(element->Node.Type == ElementType, "element->Node.Type == %d\n", element->Node.Type); + + WSDFreeLinkedMemory(element); + + /* Test with valid parameters and text */ + + hr = WSDXMLBuildAnyForSingleElement(&name, text, &element); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + ok(element->Name != &name, "element->Name has not been duplicated\n"); + todo_wine ok(element->Name->Space != name.Space, "element->Name->Space has not been duplicated\n"); + ok(element->Name->LocalName != name.LocalName, "element->LocalName has not been duplicated\n"); + ok(lstrcmpW(element->Name->LocalName, name.LocalName) == 0, "element->LocalName = '%s', expected '%s'\n", + wine_dbgstr_w(element->Name->LocalName), wine_dbgstr_w(name.LocalName)); + ok(element->FirstChild != NULL, "element->FirstChild == %p\n", element->FirstChild); + ok(element->Node.Next == NULL, "element->Node.Next == %p\n", element->Node.Next); + ok(element->Node.Type == ElementType, "element->Node.Type == %d\n", element->Node.Type); + + if (element->FirstChild != NULL) + { + ok(element->FirstChild->Parent == element, "element->FirstChild->Parent = %p, expected %p\n", element->FirstChild->Parent, element); + ok(element->FirstChild->Next == NULL, "element->FirstChild.Next == %p\n", element->FirstChild->Next); + ok(element->FirstChild->Type == TextType, "element->FirstChild.Type == %d\n", element->Node.Type); + ok(((WSDXML_TEXT *)element->FirstChild)->Text != NULL, "element->FirstChild.Text is null\n"); + ok(lstrcmpW(((WSDXML_TEXT *)element->FirstChild)->Text, text) == 0, "element->FirstChild->Text = '%s', expected '%s'\n", + wine_dbgstr_w(((WSDXML_TEXT *)element->FirstChild)->Text), wine_dbgstr_w(text)); + } + + WSDFreeLinkedMemory(element); +} + +START_TEST(xml) +{ + BuildAnyForSingleElement_tests(); +}

1 0

Owen Rudge : wsdapi/tests: Add tests for WSDXMLAddChild.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 19241ca6f7e2df92b5b1c577f25845e067bc86ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=19241ca6f7e2df92b5b1c577f… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 3 23:55:50 2017 +0100 wsdapi/tests: Add tests for WSDXMLAddChild. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 3f09d33..4af81af 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -103,7 +103,99 @@ static void BuildAnyForSingleElement_tests(void) WSDFreeLinkedMemory(element); } +static void AddChild_tests(void) +{ + WSDXML_ELEMENT *parent, *child1, *child2; + WSDXML_NAME parentName, child1Name, child2Name; + WSDXML_NAMESPACE ns; + WCHAR parentNameText[] = {'D','a','d',0}; + WCHAR child1NameText[] = {'T','i','m',0}; + WCHAR child2NameText[] = {'B','o','b',0}; + static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; + static const WCHAR prefix[] = {'t',0}; + HRESULT hr; + + /* Test invalid values */ + hr = WSDXMLAddChild(NULL, NULL); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + + hr = WSDXMLAddChild(parent, NULL); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + + hr = WSDXMLAddChild(NULL, child1); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + + /* Populate structures */ + ns.Uri = uri; + ns.PreferredPrefix = prefix; + + parentName.LocalName = parentNameText; + parentName.Space = &ns; + + child1Name.LocalName = child1NameText; + child1Name.Space = &ns; + + child2Name.LocalName = child2NameText; + child2Name.Space = &ns; + + /* Create some elements */ + hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1NameText, &child1); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child2); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); + ok(parent->FirstChild == NULL, "parent->FirstChild == %p\n", parent->FirstChild); + ok(parent->Node.Next == NULL, "parent->Node.Next == %p\n", parent->Node.Next); + ok(child1->Node.Parent == NULL, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->FirstChild != NULL, "child1->FirstChild == NULL\n"); + ok(child1->FirstChild->Type == TextType, "child1->FirstChild.Type == %d\n", child1->FirstChild->Type); + ok(child1->Node.Next == NULL, "child1->Node.Next == %p\n", child1->Node.Next); + + /* Add the child to the parent */ + hr = WSDXMLAddChild(parent, child1); + ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + + ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + ok(parent->Node.Next == NULL, "parent->Node.Next == %p\n", parent->Node.Next); + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->FirstChild != NULL, "child1->FirstChild == NULL\n"); + ok(child1->FirstChild->Type == TextType, "child1->FirstChild.Type == %d\n", child1->FirstChild->Type); + ok(child1->Node.Next == NULL, "child1->Node.Next == %p\n", child1->Node.Next); + + /* Try to set child1 as the child of child2, which already has a parent */ + hr = WSDXMLAddChild(child2, child1); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + + /* Try to set child2 as the child of child1, which has a text node as a child */ + hr = WSDXMLAddChild(child2, child1); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + + /* Add child2 as a child of parent */ + hr = WSDXMLAddChild(parent, child2); + ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + + ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + ok(parent->Node.Next == NULL, "parent->Node.Next == %p\n", parent->Node.Next); + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->FirstChild != NULL, "child1->FirstChild == NULL\n"); + ok(child1->FirstChild->Type == TextType, "child1->FirstChild.Type == %d\n", child1->FirstChild->Type); + ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->FirstChild == NULL, "child2->FirstChild == %p\n", child2->FirstChild); + ok(child2->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + + WSDFreeLinkedMemory(parent); +} + START_TEST(xml) { BuildAnyForSingleElement_tests(); + AddChild_tests(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for WSDXMLAddSibling.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: e90aaaabe66019903832731c49274466f1b6aed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90aaaabe66019903832731c4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 3 23:55:58 2017 +0100 wsdapi/tests: Add tests for WSDXMLAddSibling. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 4af81af..fd8ac03 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -194,8 +194,97 @@ static void AddChild_tests(void) WSDFreeLinkedMemory(parent); } +static void AddSibling_tests(void) +{ + WSDXML_ELEMENT *parent, *child1, *child2, *child3; + WSDXML_NAME parentName, child1Name, child2Name; + WSDXML_NAMESPACE ns; + WCHAR parentNameText[] = {'D','a','d',0}; + WCHAR child1NameText[] = {'T','i','m',0}; + WCHAR child2NameText[] = {'B','o','b',0}; + static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; + static const WCHAR prefix[] = {'t',0}; + HRESULT hr; + + /* Test invalid values */ + hr = WSDXMLAddSibling(NULL, NULL); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + + hr = WSDXMLAddSibling(child1, NULL); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + + hr = WSDXMLAddSibling(NULL, child2); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + + /* Populate structures */ + ns.Uri = uri; + ns.PreferredPrefix = prefix; + + parentName.LocalName = parentNameText; + parentName.Space = &ns; + + child1Name.LocalName = child1NameText; + child1Name.Space = &ns; + + child2Name.LocalName = child2NameText; + child2Name.Space = &ns; + + /* Create some elements */ + hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1NameText, &child1); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child2); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child3); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + /* Add child1 to parent */ + hr = WSDXMLAddChild(parent, child1); + ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + + ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + ok(parent->Node.Next == NULL, "parent->Node.Next == %p\n", parent->Node.Next); + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->FirstChild != NULL, "child1->FirstChild == NULL\n"); + ok(child1->FirstChild->Type == TextType, "child1->FirstChild.Type == %d\n", child1->FirstChild->Type); + ok(child1->Node.Next == NULL, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == NULL, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->FirstChild == NULL, "child2->FirstChild == %p\n", child2->FirstChild); + ok(child2->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + + /* Try to add child2 as sibling of child1 */ + hr = WSDXMLAddSibling(child1, child2); + ok(hr == S_OK, "WSDXMLAddSibling failed with %08x\n", hr); + + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + + /* Try to add child3 as sibling of child1 */ + hr = WSDXMLAddSibling(child1, child3); + ok(hr == S_OK, "WSDXMLAddSibling failed with %08x\n", hr); + + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->Node.Next == (WSDXML_NODE *)child3, "child2->Node.Next == %p\n", child2->Node.Next); + ok(child3->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child3->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + + WSDFreeLinkedMemory(parent); +} + START_TEST(xml) { BuildAnyForSingleElement_tests(); AddChild_tests(); + AddSibling_tests(); }

1 0

Ken Thomases : winemac: Move CVDisplayLink operations out of @synchronized blocks to avoid potential deadlock.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 24d3795285102170834ee624e3d07036c87005ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d3795285102170834ee624e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 8 12:52:02 2017 -0500 winemac: Move CVDisplayLink operations out of @synchronized blocks to avoid potential deadlock. The -fire method called by the display link callback also synchronizes on self (while accessing the windows array). Display link operations use a lock to synchronize, too, and it's held while the callback is running. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1150322..7cb3459 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -218,22 +218,26 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) addWindow:(WineWindow*)window { + BOOL needsStart; @synchronized(self) { - BOOL needsStart = !_windows.count; + needsStart = !_windows.count; [_windows addObject:window]; - if (needsStart) - CVDisplayLinkStart(_link); } + if (needsStart) + CVDisplayLinkStart(_link); } - (void) removeWindow:(WineWindow*)window { + BOOL shouldStop = FALSE; @synchronized(self) { BOOL wasRunning = _windows.count > 0; [_windows removeObject:window]; if (wasRunning && !_windows.count) - CVDisplayLinkStop(_link); + shouldStop = TRUE; } + if (shouldStop) + CVDisplayLinkStop(_link); } - (void) fire

1 0