wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

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

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

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: 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: 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: 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: 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: Flush the writer first in WsWriteXmlBuffer.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 633828f832c301d13082fd4600234732a9e583f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=633828f832c301d13082fd460… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:44 2016 +0200 webservices: Flush the writer first in WsWriteXmlBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1fb5489..177c6e0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1920,6 +1920,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W if (!writer || !xmlbuf) return E_INVALIDARG; + if ((hr = write_flush( writer )) != S_OK) return hr; if ((hr = write_grow_buffer( writer, xmlbuf->size )) != S_OK) return hr; write_bytes( writer, xmlbuf->ptr, xmlbuf->size ); return S_OK;

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: bc7228a4601f867d6d6a8fda974c163fc1ef94c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc7228a4601f867d6d6a8fda9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:43 2016 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 53f851f..5ce7621 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -74,6 +74,7 @@ typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY; typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING; typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING; typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT; +typedef struct _WS_PROXY_MESSAGE_CALLBACK_CONTEXT WS_PROXY_MESSAGE_CALLBACK_CONTEXT; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -388,6 +389,16 @@ typedef struct _WS_WSZ_DESCRIPTION { ULONG maxCharCount; } WS_WSZ_DESCRIPTION; +typedef struct _WS_STRING_DESCRIPTION { + ULONG minCharCount; + ULONG maxCharCount; +} WS_STRING_DESCRIPTION; + +typedef struct _WS_XML_STRING_DESCRIPTION { + ULONG minByteCount; + ULONG maxByteCount; +} WS_XML_STRING_DESCRIPTION; + struct _WS_ENUM_VALUE { int value; WS_XML_STRING *name; @@ -1346,6 +1357,17 @@ typedef enum typedef void (CALLBACK *WS_MESSAGE_DONE_CALLBACK) (void*); +typedef HRESULT (CALLBACK *WS_PROXY_MESSAGE_CALLBACK) + (WS_MESSAGE*, WS_HEAP*, void*, WS_ERROR*); + +struct _WS_PROXY_MESSAGE_CALLBACK_CONTEXT +{ + WS_PROXY_MESSAGE_CALLBACK callback; + void *state; +}; + +HRESULT WINAPI WsAddCustomHeader(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, + const void*, ULONG, ULONG, WS_ERROR*); HRESULT WINAPI WsAddMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_TYPE, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsAddressMessage(WS_MESSAGE*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); @@ -1432,6 +1454,8 @@ HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION**, ULONG, WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsRemoveCustomHeader(WS_MESSAGE*, const WS_XML_STRING*, const WS_XML_STRING*, + WS_ERROR*); HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_ERROR*); HRESULT WINAPI WsRemoveMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*);

1 0

Bruno Jesus : msacm32: Add the 16-bit DLL version on acmGetVersion.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: e8d72a0e31ecd418cff758c945967a78d6ee10ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d72a0e31ecd418cff758c94… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 24 20:12:14 2016 -0300 msacm32: Add the 16-bit DLL version on acmGetVersion. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/msacm32_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index a47611c..efe58af 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -84,6 +84,8 @@ DWORD WINAPI acmGetVersion(void) switch (version.dwPlatformId) { case VER_PLATFORM_WIN32_NT: return 0x04000565; /* 4.0.1381 */ + case VER_PLATFORM_WIN32s: + return 0x02010000; /* 2.1 */ default: FIXME("%x not supported\n", version.dwPlatformId); /* fall through */

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016