June 2018 - Wine-Devel - list.winehq.org

Re: [PATCH 1/5] wined3d: Declare the correct number and type of fragment shader color outputs.

by Henri Verbeet

On 6 June 2018 at 00:32, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buffer, > + const struct wined3d_gl_info *gl_info, const struct wined3d_shader *shader) > +{ > + const struct wined3d_shader_signature *output_signature = &shader->output_signature; > + unsigned int i; > + > + if (output_signature->element_count) > + { > + for (i = 0; i < output_signature->element_count; ++i) > + { > + const struct wined3d_shader_signature_element *output = &output_signature->elements[i]; > + > + if (strncasecmp(output->semantic_name, "SV_Target", sizeof("SV_Target"))) > + continue; Should this really match against the "semantic_name" string, or does the "sysval_semantic" field also contain that information? > + switch (output->component_type) > + { > + case WINED3D_TYPE_UINT: > + shader_addline(buffer, "color_out%u = floatBitsToUint(ps_out[%u]);\n", > + output->semantic_idx, output->semantic_idx); > + break; > + case WINED3D_TYPE_INT: > + shader_addline(buffer, "color_out%u = floatBitsToInt(ps_out[%u]);\n", > + output->semantic_idx, output->semantic_idx); > + break; > + > + default: > + FIXME("Unhandled type %#x.\n", output->component_type); > + /* Fall through. */ > + case WINED3D_TYPE_UNKNOWN: > + case WINED3D_TYPE_FLOAT: > + shader_addline(buffer, "color_out%u = ps_out[%u];\n", > + output->semantic_idx, output->semantic_idx); > + } I think shader_glsl_sprintf_cast() with appropriate arguments could also handle this.

June 6, 2018

Re: [PATCH 2/3] kernel32: Implement Wow64GetThreadContext().

by Alexandre Julliard

Zebediah Figura <zfigura(a)codeweavers.com> writes: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > With code essentially copied from ntdll. As far as I can tell there is no > ntdll entry point for this function. RtlWow64GetThreadContext() is probably what you are looking for. It will need some test cases obviously. -- Alexandre Julliard julliard(a)winehq.org

June 6, 2018

Re: [PATCH] jscript/tests: Use the available ARRAY_SIZE() macro

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

June 6, 2018

Re: [PATCH 0/4] winevulkan: Update to 1.0.76

by Józef Kucia

On Mon, Jun 4, 2018 at 12:52 AM, Roderick Colenbrander <thunderbird2k(a)gmail.com> wrote: > Vulkan 1.1 moved a lot of extensions into its Core including interop extensions > for memory, fences and semaphores. These rely on platform specific functionality > and would need some more implementation work to support. (It is also the question > how we would deal with these. Probably needs to be implemented in winex11.drv to > allow vkd3d to use them). I think it would be better to simply implement external objects extensions in winevulkan, at least initially.

June 6, 2018

[PATCH 4/4] webservices: Fix handling of empty text field mappings.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 355 +++++++++++++++++++--------------------- dlls/webservices/tests/reader.c | 150 +++++++++++++++++ 2 files changed, 314 insertions(+), 191 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 6925200a59..087ad0a9cc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4442,24 +4442,24 @@ static HRESULT text_to_bool( const WS_XML_TEXT *text, BOOL *val ) static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_BOOL_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; - BOOL found, val = FALSE; + BOOL val = FALSE; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_bool( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_bool( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4468,7 +4468,7 @@ static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4476,7 +4476,7 @@ static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, { BOOL *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4524,25 +4524,24 @@ static HRESULT text_to_int8( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int8( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT8_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int8( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int8( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4551,7 +4550,7 @@ static HRESULT read_type_int8( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4559,7 +4558,7 @@ static HRESULT read_type_int8( struct reader *reader, WS_TYPE_MAPPING mapping, { INT8 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4607,25 +4606,24 @@ static HRESULT text_to_int16( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int16( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT16_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int16( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int16( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4634,7 +4632,7 @@ static HRESULT read_type_int16( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4642,7 +4640,7 @@ static HRESULT read_type_int16( struct reader *reader, WS_TYPE_MAPPING mapping, { INT16 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4688,25 +4686,24 @@ static HRESULT text_to_int32( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int32( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT32_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int32( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int32( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4715,7 +4712,7 @@ static HRESULT read_type_int32( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4723,7 +4720,7 @@ static HRESULT read_type_int32( struct reader *reader, WS_TYPE_MAPPING mapping, { INT32 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4769,25 +4766,24 @@ static HRESULT text_to_int64( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT64_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int64( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int64( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4796,7 +4792,7 @@ static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4804,7 +4800,7 @@ static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, { INT64 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4851,25 +4847,24 @@ static HRESULT text_to_uint8( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint8( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT8_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint8( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint8( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4878,7 +4873,7 @@ static HRESULT read_type_uint8( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4886,7 +4881,7 @@ static HRESULT read_type_uint8( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT8 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4942,25 +4937,24 @@ static HRESULT text_to_uint16( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint16( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT16_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint16( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint16( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4969,7 +4963,7 @@ static HRESULT read_type_uint16( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4977,7 +4971,7 @@ static HRESULT read_type_uint16( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT16 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5032,25 +5026,24 @@ static HRESULT text_to_uint32( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint32( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT32_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint32( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint32( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5059,7 +5052,7 @@ static HRESULT read_type_uint32( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5067,7 +5060,7 @@ static HRESULT read_type_uint32( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT32 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5120,25 +5113,24 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT64_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint64( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint64( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5147,7 +5139,7 @@ static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5155,7 +5147,7 @@ static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT64 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5201,22 +5193,21 @@ static HRESULT text_to_float( const WS_XML_TEXT *text, float *val ) static HRESULT read_type_float( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_FLOAT_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; float val = 0.0; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_float( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_float( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5225,7 +5216,7 @@ static HRESULT read_type_float( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5233,7 +5224,7 @@ static HRESULT read_type_float( struct reader *reader, WS_TYPE_MAPPING mapping, { float *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5279,22 +5270,21 @@ static HRESULT text_to_double( const WS_XML_TEXT *text, double *val ) static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_DOUBLE_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; double val = 0.0; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_double( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_double( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5303,7 +5293,7 @@ static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5311,7 +5301,7 @@ static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, { double *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5343,20 +5333,19 @@ static HRESULT text_to_wsz( const WS_XML_TEXT *text, WS_HEAP *heap, WCHAR **ret static HRESULT read_type_wsz( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_WSZ_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, WCHAR **ret, ULONG size ) + WS_HEAP *heap, WCHAR **ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; WCHAR *str = NULL; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_wsz( text, heap, &str )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_wsz( text, heap, &str )) != S_OK) return hr; switch (option) { @@ -5398,22 +5387,21 @@ static HRESULT get_enum_value( const WS_XML_TEXT *text, const WS_ENUM_DESCRIPTIO static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_ENUM_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; int val = 0; - BOOL found; if (!desc) return E_INVALIDARG; - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = get_enum_value( text, desc, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = get_enum_value( text, desc, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5422,7 +5410,7 @@ static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5430,7 +5418,7 @@ static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, { int *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5476,22 +5464,21 @@ static HRESULT text_to_datetime( const WS_XML_TEXT *text, WS_DATETIME *val ) static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_DATETIME_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; WS_DATETIME val = {0, WS_DATETIME_FORMAT_UTC}; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_datetime( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_datetime( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5500,7 +5487,7 @@ static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mappin break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5508,7 +5495,7 @@ static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mappin { WS_DATETIME *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5554,22 +5541,21 @@ static HRESULT text_to_guid( const WS_XML_TEXT *text, GUID *val ) static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_GUID_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; GUID val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_guid( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_guid( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5578,7 +5564,7 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5586,7 +5572,7 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, { GUID *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5634,22 +5620,21 @@ static HRESULT text_to_unique_id( const WS_XML_TEXT *text, WS_HEAP *heap, WS_UNI static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UNIQUE_ID_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_UNIQUE_ID val = {{0}}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_unique_id( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_unique_id( text, heap, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5658,7 +5643,7 @@ static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mappi break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5666,7 +5651,7 @@ static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mappi { WS_UNIQUE_ID *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5714,17 +5699,16 @@ static HRESULT text_to_string( const WS_XML_TEXT *text, WS_HEAP *heap, WS_STRING static HRESULT read_type_string( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_STRING_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_STRING val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_string( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_string( text, heap, &val )) != S_OK) return hr; switch (option) { @@ -5748,7 +5732,7 @@ static HRESULT read_type_string( struct reader *reader, WS_TYPE_MAPPING mapping, { WS_STRING *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5796,17 +5780,16 @@ static HRESULT text_to_bytes( const WS_XML_TEXT *text, WS_HEAP *heap, WS_BYTES * static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_BYTES_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_BYTES val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_bytes( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_bytes( text, heap, &val )) != S_OK) return hr; switch (option) { @@ -5830,7 +5813,7 @@ static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, { WS_BYTES *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5856,17 +5839,16 @@ static HRESULT text_to_xml_string( const WS_XML_TEXT *text, WS_HEAP *heap, WS_XM static HRESULT read_type_xml_string( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_XML_STRING_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_XML_STRING val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_xml_string( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_xml_string( text, heap, &val )) != S_OK) return hr; switch (option) { @@ -5890,7 +5872,7 @@ static HRESULT read_type_xml_string( struct reader *reader, WS_TYPE_MAPPING mapp { WS_XML_STRING *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5941,12 +5923,11 @@ static HRESULT text_to_qname( struct reader *reader, const WS_XML_TEXT *text, WS static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_XML_QNAME_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_XML_QNAME val = {{0}}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); @@ -5954,13 +5935,13 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, if ((hr = read_startelement( reader )) != S_OK) return hr; if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_qname( reader, text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_qname( reader, text, heap, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5969,7 +5950,7 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5977,7 +5958,7 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, { WS_XML_QNAME *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -6224,7 +6205,7 @@ static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTIO static HRESULT read_type( struct reader *, WS_TYPE_MAPPING, WS_TYPE, const WS_XML_STRING *, const WS_XML_STRING *, const void *, WS_READ_OPTION, WS_HEAP *, - void *, ULONG ); + void *, ULONG, BOOL * ); static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, void **ret, ULONG *count ) @@ -6232,6 +6213,7 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO HRESULT hr; ULONG item_size, nb_items = 0, nb_allocated = 1, offset = 0; WS_READ_OPTION option; + BOOL found; char *buf; if (!(option = get_field_read_option( desc->type, desc->options ))) return E_INVALIDARG; @@ -6257,7 +6239,6 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO if (desc->type == WS_UNION_TYPE) { - BOOL found; hr = read_type_union( reader, desc->typeDescription, heap, buf + offset, item_size, &found ); if (hr != S_OK) { @@ -6269,7 +6250,7 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO else { hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->itemLocalName, desc->itemNs, - desc->typeDescription, option, heap, buf + offset, item_size ); + desc->typeDescription, option, heap, buf + offset, item_size, &found ); if (hr == WS_E_INVALID_FORMAT) break; if (hr != S_OK) { @@ -6301,18 +6282,22 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_READ_OPTION option, WS_HEAP *heap, void *ret, ULONG size ) { + struct reader_pos pos; + BOOL found; HRESULT hr; + if (reader->current == reader->last) { - BOOL found; if ((hr = read_to_startelement( reader, &found )) != S_OK) return hr; if (!found) return WS_E_INVALID_FORMAT; } - if ((hr = read_next_node( reader )) != S_OK) return hr; - if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; - return read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL, - desc->typeDescription, option, heap, ret, size ); + save_reader_position( reader, &pos ); + if ((hr = read_next_node( reader )) != S_OK) return hr; + hr = read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL, + desc->typeDescription, option, heap, ret, size, &found ); + if (hr == S_OK && !found) restore_reader_position( reader, &pos ); + return hr; } static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, char *buf, @@ -6322,6 +6307,7 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO WS_READ_OPTION option; ULONG size; HRESULT hr; + BOOL found; if (!desc) return E_INVALIDARG; if (desc->options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) @@ -6345,17 +6331,16 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO case WS_ATTRIBUTE_FIELD_MAPPING: hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->localName, desc->ns, - desc->typeDescription, option, heap, ptr, size ); + desc->typeDescription, option, heap, ptr, size, &found ); break; case WS_ELEMENT_FIELD_MAPPING: hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->localName, desc->ns, - desc->typeDescription, option, heap, ptr, size ); + desc->typeDescription, option, heap, ptr, size, &found ); break; case WS_ELEMENT_CHOICE_FIELD_MAPPING: { - BOOL found; if (desc->type != WS_UNION_TYPE || !desc->typeDescription || (desc->options & (WS_FIELD_POINTER|WS_FIELD_NILLABLE))) return E_INVALIDARG; hr = read_type_union( reader, desc->typeDescription, heap, ptr, size, &found ); @@ -6406,7 +6391,7 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_STRUCT_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { ULONG i, offset; HRESULT hr; @@ -6481,6 +6466,8 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, struct node *parent = find_parent( reader ); parent->flags |= NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT; } + + *found = TRUE; return S_OK; } @@ -6576,7 +6563,7 @@ static HRESULT is_nil_element( const WS_XML_ELEMENT_NODE *elem ) static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYPE type, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const void *desc, - WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size, BOOL *found ) { HRESULT hr; @@ -6585,114 +6572,94 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP if (mapping == WS_ELEMENT_TYPE_MAPPING && is_nil_element( &reader->current->hdr )) { if (option != WS_READ_NILLABLE_POINTER && option != WS_READ_NILLABLE_VALUE) return WS_E_INVALID_FORMAT; + *found = TRUE; return end_mapping( reader, mapping ); } switch (type) { case WS_BOOL_TYPE: - if ((hr = read_type_bool( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_bool( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT8_TYPE: - if ((hr = read_type_int8( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int8( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT16_TYPE: - if ((hr = read_type_int16( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int16( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT32_TYPE: - if ((hr = read_type_int32( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int32( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT64_TYPE: - if ((hr = read_type_int64( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int64( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT8_TYPE: - if ((hr = read_type_uint8( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint8( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT16_TYPE: - if ((hr = read_type_uint16( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint16( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT32_TYPE: - if ((hr = read_type_uint32( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint32( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT64_TYPE: - if ((hr = read_type_uint64( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint64( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_FLOAT_TYPE: - if ((hr = read_type_float( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_float( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_DOUBLE_TYPE: - if ((hr = read_type_double( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_double( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_DATETIME_TYPE: - if ((hr = read_type_datetime( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_datetime( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_GUID_TYPE: - if ((hr = read_type_guid( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_guid( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UNIQUE_ID_TYPE: - if ((hr = read_type_unique_id( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_unique_id( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_STRING_TYPE: - if ((hr = read_type_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_string( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_WSZ_TYPE: - if ((hr = read_type_wsz( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_wsz( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_BYTES_TYPE: - if ((hr = read_type_bytes( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_bytes( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_XML_STRING_TYPE: - if ((hr = read_type_xml_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_xml_string( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_XML_QNAME_TYPE: - if ((hr = read_type_qname( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_qname( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_STRUCT_TYPE: - if ((hr = read_type_struct( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_struct( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_ENUM_TYPE: - if ((hr = read_type_enum( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_enum( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; default: @@ -6700,6 +6667,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return E_NOTIMPL; } + if (hr != S_OK) return hr; return end_mapping( reader, mapping ); } @@ -6711,6 +6679,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY ULONG size, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; TRACE( "%p %u %u %p %u %p %p %u %p\n", handle, mapping, type, desc, option, heap, value, @@ -6727,7 +6696,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY return E_INVALIDARG; } - if ((hr = read_type( reader, mapping, type, NULL, NULL, desc, option, heap, value, size )) != S_OK) + if ((hr = read_type( reader, mapping, type, NULL, NULL, desc, option, heap, value, size, &found )) != S_OK) { LeaveCriticalSection( &reader->cs ); return hr; @@ -6754,6 +6723,7 @@ HRESULT read_header( WS_XML_READER *handle, const WS_XML_STRING *localname, cons ULONG size ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; EnterCriticalSection( &reader->cs ); @@ -6765,7 +6735,7 @@ HRESULT read_header( WS_XML_READER *handle, const WS_XML_STRING *localname, cons } hr = read_type( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, type, localname, ns, desc, option, heap, - value, size ); + value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; @@ -6779,6 +6749,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); @@ -6795,7 +6766,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO } hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->elementLocalName, - desc->elementNs, desc->typeDescription, option, heap, value, size ); + desc->elementNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; @@ -6809,6 +6780,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi { struct reader *reader = (struct reader *)handle; WS_TYPE type = map_value_type( value_type ); + BOOL found; HRESULT hr; TRACE( "%p %u %p %u %p\n", handle, type, value, size, error ); @@ -6825,7 +6797,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi } hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, type, NULL, NULL, NULL, WS_READ_REQUIRED_VALUE, - NULL, value, size ); + NULL, value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; @@ -6839,6 +6811,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); @@ -6861,7 +6834,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI } hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->attributeLocalName, - desc->attributeNs, desc->typeDescription, option, heap, value, size ); + desc->attributeNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7dd7979522..bd8a37cc52 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -6539,6 +6539,155 @@ static void test_repeating_element_choice(void) WsFreeHeap( heap ); } +static void test_empty_text_field(void) +{ + static WS_XML_STRING str_ns = {0, NULL}, str_t = {1, (BYTE *)"t"}; + HRESULT hr; + WS_XML_READER *reader; + WS_HEAP *heap; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION s; + struct test + { + WS_STRING str; + } *test; + struct test2 + { + WCHAR *str; + } *test2; + struct test3 + { + BOOL bool; + } *test3; + struct test4 + { + WS_XML_STRING str; + } *test4; + struct test5 + { + WS_BYTES bytes; + } *test5; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_STRING_TYPE; + f.offset = FIELD_OFFSET(struct test, str); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + ok( !test->str.length, "got %u\n", test->str.length ); + todo_wine ok( test->str.chars != NULL, "chars not set\n" ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + f.offset = FIELD_OFFSET(struct test2, str); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test2); + s.alignment = TYPE_ALIGNMENT(struct test2); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test2 = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test2, sizeof(test2), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test2 != NULL, "test2 not set\n" ); + ok( test2->str != NULL, "str not set\n" ); + ok( !test2->str[0], "not empty\n" ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_BOOL_TYPE; + f.offset = FIELD_OFFSET(struct test3, bool); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test3); + s.alignment = TYPE_ALIGNMENT(struct test3); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test3, sizeof(test3), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_XML_STRING_TYPE; + f.offset = FIELD_OFFSET(struct test4, str); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test4); + s.alignment = TYPE_ALIGNMENT(struct test4); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test4 = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test4, sizeof(test4), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test4 != NULL, "test4 not set\n" ); + ok( !test4->str.length, "got %u\n", test4->str.length ); + todo_wine ok( test4->str.bytes != NULL, "bytes not set\n" ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_BYTES_TYPE; + f.offset = FIELD_OFFSET(struct test5, bytes); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test5); + s.alignment = TYPE_ALIGNMENT(struct test5); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test5 = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test5, sizeof(test5), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test5 != NULL, "test5 not set\n" ); + ok( !test5->bytes.length, "got %u\n", test5->bytes.length ); + todo_wine ok( test5->bytes.bytes != NULL, "bytes not set\n" ); + + WsFreeReader( reader ); + WsFreeHeap( heap ); +} START_TEST(reader) { @@ -6588,4 +6737,5 @@ START_TEST(reader) test_union_type(); test_float(); test_repeating_element_choice(); + test_empty_text_field(); } -- 2.11.0

June 6, 2018

[PATCH 3/4] webservices: Handle WS_XML_TEXT_TYPE_INT64 in text_to_uint64.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 79a1af63bf..6925200a59 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5095,6 +5095,13 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) hr = str_to_uint64( text_utf8->value.bytes, text_utf8->value.length, MAX_UINT64, val ); break; } + case WS_XML_TEXT_TYPE_INT64: + { + const WS_XML_INT64_TEXT *text_int64 = (const WS_XML_INT64_TEXT *)text; + *val = text_int64->value; + hr = S_OK; + break; + } case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; -- 2.11.0

June 6, 2018

[PATCH 2/4] webservices/tests: Make test data local if it's only used in one place.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/reader.c | 116 +++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 62 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7064cf0f82..7dd7979522 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -67,57 +67,6 @@ static const char data9[] = static const char data10[] = "<a></b>"; -static const char data11[] = - "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" - "<o:services o:GenerationTime=\"2015-09-03T18:47:54\">" - "" - "</o:services>" - "</o:OfficeConfig>"; - -static const char data11b[] = - "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" - "<o:services o:GenerationTime=\"2015-09-03T18:47:54\"></o:services>" - "<trailing>content</trailing>" - "</o:OfficeConfig>"; - -static const char data12[] = - "<services>" - "<service><id>1</id></service>" - "<service><id>2</id></service>" - "</services>"; - -static const char data13[] = - "<services></services>"; - -static const char data14[] = - "<services>" - "<wrapper>" - "<service><id>1</id></service>" - "<service><id>2</id></service>" - "</wrapper>" - "</services>"; - -static const char data15[] = - "<services>" - "<wrapper>" - "<service>1</service>" - "<service>2</service>" - "</wrapper>" - "</services>"; - -static const char data16[] = - "<services>" - "<wrapper>" - "<service name='1'>1</service>" - "<service name='2'>2</service>" - "</wrapper>" - "</services>"; - -static const char data17[] = - "<services>" - "<service><name></name></service>" - "</services>"; - static void test_WsCreateError(void) { HRESULT hr; @@ -2997,6 +2946,17 @@ static void test_text_field_mapping(void) static void test_complex_struct_type(void) { + static const char data[] = + "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" + "<o:services o:GenerationTime=\"2015-09-03T18:47:54\">" + "" + "</o:services>" + "</o:OfficeConfig>"; + static const char data2[] = + "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" + "<o:services o:GenerationTime=\"2015-09-03T18:47:54\"></o:services>" + "<trailing>content</trailing>" + "</o:OfficeConfig>"; static const WCHAR timestampW[] = {'2','0','1','5','-','0','9','-','0','3','T','1','8',':','4','7',':','5','4',0}; HRESULT hr; @@ -3035,7 +2995,7 @@ static void test_complex_struct_type(void) ok( hr == S_OK, "got %08x\n", hr ); /* element content type mapping */ - prepare_struct_type_test( reader, data11 ); + prepare_struct_type_test( reader, data ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3112,7 +3072,7 @@ static void test_complex_struct_type(void) ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); /* element type mapping */ - prepare_struct_type_test( reader, data11 ); + prepare_struct_type_test( reader, data ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3136,7 +3096,7 @@ static void test_complex_struct_type(void) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); /* trailing content */ - prepare_struct_type_test( reader, data11b ); + prepare_struct_type_test( reader, data2 ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3149,7 +3109,7 @@ static void test_complex_struct_type(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); - prepare_struct_type_test( reader, data11b ); + prepare_struct_type_test( reader, data2 ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3165,6 +3125,38 @@ static void test_complex_struct_type(void) static void test_repeating_element(void) { + static const char data[] = + "<services>" + "<service><id>1</id></service>" + "<service><id>2</id></service>" + "</services>"; + static const char data2[] = + "<services></services>"; + static const char data3[] = + "<services>" + "<wrapper>" + "<service><id>1</id></service>" + "<service><id>2</id></service>" + "</wrapper>" + "</services>"; + static const char data4[] = + "<services>" + "<wrapper>" + "<service>1</service>" + "<service>2</service>" + "</wrapper>" + "</services>"; + static const char data5[] = + "<services>" + "<wrapper>" + "<service name='1'>1</service>" + "<service name='2'>2</service>" + "</wrapper>" + "</services>"; + static const char data6[] = + "<services>" + "<service><name></name></service>" + "</services>"; static const WCHAR oneW[] = {'1',0}, twoW[] = {'2',0}; WS_XML_STRING str_name = {4, (BYTE *)"name"}; WS_XML_STRING str_services = {8, (BYTE *)"services"}; @@ -3214,7 +3206,7 @@ static void test_repeating_element(void) hr = WsCreateReader( NULL, 0, &reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - prepare_struct_type_test( reader, data12 ); + prepare_struct_type_test( reader, data ); memset( &f2, 0, sizeof(f2) ); f2.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -3257,7 +3249,7 @@ static void test_repeating_element(void) ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); /* array of pointers */ - prepare_struct_type_test( reader, data12 ); + prepare_struct_type_test( reader, data ); f.options = WS_FIELD_POINTER; test4 = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, @@ -3272,7 +3264,7 @@ static void test_repeating_element(void) } /* item range */ - prepare_struct_type_test( reader, data13 ); + prepare_struct_type_test( reader, data2 ); f.options = 0; range.minItemCount = 0; range.maxItemCount = 1; @@ -3286,7 +3278,7 @@ static void test_repeating_element(void) ok( !test->service_count, "got %u\n", test->service_count ); /* wrapper element */ - prepare_struct_type_test( reader, data14 ); + prepare_struct_type_test( reader, data3 ); f.itemRange = NULL; f.localName = &str_wrapper; f.ns = &str_ns; @@ -3301,7 +3293,7 @@ static void test_repeating_element(void) ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); /* repeating text field mapping */ - prepare_struct_type_test( reader, data15 ); + prepare_struct_type_test( reader, data4 ); f2.mapping = WS_TEXT_FIELD_MAPPING; f2.localName = NULL; f2.ns = NULL; @@ -3319,7 +3311,7 @@ static void test_repeating_element(void) ok( !lstrcmpW( test2->service[1].id, twoW ), "wrong data\n" ); /* repeating attribute field + text field mapping */ - prepare_struct_type_test( reader, data16 ); + prepare_struct_type_test( reader, data5 ); f2.offset = FIELD_OFFSET(struct service3, id); memset( &f3, 0, sizeof(f3) ); f3.mapping = WS_ATTRIBUTE_FIELD_MAPPING; @@ -3344,7 +3336,7 @@ static void test_repeating_element(void) ok( !lstrcmpW( test3->service[1].id, twoW ), "wrong data\n" ); /* empty text, item range */ - prepare_struct_type_test( reader, data17 ); + prepare_struct_type_test( reader, data6 ); memset( &f2, 0, sizeof(f2) ); f2.mapping = WS_ELEMENT_FIELD_MAPPING; -- 2.11.0

June 6, 2018

[PATCH 1/4] webservices: Call WSACleanup when the dll is unloaded.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/listener.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index a178e276e4..357a1c6a53 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(webservices); +HINSTANCE webservices_instance; + static BOOL winsock_loaded; static BOOL WINAPI winsock_startup( INIT_ONCE *once, void *param, void **ctx ) @@ -48,6 +50,26 @@ void winsock_init(void) InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); } +/****************************************************************** + * DllMain (webservices.@) + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + webservices_instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; + if (winsock_loaded) WSACleanup(); + break; + } + return TRUE; +} + static const struct prop_desc listener_props[] = { { sizeof(ULONG), FALSE }, /* WS_LISTENER_PROPERTY_LISTEN_BACKLOG */ -- 2.11.0

June 6, 2018

Re: [PATCH v2] comctl32/edit/tests: Add interactive test showing a rendering glitch

by Nikolay Sivov

Do you know what's going on there? Is this about Edit painting logic, or about Edit being used in a dialog?

June 6, 2018

[PATCH] winevulkan: Add copyright headers to files generated from vk.xml.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This patch could be applied after 147041. --- dlls/vulkan-1/vulkan-1.spec | 34 ++++++++++++++++++++++++++++++++++ dlls/winevulkan/make_vulkan | 26 +++++++++++++++++++------- dlls/winevulkan/vulkan_thunks.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 37 ++++++++++++++++++++++++++++++++++++- dlls/winevulkan/winevulkan.spec | 34 ++++++++++++++++++++++++++++++++++ include/wine/vulkan.h | 37 ++++++++++++++++++++++++++++++++++++- include/wine/vulkan_driver.h | 37 ++++++++++++++++++++++++++++++++++++- 7 files changed, 231 insertions(+), 11 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index 3d457749b46a..0a4e85e96859 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -1,4 +1,38 @@ # Automatically generated from Vulkan vk.xml; DO NOT EDIT! +# +# This file is generated from Vulkan vk.xml file covered +# by the following copyright and permission notice: +# +# Copyright (c) 2015-2018 The Khronos Group Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ---- Exceptions to the Apache 2.0 License: ---- +# +# As an exception, if you use this Software to generate code and portions of +# this Software are embedded into the generated code as a result, you may +# redistribute such product without providing attribution as would otherwise +# be required by Sections 4(a), 4(b) and 4(d) of the License. +# +# In addition, if you combine or link code generated by this Software with +# software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 +# ("`Combined Software`") and if a court of competent jurisdiction determines +# that the patent provision (Section 3), the indemnity provision (Section 9) +# or other Section of the License conflicts with the conditions of the +# applicable GPL or LGPL license, you may retroactively and prospectively +# choose to deem waived or otherwise exclude such Section(s) of the License, +# but only in their entirety and only with respect to the Combined Software. +# @ stdcall vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) winevulkan.wine_vkAcquireNextImageKHR @ stdcall vkAllocateCommandBuffers(ptr ptr ptr) winevulkan.wine_vkAllocateCommandBuffers diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 69ea807389e7..ea64c052fa5f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1893,9 +1893,19 @@ class VkGenerator(object): if not any(s.name == conv.struct.name for s in self.host_structs): self.host_structs.append(conv.struct) - def generate_thunks_c(self, f, prefix): - f.write("/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */\n\n") + def _generate_copyright(self, f, spec_file=False): + c = "# " if spec_file else " * " + f.write("# " if spec_file else "/* ") + f.write("Automatically generated from Vulkan vk.xml; DO NOT EDIT!\n") + lines = ["", "This file is generated from Vulkan vk.xml file covered", + "by the following copyright and permission notice:"] + lines.extend([l.rstrip(" ") for l in self.registry.copyright.splitlines()]) + for line in lines: + f.write("{0}{1}".format("# " if spec_file else " * ", line).rstrip(" ") + "\n") + f.write("\n" if spec_file else " */\n\n") + def generate_thunks_c(self, f, prefix): + self._generate_copyright(f) f.write("#include \"config.h\"\n") f.write("#include \"wine/port.h\"\n\n") @@ -2011,7 +2021,7 @@ class VkGenerator(object): f.write("}\n") def generate_thunks_h(self, f, prefix): - f.write("/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */\n\n") + self._generate_copyright(f) f.write("#ifndef __WINE_VULKAN_THUNKS_H\n") f.write("#define __WINE_VULKAN_THUNKS_H\n\n") @@ -2109,7 +2119,7 @@ class VkGenerator(object): f.write("#endif /* __WINE_VULKAN_THUNKS_H */\n") def generate_vulkan_h(self, f): - f.write("/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */\n\n") + self._generate_copyright(f) f.write("#ifndef __WINE_VULKAN_H\n") f.write("#define __WINE_VULKAN_H\n\n") @@ -2203,7 +2213,7 @@ class VkGenerator(object): f.write("#endif /* __WINE_VULKAN_H */\n") def generate_vulkan_driver_h(self, f): - f.write("/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */\n\n") + self._generate_copyright(f) f.write("#ifndef __WINE_VULKAN_DRIVER_H\n") f.write("#define __WINE_VULKAN_DRIVER_H\n\n") @@ -2231,7 +2241,7 @@ class VkGenerator(object): f.write("#endif /* __WINE_VULKAN_DRIVER_H */\n") def generate_vulkan_spec(self, f): - f.write("# Automatically generated from Vulkan vk.xml; DO NOT EDIT!\n\n") + self._generate_copyright(f, spec_file=True) f.write("@ stdcall vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr\n") f.write("@ stdcall vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion\n") @@ -2252,7 +2262,7 @@ class VkGenerator(object): f.write("@ stub {0}\n".format(func.name)) def generate_vulkan_loader_spec(self, f): - f.write("# Automatically generated from Vulkan vk.xml; DO NOT EDIT!\n\n") + self._generate_copyright(f, spec_file=True) # Export symbols for all Vulkan Core functions. for func in self.registry.funcs.values(): @@ -2303,6 +2313,8 @@ class VkRegistry(object): self._parse_features(root) self._parse_extensions(root) + self.copyright = root.find('./comment').text + def _mark_command_required(self, command): """ Helper function to mark a certain command and the datatypes it needs as required.""" def mark_bitmask_dependencies(bitmask, types): diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index cdb229d7df32..2f89fdb5bde4 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1,4 +1,39 @@ -/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */ +/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! + * + * This file is generated from Vulkan vk.xml file covered + * by the following copyright and permission notice: + * + * Copyright (c) 2015-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ---- Exceptions to the Apache 2.0 License: ---- + * + * As an exception, if you use this Software to generate code and portions of + * this Software are embedded into the generated code as a result, you may + * redistribute such product without providing attribution as would otherwise + * be required by Sections 4(a), 4(b) and 4(d) of the License. + * + * In addition, if you combine or link code generated by this Software with + * software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 + * ("`Combined Software`") and if a court of competent jurisdiction determines + * that the patent provision (Section 3), the indemnity provision (Section 9) + * or other Section of the License conflicts with the conditions of the + * applicable GPL or LGPL license, you may retroactively and prospectively + * choose to deem waived or otherwise exclude such Section(s) of the License, + * but only in their entirety and only with respect to the Combined Software. + * + */ #include "config.h" #include "wine/port.h" diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index f193c4310761..55645afd4735 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -1,4 +1,39 @@ -/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */ +/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! + * + * This file is generated from Vulkan vk.xml file covered + * by the following copyright and permission notice: + * + * Copyright (c) 2015-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ---- Exceptions to the Apache 2.0 License: ---- + * + * As an exception, if you use this Software to generate code and portions of + * this Software are embedded into the generated code as a result, you may + * redistribute such product without providing attribution as would otherwise + * be required by Sections 4(a), 4(b) and 4(d) of the License. + * + * In addition, if you combine or link code generated by this Software with + * software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 + * ("`Combined Software`") and if a court of competent jurisdiction determines + * that the patent provision (Section 3), the indemnity provision (Section 9) + * or other Section of the License conflicts with the conditions of the + * applicable GPL or LGPL license, you may retroactively and prospectively + * choose to deem waived or otherwise exclude such Section(s) of the License, + * but only in their entirety and only with respect to the Combined Software. + * + */ #ifndef __WINE_VULKAN_THUNKS_H #define __WINE_VULKAN_THUNKS_H diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 551c7fd89724..b923c6422518 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -1,4 +1,38 @@ # Automatically generated from Vulkan vk.xml; DO NOT EDIT! +# +# This file is generated from Vulkan vk.xml file covered +# by the following copyright and permission notice: +# +# Copyright (c) 2015-2018 The Khronos Group Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ---- Exceptions to the Apache 2.0 License: ---- +# +# As an exception, if you use this Software to generate code and portions of +# this Software are embedded into the generated code as a result, you may +# redistribute such product without providing attribution as would otherwise +# be required by Sections 4(a), 4(b) and 4(d) of the License. +# +# In addition, if you combine or link code generated by this Software with +# software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 +# ("`Combined Software`") and if a court of competent jurisdiction determines +# that the patent provision (Section 3), the indemnity provision (Section 9) +# or other Section of the License conflicts with the conditions of the +# applicable GPL or LGPL license, you may retroactively and prospectively +# choose to deem waived or otherwise exclude such Section(s) of the License, +# but only in their entirety and only with respect to the Combined Software. +# @ stdcall vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr @ stdcall vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 74ff22b52e08..93e0d0118ff8 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -1,4 +1,39 @@ -/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */ +/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! + * + * This file is generated from Vulkan vk.xml file covered + * by the following copyright and permission notice: + * + * Copyright (c) 2015-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ---- Exceptions to the Apache 2.0 License: ---- + * + * As an exception, if you use this Software to generate code and portions of + * this Software are embedded into the generated code as a result, you may + * redistribute such product without providing attribution as would otherwise + * be required by Sections 4(a), 4(b) and 4(d) of the License. + * + * In addition, if you combine or link code generated by this Software with + * software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 + * ("`Combined Software`") and if a court of competent jurisdiction determines + * that the patent provision (Section 3), the indemnity provision (Section 9) + * or other Section of the License conflicts with the conditions of the + * applicable GPL or LGPL license, you may retroactively and prospectively + * choose to deem waived or otherwise exclude such Section(s) of the License, + * but only in their entirety and only with respect to the Combined Software. + * + */ #ifndef __WINE_VULKAN_H #define __WINE_VULKAN_H diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 60d16dd52a24..c11cf33e9c88 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -1,4 +1,39 @@ -/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */ +/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! + * + * This file is generated from Vulkan vk.xml file covered + * by the following copyright and permission notice: + * + * Copyright (c) 2015-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ---- Exceptions to the Apache 2.0 License: ---- + * + * As an exception, if you use this Software to generate code and portions of + * this Software are embedded into the generated code as a result, you may + * redistribute such product without providing attribution as would otherwise + * be required by Sections 4(a), 4(b) and 4(d) of the License. + * + * In addition, if you combine or link code generated by this Software with + * software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 + * ("`Combined Software`") and if a court of competent jurisdiction determines + * that the patent provision (Section 3), the indemnity provision (Section 9) + * or other Section of the License conflicts with the conditions of the + * applicable GPL or LGPL license, you may retroactively and prospectively + * choose to deem waived or otherwise exclude such Section(s) of the License, + * but only in their entirety and only with respect to the Combined Software. + * + */ #ifndef __WINE_VULKAN_DRIVER_H #define __WINE_VULKAN_DRIVER_H -- 2.16.4

June 6, 2018