October 2016 - Wine-commits

Hans Leidekker : msi: Accept descriptors without component.
by Alexandre Julliard 25 Oct '16

25 Oct '16

Module: wine Branch: master Commit: cfb10615e177f2d98984bd4683e4c71dbced4fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb10615e177f2d98984bd468… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 25 09:11:47 2016 +0200 msi: Accept descriptors without component. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/registry.c | 37 +++++++++++++++++++++++-------------- dlls/msi/tests/db.c | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index f3b1ddf..8e6f0a1 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1024,7 +1024,8 @@ UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) * * Decomposes an MSI descriptor into product, feature and component parts. * An MSI descriptor is a string of the form: - * [base 85 guid] [feature code] '>' [base 85 guid] + * [base 85 guid] [feature code] '>' [base 85 guid] or + * [base 85 guid] [feature code] '<' * * PARAMS * szDescriptor [I] the descriptor to decompose @@ -1041,21 +1042,21 @@ UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct, LPWSTR szFeature, LPWSTR szComponent, LPDWORD pUsed ) { - UINT r, len; - LPWSTR p; + UINT len; + const WCHAR *p; GUID product, component; TRACE("%s %p %p %p %p\n", debugstr_w(szDescriptor), szProduct, szFeature, szComponent, pUsed); - r = decode_base85_guid( szDescriptor, &product ); - if( !r ) + if (!decode_base85_guid( szDescriptor, &product )) return ERROR_INVALID_PARAMETER; TRACE("product %s\n", debugstr_guid( &product )); - p = strchrW(&szDescriptor[20],'>'); - if( !p ) + if (!(p = strchrW( &szDescriptor[20], '>' ))) + p = strchrW( &szDescriptor[20], '<' ); + if (!p) return ERROR_INVALID_PARAMETER; len = (p - &szDescriptor[20]); @@ -1064,22 +1065,30 @@ UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct, TRACE("feature %s\n", debugstr_wn( &szDescriptor[20], len )); - r = decode_base85_guid( p+1, &component ); - if( !r ) - return ERROR_INVALID_PARAMETER; - - TRACE("component %s\n", debugstr_guid( &component )); + if (*p == '>') + { + if (!decode_base85_guid( p+1, &component )) + return ERROR_INVALID_PARAMETER; + TRACE( "component %s\n", debugstr_guid(&component) ); + } if (szProduct) StringFromGUID2( &product, szProduct, MAX_FEATURE_CHARS+1 ); if (szComponent) - StringFromGUID2( &component, szComponent, MAX_FEATURE_CHARS+1 ); + { + if (*p == '>') + StringFromGUID2( &component, szComponent, MAX_FEATURE_CHARS+1 ); + else + szComponent[0] = 0; + } if (szFeature) { memcpy( szFeature, &szDescriptor[20], len*sizeof(WCHAR) ); szFeature[len] = 0; } - len = ( &p[21] - szDescriptor ); + + len = p - szDescriptor + 1; + if (*p == '>') len += 20; TRACE("length = %d\n", len); if (pUsed) *pUsed = len; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9c1fcba..278b45f 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -470,6 +470,7 @@ static void test_msidecomposedesc(void) /* test a valid feature descriptor */ desc = "']gAVn-}f(ZXfeAR6.jiFollowTheWhiteRabbit>3w2x^IGfe?CxI5heAvk."; len = 0; + prod[0] = feature[0] = comp[0] = 0; r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len); ok(r == ERROR_SUCCESS, "returned an error\n"); ok(len == strlen(desc), "length was wrong\n"); @@ -485,6 +486,28 @@ static void test_msidecomposedesc(void) r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len); ok(r == ERROR_INVALID_PARAMETER, "returned wrong error\n"); + /* test a feature descriptor with < instead of > */ + desc = "']gAVn-}f(ZXfeAR6.jiFollowTheWhiteRabbit<3w2x^IGfe?CxI5heAvk."; + len = 0; + prod[0] = feature[0] = 0; + comp[0] = 0x55; + r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len); + ok(r == ERROR_SUCCESS, "returned an error\n"); + ok(len == 41, "got %u\n", len); + ok(!strcmp(prod,"{90110409-6000-11D3-8CFE-0150048383C9}"), "got '%s'\n", prod); + ok(!strcmp(feature,"FollowTheWhiteRabbit"), "got '%s'\n", feature); + ok(!comp[0], "got '%s'\n", comp); + + len = 0; + prod[0] = feature[0] = 0; + comp[0] = 0x55; + r = pMsiDecomposeDescriptorA("yh1BVN)8A$!!!!!MKKSkAlwaysInstalledIntl_1033<", prod, feature, comp, &len); + ok(r == ERROR_SUCCESS, "got %u\n", r); + ok(len == 45, "got %u\n", len); + ok(!strcmp(prod, "{90150000-006E-0409-0000-0000000FF1CE}"), "got '%s'\n", prod); + ok(!strcmp(feature, "AlwaysInstalledIntl_1033"), "got '%s'\n", feature); + ok(!comp[0], "got '%s'\n", comp); + /* * Test a valid feature descriptor with the * maximum number of characters and some trailing characters.

1 0

Hugh McMaster : regedit: Do not close the registy key handle when a line break is encountered.
by Alexandre Julliard 25 Oct '16

25 Oct '16

Module: wine Branch: master Commit: 93f795950d3af3cedb902e7de0ed7617a0101d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f795950d3af3cedb902e7de… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Oct 25 10:21:19 2016 +0000 regedit: Do not close the registy key handle when a line break is encountered. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 6 ------ programs/regedit/tests/regedit.c | 18 +++++++----------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 7c5105f..7f1475e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -614,12 +614,6 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) ( stdInput[0] == '\"'))) /* reading a new value=data pair */ { processSetValue(stdInput, isUnicode); - } else - { - /* Since we are assuming that the file format is valid we must be - * reading a blank line which indicates the end of this key processing - */ - closeKey(); } } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 9692c06..efd7715 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -243,9 +243,9 @@ static void test_basic_import(void) "\"Line3\"=\"Value3\"\n\n\n\n" "\"Line4\"=\"Value4\"\n\n"); verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, 0); - todo_wine verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, 0); + verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, 0); + verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -259,15 +259,11 @@ static void test_basic_import(void) "\"Wine4\"=dword:12345678\n\n"); dword = 0x782; verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); dword = 0x12345678; - todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), 0); RegCloseKey(hkey);

