August 2016 - Wine-commits - list.winehq.org

Henri Verbeet : ddraw: Rename "wineD3DVertexBuffer" to "wined3d_buffer".
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: d2b782f4e4f0efa6e783031d57cf98789cdc4742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2b782f4e4f0efa6e783031d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 26 13:51:22 2016 +0200 ddraw: Rename "wineD3DVertexBuffer" to "wined3d_buffer". Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/vertexbuffer.c | 25 ++++++++++++------------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f7b8cd0..a908c11 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -552,7 +552,7 @@ struct d3d_vertex_buffer LONG ref; /*** WineD3D and ddraw links ***/ - struct wined3d_buffer *wineD3DVertexBuffer; + struct wined3d_buffer *wined3d_buffer; struct wined3d_vertex_declaration *wineD3DVertexDeclaration; struct ddraw *ddraw; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3598bd8..a473682 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4277,8 +4277,8 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE wined3d_mutex_lock(); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wineD3DVertexDeclaration); - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wineD3DVertexBuffer, 0, stride); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, + 0, vb_impl->wined3d_buffer, 0, stride))) { WARN("Failed to set stream source, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -4409,8 +4409,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT, 0); /* Set the vertex stream source */ - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wineD3DVertexBuffer, 0, stride); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, + 0, vb_impl->wined3d_buffer, 0, stride))) { ERR("(%p) IDirect3DDevice::SetStreamSource failed with hr = %08x\n", device, hr); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 84c0e69..9b86129 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -155,11 +155,11 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) wined3d_mutex_lock(); wined3d_device_get_stream_source(buffer->ddraw->wined3d_device, 0, &curVB, &offset, &stride); - if (curVB == buffer->wineD3DVertexBuffer) + if (curVB == buffer->wined3d_buffer) wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0); wined3d_vertex_declaration_decref(buffer->wineD3DVertexDeclaration); - wined3d_buffer_decref(buffer->wineD3DVertexBuffer); + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, buffer); @@ -253,8 +253,8 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, if (SUCCEEDED(hr)) { buffer->dynamic = TRUE; - wined3d_buffer_decref(buffer->wineD3DVertexBuffer); - buffer->wineD3DVertexBuffer = new_buffer; + wined3d_buffer_decref(buffer->wined3d_buffer); + buffer->wined3d_buffer = new_buffer; } else { @@ -268,12 +268,12 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, if (data_size) { /* Get the size, for returning it, and for locking */ - wined3d_resource = wined3d_buffer_get_resource(buffer->wineD3DVertexBuffer); + wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); *data_size = wined3d_desc.size; } - hr = wined3d_buffer_map(buffer->wineD3DVertexBuffer, 0, 0, (BYTE **)data, wined3d_flags); + hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, wined3d_flags); wined3d_mutex_unlock(); @@ -306,7 +306,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Unlock(IDirect3DVertexBuffer7 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wineD3DVertexBuffer); + wined3d_buffer_unmap(buffer->wined3d_buffer); wined3d_mutex_unlock(); return D3D_OK; @@ -382,10 +382,10 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, doClip); wined3d_device_set_stream_source(device_impl->wined3d_device, - 0, src_buffer_impl->wineD3DVertexBuffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf)); + 0, src_buffer_impl->wined3d_buffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf)); wined3d_device_set_vertex_declaration(device_impl->wined3d_device, src_buffer_impl->wineD3DVertexDeclaration); hr = wined3d_device_process_vertices(device_impl->wined3d_device, src_idx, dst_idx, - count, dst_buffer_impl->wineD3DVertexBuffer, NULL, flags, dst_buffer_impl->fvf); + count, dst_buffer_impl->wined3d_buffer, NULL, flags, dst_buffer_impl->fvf); /* Restore the states if needed */ if (doClip != oldClip) @@ -436,7 +436,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_GetVertexBufferDesc(IDirect3DVertexBuff if (!desc) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_resource = wined3d_buffer_get_resource(buffer->wineD3DVertexBuffer); + wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); @@ -595,8 +595,7 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, wined3d_mutex_lock(); - hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, FALSE, &buffer->wineD3DVertexBuffer); - if (FAILED(hr)) + if (FAILED(hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, FALSE, &buffer->wined3d_buffer))) { WARN("Failed to create wined3d vertex buffer, hr %#x.\n", hr); if (hr == WINED3DERR_INVALIDCALL) @@ -608,7 +607,7 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, if (!buffer->wineD3DVertexDeclaration) { ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF); - wined3d_buffer_decref(buffer->wineD3DVertexBuffer); + wined3d_buffer_decref(buffer->wined3d_buffer); hr = DDERR_INVALIDPARAMS; goto end; }

1 0

Henri Verbeet : ddraw: Rename "wineD3DVertexDeclaration" to " wined3d_declaration".
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 6e7d370209e628c2a3707ac38f09ff7977e00592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7d370209e628c2a3707ac38… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 26 13:51:23 2016 +0200 ddraw: Rename "wineD3DVertexDeclaration" to "wined3d_declaration". Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/vertexbuffer.c | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a908c11..7c2f026 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -553,7 +553,7 @@ struct d3d_vertex_buffer /*** WineD3D and ddraw links ***/ struct wined3d_buffer *wined3d_buffer; - struct wined3d_vertex_declaration *wineD3DVertexDeclaration; + struct wined3d_vertex_declaration *wined3d_declaration; struct ddraw *ddraw; /*** Storage for D3D7 specific things ***/ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a473682..09cc5f1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4276,7 +4276,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE stride = get_flexible_vertex_size(vb_impl->fvf); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wineD3DVertexDeclaration); + wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wined3d_buffer, 0, stride))) { @@ -4375,7 +4375,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wineD3DVertexDeclaration); + wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); if (FAILED(hr)) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 9b86129..a88d5b5 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -158,7 +158,7 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) if (curVB == buffer->wined3d_buffer) wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0); - wined3d_vertex_declaration_decref(buffer->wineD3DVertexDeclaration); + wined3d_vertex_declaration_decref(buffer->wined3d_declaration); wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); @@ -383,7 +383,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 wined3d_device_set_stream_source(device_impl->wined3d_device, 0, src_buffer_impl->wined3d_buffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf)); - wined3d_device_set_vertex_declaration(device_impl->wined3d_device, src_buffer_impl->wineD3DVertexDeclaration); + wined3d_device_set_vertex_declaration(device_impl->wined3d_device, src_buffer_impl->wined3d_declaration); hr = wined3d_device_process_vertices(device_impl->wined3d_device, src_idx, dst_idx, count, dst_buffer_impl->wined3d_buffer, NULL, flags, dst_buffer_impl->fvf); @@ -603,15 +603,14 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, goto end; } - buffer->wineD3DVertexDeclaration = ddraw_find_decl(ddraw, desc->dwFVF); - if (!buffer->wineD3DVertexDeclaration) + if (!(buffer->wined3d_declaration = ddraw_find_decl(ddraw, desc->dwFVF))) { ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF); wined3d_buffer_decref(buffer->wined3d_buffer); hr = DDERR_INVALIDPARAMS; goto end; } - wined3d_vertex_declaration_incref(buffer->wineD3DVertexDeclaration); + wined3d_vertex_declaration_incref(buffer->wined3d_declaration); end: wined3d_mutex_unlock();