1 0

Hugh McMaster : regedit: Close the registry key handle in the read function instead of the parser.
by Alexandre Julliard 25 Oct '16

25 Oct '16

Module: wine Branch: master Commit: c39ee374a775c19d1f48fa7b0e52b52014f92f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39ee374a775c19d1f48fa7b0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Oct 25 10:21:32 2016 +0000 regedit: Close the registry key handle in the read function instead of the parser. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 7f1475e..5e4c2d2 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -584,15 +584,6 @@ static void processSetValue(WCHAR* line, BOOL is_unicode) */ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) { - /* - * We encountered the end of the file, make sure we - * close the opened key and exit - */ - if (stdInput == NULL) { - closeKey(); - return; - } - if ( stdInput[0] == '[') /* We are reading a new key */ { WCHAR* keyEnd; @@ -735,7 +726,7 @@ static void processRegLinesA(FILE *in, char* first_chars) line = s_eol + 1; } } - processRegEntry(NULL, FALSE); + closeKey(); HeapFree(GetProcessHeap(), 0, buf); } @@ -851,7 +842,7 @@ static void processRegLinesW(FILE *in) } } - processRegEntry(NULL, TRUE); + closeKey(); HeapFree(GetProcessHeap(), 0, buf); }

1 0

Hans Leidekker : webservices: Implement WsReadBytes.
by Alexandre Julliard 25 Oct '16

25 Oct '16