1 0

Huw Davies : crypt32/tests: Win 10 accepts carriage returns within a base64 four character block.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 30cdd1fb8cea410cb9e363b16278528669e2c19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cdd1fb8cea410cb9e363b16… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 26 15:03:00 2016 +0100 crypt32/tests: Win 10 accepts carriage returns within a base64 four character block. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 335b9b7..48494b5 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -306,9 +306,6 @@ struct BadString }; static const struct BadString badStrings[] = { - { "A\r\nA\r\n=\r\n=\r\n", CRYPT_STRING_BASE64 }, - { "AA\r\n=\r\n=\r\n", CRYPT_STRING_BASE64 }, - { "AA=\r\n=\r\n", CRYPT_STRING_BASE64 }, { "-----BEGIN X509 CRL-----\r\nAA==\r\n", CRYPT_STRING_BASE64X509CRLHEADER }, }; @@ -340,7 +337,7 @@ static void testStringToBinaryA(void) ret = pCryptStringToBinaryA(badStrings[i].str, 0, badStrings[i].format, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); + "%d: Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", i, ret, GetLastError()); } /* Good strings */ for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)

1 0

Hans Leidekker : webservices: Fix the condition to determine when to skip writing a namespace attribute.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 39509987780cac86e5e5af721bbe46e85e70bd88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39509987780cac86e5e5af721… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:45 2016 +0200 webservices: Fix the condition to determine when to skip writing a namespace attribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 177c6e0..d3fe269 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -558,6 +558,12 @@ static HRESULT write_add_namespace_attribute( struct writer *writer, const WS_XM return S_OK; } +static inline BOOL str_equal( const WS_XML_STRING *str1, const WS_XML_STRING *str2 ) +{ + if (!str1 && !str2) return TRUE; + return WsXmlStringEquals( str1, str2, NULL ) == S_OK; +} + static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_STRING *prefix, const WS_XML_STRING *ns ) { @@ -572,11 +578,8 @@ static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_ST for (i = 0; i < elem->attributeCount; i++) { if (!elem->attributes[i]->isXmlNs) continue; - if (WsXmlStringEquals( elem->attributes[i]->prefix, prefix, NULL ) == S_OK && - WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) == S_OK) - { - return TRUE; - } + if (str_equal( elem->attributes[i]->prefix, prefix ) && + str_equal( elem->attributes[i]->ns, ns )) return TRUE; } } return FALSE; @@ -587,8 +590,7 @@ static HRESULT write_set_element_namespace( struct writer *writer ) WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; HRESULT hr; - if (!elem->ns->length || is_current_namespace( writer, elem->ns ) || - namespace_in_scope( elem, elem->prefix, elem->ns )) return S_OK; + if (!elem->ns->length || namespace_in_scope( elem, elem->prefix, elem->ns )) return S_OK; if ((hr = write_add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) return hr;

1 0

Hans Leidekker : webservices: Add support for writing WS_STRING and WS_XML_STRING values.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 864559db02c3077153b270bb24549e45eac270bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=864559db02c3077153b270bb2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:46 2016 +0200 webservices: Add support for writing WS_STRING and WS_XML_STRING values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 52 ++++++++++++++++++++++++++++++++++++++++- dlls/webservices/writer.c | 46 ++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 58a4544..128e66e 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -577,10 +577,13 @@ static void test_WsWriteType(void) static void test_basic_type(void) { + static WCHAR testW[] = {'t','e','s','t',0}; HRESULT hr; WS_XML_WRITER *writer; - WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}, xmlstr; GUID guid; + WCHAR *str; + WS_STRING string; ULONG i; static const struct { @@ -687,6 +690,53 @@ static void test_basic_type(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t>00000000-0000-0000-0000-000000000000</t>", __LINE__ ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + string.chars = testW; + string.length = 4; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRING_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &string, sizeof(string), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>test</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + str = testW; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, + &str, sizeof(str), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>test</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + xmlstr.bytes = (BYTE *)"test"; + xmlstr.length = 4; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_XML_STRING_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &xmlstr, sizeof(xmlstr), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>test</t>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index d3fe269..1ee5f1a 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1516,6 +1516,22 @@ static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping, return write_type_text( writer, mapping, &utf8.text ); } +static HRESULT write_type_string( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_STRING_DESCRIPTION *desc, const WS_STRING *value ) +{ + WS_XML_UTF16_TEXT utf16; + + if (desc) + { + FIXME( "description not supported\n" ); + return E_NOTIMPL; + } + utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; + utf16.bytes = (BYTE *)value->chars; + utf16.byteCount = value->length * sizeof(WCHAR); + return write_type_text( writer, mapping, &utf16.text ); +} + static HRESULT write_type_wsz( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_WSZ_DESCRIPTION *desc, const WCHAR *value ) { @@ -1532,6 +1548,22 @@ static HRESULT write_type_wsz( struct writer *writer, WS_TYPE_MAPPING mapping, return write_type_text( writer, mapping, &utf16.text ); } +static HRESULT write_type_xml_string( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_XML_STRING_DESCRIPTION *desc, const WS_XML_STRING *value ) +{ + WS_XML_UTF8_TEXT utf8; + + if (desc) + { + FIXME( "description not supported\n" ); + return E_NOTIMPL; + } + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = value->bytes; + utf8.value.length = value->length; + return write_type_text( writer, mapping, &utf8.text ); +} + static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, const void *, ULONG ); @@ -1744,6 +1776,13 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_guid( writer, mapping, desc, ptr ); } + case WS_STRING_TYPE: + { + const WS_STRING *ptr; + if (!option) option = WS_WRITE_REQUIRED_VALUE; + if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; + return write_type_string( writer, mapping, desc, ptr ); + } case WS_WSZ_TYPE: { const WCHAR *ptr; @@ -1754,6 +1793,13 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_wsz( writer, mapping, desc, ptr ); } + case WS_XML_STRING_TYPE: + { + const WS_XML_STRING *ptr; + if (!option) option = WS_WRITE_REQUIRED_VALUE; + if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; + return write_type_xml_string( writer, mapping, desc, ptr ); + } default: FIXME( "type %u not supported\n", type ); return E_NOTIMPL;

1 0

Hans Leidekker : webservices: Ignore unimplemented struct options in the writer.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 06fb21c58ab29fc988c3ab9fe445526e8774a915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06fb21c58ab29fc988c3ab9fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:47 2016 +0200 webservices: Ignore unimplemented struct options in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1ee5f1a..89f9465 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1652,11 +1652,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping HRESULT hr; const char *ptr; - if (desc->structOptions) - { - FIXME( "struct options 0x%x not supported\n", desc->structOptions ); - return E_NOTIMPL; - } + if (desc->structOptions) FIXME( "struct options 0x%x not supported\n", desc->structOptions ); for (i = 0; i < desc->fieldCount; i++) {

1 0

Hans Leidekker : webservices: Allow structures to be passed by value in WsWriteType.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: e87c64f69ce38768b5be61aaf6127ff9a43a09e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87c64f69ce38768b5be61aaf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:48 2016 +0200 webservices: Allow structures to be passed by value in WsWriteType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 15 +++++++++++++++ dlls/webservices/writer.c | 4 +--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 128e66e..8888c69 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -791,6 +791,21 @@ static void test_simple_struct_type(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<struct>value</struct>", __LINE__ ); + /* required value */ + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, test, sizeof(*test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<struct>value</struct>", __LINE__ ); + hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 89f9465..8872a37 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1695,9 +1695,7 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_STRUCT_TYPE: { const void *ptr; - - if (!desc || option == WS_WRITE_REQUIRED_VALUE) return E_INVALIDARG; - + if (!desc) return E_INVALIDARG; if (!option) option = WS_WRITE_REQUIRED_POINTER; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_struct( writer, mapping, desc, ptr );

1 0

Hans Leidekker : webservices: Add support for optional and nillable fields in the writer.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 81d978902d26fc3f60004dad63b52bf0b5f33694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d978902d26fc3f60004dad6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:49 2016 +0200 webservices: Add support for optional and nillable fields in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 85 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 58 +++++++++++++++++++++++++--- 2 files changed, 138 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 8888c69..d2573e3 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2111,6 +2111,90 @@ static void test_double(void) WsFreeWriter( writer ); } +static void test_field_flags(void) +{ + static const char expected[] = + "<t><bool a:nil=\"true\" xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/><int32>-1</int32>" + "<xmlstr a:nil=\"true\" xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/></t>"; + HRESULT hr; + WS_XML_WRITER *writer; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, f2, f3, f4, *fields[4]; + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}, str_guid = {4, (BYTE *)"guid"}; + WS_XML_STRING str_int32 = {5, (BYTE *)"int32"}, str_bool = {4, (BYTE *)"bool"}; + WS_XML_STRING str_xmlstr = {6, (BYTE *)"xmlstr"}; + INT32 val = -1; + struct test + { + GUID guid; + BOOL *bool_ptr; + INT32 *int32_ptr; + WS_XML_STRING xmlstr; + } test; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_ELEMENT_FIELD_MAPPING; + f.localName = &str_guid; + f.ns = &ns; + f.type = WS_GUID_TYPE; + f.options = WS_FIELD_OPTIONAL; + fields[0] = &f; + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ELEMENT_FIELD_MAPPING; + f2.localName = &str_bool; + f2.offset = FIELD_OFFSET(struct test, bool_ptr); + f2.ns = &ns; + f2.type = WS_BOOL_TYPE; + f2.options = WS_FIELD_POINTER|WS_FIELD_NILLABLE; + fields[1] = &f2; + + memset( &f3, 0, sizeof(f3) ); + f3.mapping = WS_ELEMENT_FIELD_MAPPING; + f3.localName = &str_int32; + f3.offset = FIELD_OFFSET(struct test, int32_ptr); + f3.ns = &ns; + f3.type = WS_INT32_TYPE; + f3.options = WS_FIELD_POINTER|WS_FIELD_NILLABLE; + fields[2] = &f3; + + memset( &f4, 0, sizeof(f4) ); + f4.mapping = WS_ELEMENT_FIELD_MAPPING; + f4.localName = &str_xmlstr; + f4.offset = FIELD_OFFSET(struct test, xmlstr); + f4.ns = &ns; + f4.type = WS_XML_STRING_TYPE; + f4.options = WS_FIELD_NILLABLE; + fields[3] = &f4; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 4; + + memset( &test, 0, sizeof(test) ); + test.int32_ptr = &val; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, + &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, expected, __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -2137,4 +2221,5 @@ START_TEST(writer) test_WsCopyNode(); test_text_types(); test_double(); + test_field_flags(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 8872a37..7f732f0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1564,6 +1564,26 @@ static HRESULT write_type_xml_string( struct writer *writer, WS_TYPE_MAPPING map return write_type_text( writer, mapping, &utf8.text ); } +static inline BOOL is_nil_value( const char *value, ULONG size ) +{ + ULONG i; + for (i = 0; i < size; i++) if (value[i]) return FALSE; + return TRUE; +} + +static HRESULT write_add_nil_attribute( struct writer *writer ) +{ + static const WS_XML_STRING prefix = {1, (BYTE *)"a"}; + static const WS_XML_STRING localname = {3, (BYTE *)"nil"}; + static const WS_XML_STRING ns = {41, (BYTE *)"http://www.w3.org/2001/XMLSchema-instance"}; + static const WS_XML_UTF8_TEXT value = {{WS_XML_TEXT_TYPE_UTF8}, {4, (BYTE *)"true"}}; + HRESULT hr; + + if ((hr = write_add_attribute( writer, &prefix, &localname, &ns, FALSE )) != S_OK) return hr; + if ((hr = write_set_attribute_value( writer, &value.text )) != S_OK) return hr; + return write_add_namespace_attribute( writer, &prefix, &ns, FALSE ); +} + static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, const void *, ULONG ); @@ -1574,14 +1594,33 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE WS_TYPE_MAPPING mapping; WS_WRITE_OPTION option; - if (!desc->options || desc->options == WS_FIELD_OPTIONAL) option = 0; - else if (desc->options == WS_FIELD_POINTER) option = WS_WRITE_REQUIRED_POINTER; - else + if (desc->options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) { FIXME( "options 0x%x not supported\n", desc->options ); return E_NOTIMPL; } + if (is_nil_value( value, size )) + { + if (desc->options & WS_FIELD_NILLABLE) + { + if (desc->options & WS_FIELD_POINTER) + option = WS_WRITE_NILLABLE_POINTER; + else + option = WS_WRITE_NILLABLE_VALUE; + } + else + { + if (desc->options & WS_FIELD_OPTIONAL) return S_OK; + return E_INVALIDARG; + } + } + else + { + if (desc->options & WS_FIELD_POINTER) option = WS_WRITE_REQUIRED_POINTER; + else option = 0; + } + switch (desc->mapping) { case WS_ATTRIBUTE_FIELD_MAPPING: @@ -1595,6 +1634,10 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE case WS_ELEMENT_FIELD_MAPPING: if ((hr = write_element_node( writer, NULL, desc->localName, desc->ns )) != S_OK) return hr; + if (option == WS_WRITE_NILLABLE_VALUE || option == WS_WRITE_NILLABLE_POINTER) + { + if ((hr = write_add_nil_attribute( writer )) != S_OK) return hr; + } mapping = WS_ELEMENT_TYPE_MAPPING; break; @@ -1620,8 +1663,11 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE return E_NOTIMPL; } - if ((hr = write_type( writer, mapping, desc->type, desc->typeDescription, option, value, size )) != S_OK) - return hr; + if (option != WS_WRITE_NILLABLE_VALUE && option != WS_WRITE_NILLABLE_POINTER) + { + if ((hr = write_type( writer, mapping, desc->type, desc->typeDescription, option, value, size )) != S_OK) + return hr; + } switch (mapping) { @@ -1670,11 +1716,13 @@ static HRESULT get_value_ptr( WS_WRITE_OPTION option, const void *value, ULONG s switch (option) { case WS_WRITE_REQUIRED_VALUE: + case WS_WRITE_NILLABLE_VALUE: if (!value || !size) return E_INVALIDARG; *ptr = value; return S_OK; case WS_WRITE_REQUIRED_POINTER: + case WS_WRITE_NILLABLE_POINTER: if (size != sizeof(const void *) || !(*ptr = *(const void **)value)) return E_INVALIDARG; return S_OK;

1 0

Hans Leidekker : webservices/tests: Add a test for WsWriteText.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 1687e1bfb820db4bc37a1be97fbc2d1e7bfab0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1687e1bfb820db4bc37a1be97… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:50 2016 +0200 webservices/tests: Add a test for WsWriteText. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d2573e3..d9c3fb1 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2195,6 +2195,27 @@ static void test_field_flags(void) WsFreeWriter( writer ); } +static void test_WsWriteText(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_UTF8_TEXT utf8; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = (BYTE *)"test"; + utf8.value.length = 4; + hr = WsWriteText( writer, &utf8.text, NULL ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -2222,4 +2243,5 @@ START_TEST(writer) test_text_types(); test_double(); test_field_flags(); + test_WsWriteText(); }

1 0

Nikolay Sivov : mscoree: Return pointer to interface, not implementation.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 086a230629ce4cbd4f520f161b42c2734aec8071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086a230629ce4cbd4f520f161… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 22:04:26 2016 +0300 mscoree: Return pointer to interface, not implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/cordebug.c | 4 ++-- dlls/mscoree/metadata.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index 1a62e14..22424c6 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -434,7 +434,7 @@ static HRESULT CorDebugProcess_Create(CorDebug *cordebug, IUnknown** ppUnk, LPPR if(This->cordebug) ICorDebug_AddRef(&This->cordebug->ICorDebug_iface); - *ppUnk = (IUnknown*)This; + *ppUnk = (IUnknown*)&This->ICorDebugProcess_iface; return S_OK; } @@ -780,7 +780,7 @@ HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) if(This->runtimehost) ICLRRuntimeHost_AddRef(This->runtimehost); - *ppUnk = (IUnknown*)This; + *ppUnk = (IUnknown*)&This->ICorDebug_iface; return S_OK; } diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c index 9ca0d93..457f756 100644 --- a/dlls/mscoree/metadata.c +++ b/dlls/mscoree/metadata.c @@ -199,7 +199,7 @@ HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) This->IMetaDataDispenserEx_iface.lpVtbl = &MetaDataDispenserVtbl; This->ref = 1; - *ppUnk = (IUnknown*)This; + *ppUnk = (IUnknown*)&This->IMetaDataDispenserEx_iface; return S_OK; }

1 0