Module: wine Branch: master Commit: 4951f5468c2e4abab94a5492742fb1d5fcc83fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4951f5468c2e4abab94a54927… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 25 13:03:18 2016 +0200 webservices: Implement WsReadBytes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 46 +++++++++++++++ dlls/webservices/tests/reader.c | 118 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 3 + 4 files changed, 168 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9ba4dfc..9a3c7d7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -590,6 +590,7 @@ struct reader struct xmlbuf *input_buf; const unsigned char *input_data; ULONG input_size; + ULONG text_conv_offset; ULONG prop_count; struct prop prop[sizeof(reader_props)/sizeof(reader_props[0])]; }; @@ -1540,6 +1541,7 @@ static HRESULT read_text( struct reader *reader ) read_insert_node( reader, parent, node ); reader->state = READER_STATE_TEXT; + reader->text_conv_offset = 0; return S_OK; } @@ -4536,3 +4538,47 @@ HRESULT WINAPI WsSetReaderPosition( WS_XML_READER *handle, const WS_XML_NODE_POS reader->current = pos->node; return S_OK; } + +static HRESULT utf8_to_base64( const WS_XML_UTF8_TEXT *utf8, WS_XML_BASE64_TEXT *base64 ) +{ + if (utf8->value.length % 4) return WS_E_INVALID_FORMAT; + if (!(base64->bytes = heap_alloc( utf8->value.length * 3 / 4 ))) return E_OUTOFMEMORY; + base64->length = decode_base64( utf8->value.bytes, utf8->value.length, base64->bytes ); + return S_OK; +} + +/************************************************************************** + * WsReadBytes [webservices.@] + */ +HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, ULONG *count, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + HRESULT hr; + + TRACE( "%p %p %u %p %p\n", handle, bytes, max_count, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + if (!reader->input_type) return WS_E_INVALID_OPERATION; + if (!count) return E_INVALIDARG; + + *count = 0; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_TEXT && bytes) + { + const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)reader->current; + WS_XML_BASE64_TEXT base64; + + if ((hr = utf8_to_base64( (const WS_XML_UTF8_TEXT *)text->text, &base64 )) != S_OK) return hr; + if (reader->text_conv_offset == base64.length) + { + heap_free( base64.bytes ); + return read_node( reader ); + } + *count = min( base64.length - reader->text_conv_offset, max_count ); + memcpy( bytes, base64.bytes + reader->text_conv_offset, *count ); + reader->text_conv_offset += *count; + heap_free( base64.bytes ); + } + + return S_OK; +} diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 62ed499..c804105 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3861,6 +3861,123 @@ static void test_field_options(void) WsFreeHeap( heap ); } +static void test_WsReadBytes(void) +{ + HRESULT hr; + WS_XML_READER *reader; + const WS_XML_NODE *node; + const WS_XML_TEXT_NODE *text; + const WS_XML_UTF8_TEXT *utf8; + BYTE buf[4]; + ULONG count; + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadBytes( NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadBytes( reader, NULL, 0, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, "<t>dGV4dA==</t>", sizeof("<t>dGV4dA==</t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadBytes( reader, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, "<t>dGV4dA==</t>", sizeof("<t>dGV4dA==</t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadBytes( reader, buf, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, "<t>dGV4dA==</t>", sizeof("<t>dGV4dA==</t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0xdeadbeef; + hr = WsReadBytes( reader, NULL, 0, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + count = 0xdeadbeef; + hr = WsReadBytes( reader, NULL, 1, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadBytes( reader, buf, 0, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + ok( !buf[0], "wrong data\n" ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadBytes( reader, buf, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + ok( !buf[0], "wrong data\n" ); + + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadBytes( reader, buf, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + ok( !buf[0], "wrong data\n" ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0xdeadbeef; + hr = WsReadBytes( reader, NULL, 0, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadBytes( reader, buf, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 2, "got %u\n", count ); + ok( !memcmp( buf, "te", 2 ), "wrong data\n" ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); + utf8 = (const WS_XML_UTF8_TEXT *)text->text; + ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); + ok( utf8->value.length == 8, "got %u\n", utf8->value.length ); + ok( !memcmp( utf8->value.bytes, "dGV4dA==", 8 ), "wrong data\n" ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadBytes( reader, buf, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 2, "got %u\n", count ); + ok( !memcmp( buf, "xt", 2 ), "wrong data\n" ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); + + count = 0xdeadbeef; + hr = WsReadBytes( reader, buf, 1, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", text->node.nodeType ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -3897,4 +4014,5 @@ START_TEST(reader) test_WsSetReaderPosition(); test_entities(); test_field_options(); + test_WsReadBytes(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index a03b7bd..26db0b2 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -104,7 +104,7 @@ @ stub WsReadArray @ stub WsReadAttribute @ stdcall WsReadBody(ptr ptr long ptr ptr long ptr) -@ stub WsReadBytes +@ stdcall WsReadBytes(ptr ptr long ptr ptr) @ stub WsReadChars @ stub WsReadCharsUtf8 @ stdcall WsReadElement(ptr ptr long ptr ptr long ptr) diff --git a/include/webservices.h b/include/webservices.h index f1d34c4..3274082 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1461,6 +1461,9 @@ HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadBody(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReadBytes(WS_XML_READER*, void*, ULONG, ULONG*, WS_ERROR*); +HRESULT WINAPI WsReadChars(WS_XML_READER*, WCHAR*, ULONG, ULONG*, WS_ERROR*); +HRESULT WINAPI WsReadCharsUtf8(WS_XML_READER*, BYTE*, ULONG, ULONG*, WS_ERROR*); HRESULT WINAPI WsReadElement(WS_XML_READER*, const WS_ELEMENT_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadEndAttribute(WS_XML_READER*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Implement WsReadCharsUtf8.
by Alexandre Julliard 25 Oct '16

25 Oct '16

Module: wine Branch: master Commit: ec30db2e01c029b543acd16b3093c93a22886d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec30db2e01c029b543acd16b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 25 13:03:19 2016 +0200 webservices: Implement WsReadCharsUtf8. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 29 ++++++++++ dlls/webservices/tests/reader.c | 118 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 148 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9a3c7d7..44f8402 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4582,3 +4582,32 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, return S_OK; } + +/************************************************************************** + * WsReadCharsUtf8 [webservices.@] + */ +HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_count, ULONG *count, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p %u %p %p\n", handle, bytes, max_count, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + if (!reader->input_type) return WS_E_INVALID_OPERATION; + if (!count) return E_INVALIDARG; + + *count = 0; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_TEXT && bytes) + { + const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)reader->current; + const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text->text; + + if (reader->text_conv_offset == utf8->value.length) return read_node( reader ); + *count = min( utf8->value.length - reader->text_conv_offset, max_count ); + memcpy( bytes, utf8->value.bytes + reader->text_conv_offset, *count ); + reader->text_conv_offset += *count; + } + + return S_OK; +} diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index c804105..330eb00 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3978,6 +3978,123 @@ static void test_WsReadBytes(void) WsFreeReader( reader ); } +static void test_WsReadCharsUtf8(void) +{ + HRESULT hr; + WS_XML_READER *reader; + const WS_XML_NODE *node; + const WS_XML_TEXT_NODE *text; + const WS_XML_UTF8_TEXT *utf8; + BYTE buf[4]; + ULONG count; + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadCharsUtf8( NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadCharsUtf8( reader, NULL, 0, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadCharsUtf8( reader, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadCharsUtf8( reader, buf, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, NULL, 0, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, NULL, 1, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, buf, 0, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + ok( !buf[0], "wrong data\n" ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, buf, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + ok( !buf[0], "wrong data\n" ); + + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, buf, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + ok( !buf[0], "wrong data\n" ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, NULL, 0, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, buf, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 2, "got %u\n", count ); + ok( !memcmp( buf, "te", 2 ), "wrong data\n" ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); + utf8 = (const WS_XML_UTF8_TEXT *)text->text; + ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); + ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( !memcmp( utf8->value.bytes, "text", 4 ), "wrong data\n" ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, buf, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 2, "got %u\n", count ); + ok( !memcmp( buf, "xt", 2 ), "wrong data\n" ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); + + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, buf, 1, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", text->node.nodeType ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -4015,4 +4132,5 @@ START_TEST(reader) test_entities(); test_field_options(); test_WsReadBytes(); + test_WsReadCharsUtf8(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 26db0b2..e785497 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -106,7 +106,7 @@ @ stdcall WsReadBody(ptr ptr long ptr ptr long ptr) @ stdcall WsReadBytes(ptr ptr long ptr ptr) @ stub WsReadChars -@ stub WsReadCharsUtf8 +@ stdcall WsReadCharsUtf8(ptr ptr long ptr ptr) @ stdcall WsReadElement(ptr ptr long ptr ptr long ptr) @ stdcall WsReadEndAttribute(ptr ptr) @ stdcall WsReadEndElement(ptr ptr)

1 0

Hans Leidekker : webservices: Implement WsReadChars.
by Alexandre Julliard 25 Oct '16

25 Oct '16

Module: wine Branch: master Commit: cbc5193e0e8df012176d30e886844e67febd1b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc5193e0e8df012176d30e88… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 25 13:03:20 2016 +0200 webservices: Implement WsReadChars. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 45 ++++++++++++++ dlls/webservices/tests/reader.c | 121 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 167 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 44f8402..7996cbe 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4583,6 +4583,51 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, return S_OK; } +static HRESULT utf8_to_utf16( const WS_XML_UTF8_TEXT *utf8, WS_XML_UTF16_TEXT *utf16 ) +{ + int len = MultiByteToWideChar( CP_UTF8, 0, (char *)utf8->value.bytes, utf8->value.length, NULL, 0 ); + if (!(utf16->bytes = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + MultiByteToWideChar( CP_UTF8, 0, (char *)utf8->value.bytes, utf8->value.length, (WCHAR *)utf16->bytes, len ); + utf16->byteCount = len * sizeof(WCHAR); + return S_OK; +} + +/************************************************************************** + * WsReadChars [webservices.@] + */ +HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count, ULONG *count, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p %u %p %p\n", handle, chars, max_count, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + if (!reader->input_type) return WS_E_INVALID_OPERATION; + if (!count) return E_INVALIDARG; + + *count = 0; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_TEXT && chars) + { + const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)reader->current; + WS_XML_UTF16_TEXT utf16; + HRESULT hr; + + if ((hr = utf8_to_utf16( (const WS_XML_UTF8_TEXT *)text->text, &utf16 )) != S_OK) return hr; + if (reader->text_conv_offset == utf16.byteCount / sizeof(WCHAR)) + { + heap_free( utf16.bytes ); + return read_node( reader ); + } + *count = min( utf16.byteCount / sizeof(WCHAR) - reader->text_conv_offset, max_count ); + memcpy( chars, utf16.bytes + reader->text_conv_offset * sizeof(WCHAR), *count * sizeof(WCHAR) ); + reader->text_conv_offset += *count; + heap_free( utf16.bytes ); + } + + return S_OK; +} + /************************************************************************** * WsReadCharsUtf8 [webservices.@] */ diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 330eb00..23c3f10 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3978,6 +3978,126 @@ static void test_WsReadBytes(void) WsFreeReader( reader ); } +static void test_WsReadChars(void) +{ + static const WCHAR textW[] = {'t','e','x','t'}; + HRESULT hr; + WS_XML_READER *reader; + const WS_XML_NODE *node; + const WS_XML_TEXT_NODE *text; + const WS_XML_UTF8_TEXT *utf8; + unsigned char buf[4]; + WCHAR bufW[4]; + ULONG count; + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadChars( NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadChars( reader, NULL, 0, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadChars( reader, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadChars( reader, bufW, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0xdeadbeef; + hr = WsReadChars( reader, NULL, 0, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + count = 0xdeadbeef; + hr = WsReadChars( reader, NULL, 1, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadChars( reader, bufW, 0, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + ok( !buf[0], "wrong data\n" ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadChars( reader, bufW, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + ok( !buf[0], "wrong data\n" ); + + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadChars( reader, bufW, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + ok( !buf[0], "wrong data\n" ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0xdeadbeef; + hr = WsReadChars( reader, NULL, 0, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadChars( reader, bufW, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 2, "got %u\n", count ); + ok( !memcmp( bufW, textW, 2 * sizeof(WCHAR) ), "wrong data\n" ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); + utf8 = (const WS_XML_UTF8_TEXT *)text->text; + ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); + ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( !memcmp( utf8->value.bytes, "text", 4 ), "wrong data\n" ); + + /* continue reading in a different encoding */ + buf[0] = 0; + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, buf, 2, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 2, "got %u\n", count ); + ok( !memcmp( buf, "xt", 2 ), "wrong data\n" ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); + + count = 0xdeadbeef; + hr = WsReadCharsUtf8( reader, buf, 1, &count, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", text->node.nodeType ); + + WsFreeReader( reader ); +} + static void test_WsReadCharsUtf8(void) { HRESULT hr; @@ -4132,5 +4252,6 @@ START_TEST(reader) test_entities(); test_field_options(); test_WsReadBytes(); + test_WsReadChars(); test_WsReadCharsUtf8(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index e785497..074f612 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -105,7 +105,7 @@ @ stub WsReadAttribute @ stdcall WsReadBody(ptr ptr long ptr ptr long ptr) @ stdcall WsReadBytes(ptr ptr long ptr ptr) -@ stub WsReadChars +@ stdcall WsReadChars(ptr ptr long ptr ptr) @ stdcall WsReadCharsUtf8(ptr ptr long ptr ptr) @ stdcall WsReadElement(ptr ptr long ptr ptr long ptr) @ stdcall WsReadEndAttribute(ptr ptr)

1 0

Hans Leidekker : webservices: Add a stub implementation of WS_TYPE_ATTRIBUTE_FIELD_MAPPING in the reader.
by Alexandre Julliard 25 Oct '16

25 Oct '16

Module: wine Branch: master Commit: 02ee6bda54e462c8fff4a1dc93b8cde2e68630f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ee6bda54e462c8fff4a1dc9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 25 13:03:21 2016 +0200 webservices: Add a stub implementation of WS_TYPE_ATTRIBUTE_FIELD_MAPPING in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7996cbe..169a0e1 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3791,6 +3791,9 @@ ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) case WS_STRUCT_TYPE: return desc->size; + case WS_DESCRIPTION_TYPE: + return sizeof(WS_STRUCT_DESCRIPTION *); + default: ERR( "unhandled type %u\n", type ); return 0; @@ -3829,6 +3832,7 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) return WS_READ_REQUIRED_VALUE; case WS_WSZ_TYPE: + case WS_DESCRIPTION_TYPE: if (options & WS_FIELD_NILLABLE) return WS_READ_NILLABLE_POINTER; if (options & WS_FIELD_OPTIONAL) return WS_READ_OPTIONAL_POINTER; return WS_READ_REQUIRED_POINTER; @@ -3940,6 +3944,10 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES ptr = buf + desc->offset; switch (desc->mapping) { + case WS_TYPE_ATTRIBUTE_FIELD_MAPPING: + FIXME( "WS_TYPE_ATTRIBUTE_FIELD_MAPPING not supported\n" ); + return S_OK; + 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 );

1 0

Hans Leidekker : webservices: Explicitly pass the offset to read_type_struct_field.
by Alexandre Julliard 25 Oct '16

25 Oct '16

Module: wine Branch: master Commit: 5eb0971be89f843e3523eb77ef084e912133716f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb0971be89f843e3523eb77e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 25 13:03:22 2016 +0200 webservices: Explicitly pass the offset to read_type_struct_field. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 169a0e1..9994798 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3921,7 +3921,7 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION } static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, - WS_HEAP *heap, char *buf ) + WS_HEAP *heap, char *buf, ULONG offset ) { char *ptr; WS_READ_OPTION option; @@ -3941,7 +3941,7 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES else size = sizeof(void *); - ptr = buf + desc->offset; + ptr = buf + offset; switch (desc->mapping) { case WS_TYPE_ATTRIBUTE_FIELD_MAPPING: @@ -4005,7 +4005,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_STRUCT_DESCRIPTION *desc, WS_READ_OPTION option, WS_HEAP *heap, void *ret, ULONG size ) { - ULONG i; + ULONG i, offset; HRESULT hr; char *buf; @@ -4038,7 +4038,8 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, for (i = 0; i < desc->fieldCount; i++) { - if ((hr = read_type_struct_field( reader, desc->fields[i], heap, buf )) != S_OK) + offset = desc->fields[i]->offset; + if ((hr = read_type_struct_field( reader, desc->fields[i], heap, buf, offset )) != S_OK) break; }

1 0

Hans Leidekker : webservices: Implement WsCall.
by Alexandre Julliard 25 Oct '16

25 Oct '16

Module: wine Branch: master Commit: d91f985e220a2b2e8e6459434f4e001f64402f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91f985e220a2b2e8e6459434… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 25 13:03:23 2016 +0200 webservices: Implement WsCall. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 78 ++++++++++--- dlls/webservices/proxy.c | 154 +++++++++++++++++++++++- dlls/webservices/reader.c | 104 +++++++++++++++++ dlls/webservices/tests/proxy.c | 208 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 11 ++ dlls/webservices/writer.c | 42 ++++++- 6 files changed, 575 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d91f985e220a2b2e8e645…

1 0

Piotr Caban : gdiplus: Fix GdipCreateLineBrushFromRectWithAngle implementation.
by Alexandre Julliard 25 Oct '16

25 Oct '16

Module: wine Branch: master Commit: befb8603e2c31afe9ac8ca737469b78fd5432997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=befb8603e2c31afe9ac8ca737… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 20:46:14 2016 +0200 gdiplus: Fix GdipCreateLineBrushFromRectWithAngle implementation. The patch fixes isAngleScalable==TRUE argument handling. It also fixes a mistake when width was used instead of height. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ed29990..a184276 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -428,26 +428,43 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect { GpStatus stat; LinearGradientMode mode; - REAL width, height, exofs, eyofs; + REAL exofs, eyofs; REAL sin_angle, cos_angle, sin_cos_angle; TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); - sin_angle = sinf(deg2rad(angle)); - cos_angle = cosf(deg2rad(angle)); - sin_cos_angle = sin_angle * cos_angle; + if (!rect || !rect->Width || !rect->Height) + return InvalidParameter; + + angle = fmodf(angle, 360); + if (angle < 0) + angle += 360; if (isAngleScalable) { - width = height = 1.0; + float add_angle = 0; + + while(angle >= 90) { + angle -= 180; + add_angle += M_PI; + } + + if (angle != 90 && angle != -90) + angle = atan((rect->Width / rect->Height) * tan(deg2rad(angle))); + else + angle = deg2rad(angle); + angle += add_angle; } else { - width = rect->Width; - height = rect->Height; + angle = deg2rad(angle); } + sin_angle = sinf(angle); + cos_angle = cosf(angle); + sin_cos_angle = sin_angle * cos_angle; + if (sin_cos_angle >= 0) mode = LinearGradientModeForwardDiagonal; else @@ -459,19 +476,13 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect { if (sin_cos_angle >= 0) { - exofs = width * sin_cos_angle + height * cos_angle * cos_angle; - eyofs = width * sin_angle * sin_angle + height * sin_cos_angle; + exofs = rect->Height * sin_cos_angle + rect->Width * cos_angle * cos_angle; + eyofs = rect->Height * sin_angle * sin_angle + rect->Width * sin_cos_angle; } else { - exofs = width * sin_angle * sin_angle + height * sin_cos_angle; - eyofs = -width * sin_cos_angle + height * sin_angle * sin_angle; - } - - if (isAngleScalable) - { - exofs = exofs * rect->Width; - eyofs = eyofs * rect->Height; + exofs = rect->Width * sin_angle * sin_angle + rect->Height * sin_cos_angle; + eyofs = -rect->Width * sin_cos_angle + rect->Height * sin_angle * sin_angle; } if (sin_angle >= 0)

1 0