wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Nikolay Sivov : kernel32: GetLocaleInfoA() doesn' t support LOCALE_SSHORTTIME.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 982c3ede72793eb3c874befacf6589974763b213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982c3ede72793eb3c874befac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 17:40:07 2015 +0300 kernel32: GetLocaleInfoA() doesn't support LOCALE_SSHORTTIME. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 3 ++- dlls/kernel32/tests/locale.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c0a66ef..6dc0d05 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1295,7 +1295,8 @@ INT WINAPI GetLocaleInfoA( LCID lcid, LCTYPE lctype, LPSTR buffer, INT len ) SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - if (lctype & LOCALE_RETURN_GENITIVE_NAMES ) + if (((lctype & ~LOCALE_LOCALEINFOFLAGSMASK) == LOCALE_SSHORTTIME) || + (lctype & LOCALE_RETURN_GENITIVE_NAMES)) { SetLastError( ERROR_INVALID_FLAGS ); return 0; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1e4fd2a..b34767b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3358,6 +3358,7 @@ static void test_EnumUILanguageA(void) } static char date_fmt_buf[1024]; +static WCHAR date_fmt_bufW[1024]; static BOOL CALLBACK enum_datetime_procA(LPSTR fmt) { @@ -3366,6 +3367,12 @@ static BOOL CALLBACK enum_datetime_procA(LPSTR fmt) return TRUE; } +static BOOL CALLBACK enum_datetime_procW(WCHAR *fmt) +{ + lstrcatW(date_fmt_bufW, fmt); + return FALSE; +} + static void test_EnumDateFormatsA(void) { char *p, buf[256]; @@ -3473,6 +3480,60 @@ static void test_EnumTimeFormatsA(void) ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); } +static void test_EnumTimeFormatsW(void) +{ + LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + WCHAR bufW[256]; + BOOL ret; + + date_fmt_bufW[0] = 0; + ret = EnumTimeFormatsW(enum_datetime_procW, lcid, 0); + ok(ret, "EnumTimeFormatsW(0) error %d\n", GetLastError()); + ret = GetLocaleInfoW(lcid, LOCALE_STIMEFORMAT, bufW, sizeof(bufW)/sizeof(bufW[0])); + ok(ret, "GetLocaleInfoW(LOCALE_STIMEFORMAT) error %d\n", GetLastError()); + ok(!lstrcmpW(date_fmt_bufW, bufW), "expected \"%s\" got \"%s\"\n", wine_dbgstr_w(date_fmt_bufW), + wine_dbgstr_w(bufW)); + + date_fmt_bufW[0] = 0; + ret = EnumTimeFormatsW(enum_datetime_procW, lcid, LOCALE_USE_CP_ACP); + ok(ret, "EnumTimeFormatsW(LOCALE_USE_CP_ACP) error %d\n", GetLastError()); + ret = GetLocaleInfoW(lcid, LOCALE_STIMEFORMAT, bufW, sizeof(bufW)/sizeof(bufW[0])); + ok(ret, "GetLocaleInfoW(LOCALE_STIMEFORMAT) error %d\n", GetLastError()); + ok(!lstrcmpW(date_fmt_bufW, bufW), "expected \"%s\" got \"%s\"\n", wine_dbgstr_w(date_fmt_bufW), + wine_dbgstr_w(bufW)); + + /* TIME_NOSECONDS is Win7+ feature */ + date_fmt_bufW[0] = 0; + ret = EnumTimeFormatsW(enum_datetime_procW, lcid, TIME_NOSECONDS); + if (!ret && GetLastError() == ERROR_INVALID_FLAGS) + skip("EnumTimeFormatsW doesn't support TIME_NOSECONDS\n"); + else { + char buf[256]; + + todo_wine + ok(ret, "EnumTimeFormatsW(TIME_NOSECONDS) error %d\n", GetLastError()); + ret = GetLocaleInfoW(lcid, LOCALE_SSHORTTIME, bufW, sizeof(bufW)/sizeof(bufW[0])); + ok(ret, "GetLocaleInfoW(LOCALE_SSHORTTIME) error %d\n", GetLastError()); + todo_wine + ok(!lstrcmpW(date_fmt_bufW, bufW), "expected \"%s\" got \"%s\"\n", wine_dbgstr_w(date_fmt_bufW), + wine_dbgstr_w(bufW)); + + /* EnumTimeFormatsA doesn't support this flag */ + ret = EnumTimeFormatsA(enum_datetime_procA, lcid, TIME_NOSECONDS); + todo_wine { + ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "EnumTimeFormatsA(TIME_NOSECONDS) ret %d, error %d\n", ret, + GetLastError()); + + ret = EnumTimeFormatsA(NULL, lcid, TIME_NOSECONDS); + ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "EnumTimeFormatsA(TIME_NOSECONDS) ret %d, error %d\n", ret, + GetLastError()); + } + /* And it's not supported by GetLocaleInfoA either */ + ret = GetLocaleInfoA(lcid, LOCALE_SSHORTTIME, buf, sizeof(buf)/sizeof(buf[0])); + ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "GetLocaleInfoA(LOCALE_SSHORTTIME) ret %d, error %d\n", ret, + GetLastError()); + } +} static void test_GetCPInfo(void) { BOOL ret; @@ -4506,6 +4567,7 @@ START_TEST(locale) InitFunctionPointers(); test_EnumTimeFormatsA(); + test_EnumTimeFormatsW(); test_EnumDateFormatsA(); test_GetLocaleInfoA(); test_GetLocaleInfoW();

1 0

Dmitry Timoshkov : ntdll: Avoid path buffer re-allocation step for common dll name lengths.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: beeeb2a528bf3a46675cdc85973ec131f82079cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=beeeb2a528bf3a46675cdc859… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 10 14:18:05 2015 +0800 ntdll: Avoid path buffer re-allocation step for common dll name lengths. For instance c:\windows\system32\advapi32.dll is 33 characters long with 0-terminator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 831f049..74feb97 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2208,7 +2208,7 @@ overflow: static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ) { enum loadorder loadorder; - WCHAR buffer[32]; + WCHAR buffer[64]; WCHAR *filename; ULONG size; WINE_MODREF *main_exe;

1 0

Hans Leidekker : webservices: Reset writer state in WsSetOutput and WsSetOutputToBuffer.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 062aa59ddf5bb3264aaf19b73bee6b58ad209a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=062aa59ddf5bb3264aaf19b73… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:41 2015 +0100 webservices: Reset writer state in WsSetOutput and WsSetOutputToBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 59 ++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index fc83d3d..e8b5fad 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -138,6 +138,13 @@ static void write_insert_eof( struct writer *writer, struct node *eof ) writer->current = eof; } +static void write_insert_bof( struct writer *writer, struct node *bof ) +{ + writer->root->parent = bof; + list_add_tail( &bof->children, &writer->root->entry ); + writer->current = writer->root = bof; +} + static void write_insert_node( struct writer *writer, struct node *node ) { node->parent = writer->current; @@ -310,6 +317,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING ULONG count, WS_ERROR *error ) { struct writer *writer = (struct writer *)handle; + struct node *node; HRESULT hr; ULONG i; @@ -324,37 +332,41 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING if (hr != S_OK) return hr; } + if ((hr = write_init_state( writer )) != S_OK) return hr; + switch (encoding->encodingType) { - case WS_XML_WRITER_ENCODING_TYPE_TEXT: + case WS_XML_WRITER_ENCODING_TYPE_TEXT: + { + WS_XML_WRITER_TEXT_ENCODING *text = (WS_XML_WRITER_TEXT_ENCODING *)encoding; + if (text->charSet != WS_CHARSET_UTF8) { - WS_XML_WRITER_TEXT_ENCODING *text = (WS_XML_WRITER_TEXT_ENCODING *)encoding; - if (text->charSet != WS_CHARSET_UTF8) - { - FIXME( "charset %u not supported\n", text->charSet ); - return E_NOTIMPL; - } - break; - } - default: - FIXME( "encoding type %u not supported\n", encoding->encodingType ); + FIXME( "charset %u not supported\n", text->charSet ); return E_NOTIMPL; + } + break; + } + default: + FIXME( "encoding type %u not supported\n", encoding->encodingType ); + return E_NOTIMPL; } switch (output->outputType) { - case WS_XML_WRITER_OUTPUT_TYPE_BUFFER: - { - struct xmlbuf *xmlbuf; + case WS_XML_WRITER_OUTPUT_TYPE_BUFFER: + { + struct xmlbuf *xmlbuf; - if (!(xmlbuf = alloc_xmlbuf( writer->output_heap ))) return E_OUTOFMEMORY; - set_output_buffer( writer, xmlbuf ); - break; - } - default: - FIXME( "output type %u not supported\n", output->outputType ); - return E_NOTIMPL; + if (!(xmlbuf = alloc_xmlbuf( writer->output_heap ))) return E_OUTOFMEMORY; + set_output_buffer( writer, xmlbuf ); + break; + } + default: + FIXME( "output type %u not supported\n", output->outputType ); + return E_NOTIMPL; } + if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) return E_OUTOFMEMORY; + write_insert_bof( writer, node ); return S_OK; } @@ -367,6 +379,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer { struct writer *writer = (struct writer *)handle; struct xmlbuf *xmlbuf = (struct xmlbuf *)buffer; + struct node *node; HRESULT hr; ULONG i; @@ -381,7 +394,11 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer if (hr != S_OK) return hr; } + if ((hr = write_init_state( writer )) != S_OK) return hr; set_output_buffer( writer, xmlbuf ); + + if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) return E_OUTOFMEMORY; + write_insert_bof( writer, node ); return S_OK; }

1 0

Hans Leidekker : webservices: Implement WsWriteStartElement.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 1e3b84a75e1c10215dd90de01bbb65a8144ba71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3b84a75e1c10215dd90de01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:40 2015 +0100 webservices: Implement WsWriteStartElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 24 ++-- dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 15 +++ dlls/webservices/writer.c | 209 +++++++++++++++++++++++++++++++++ 4 files changed, 236 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e3b84a75e1c10215dd90…

1 0

Hans Leidekker : webservices: Implement WsMoveReader.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 2bfcd98c306649cb00dfdb31d09c5c4e64644e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bfcd98c306649cb00dfdb31d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:39 2015 +0100 webservices: Implement WsMoveReader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 87 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0e9d533..3e5a107 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1218,6 +1218,93 @@ HRESULT WINAPI WsReadToStartElement( WS_XML_READER *handle, const WS_XML_STRING return read_to_startelement( reader, found ); } +static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) +{ + struct list *ptr; + BOOL success = FALSE; + HRESULT hr = S_OK; + + if (!read_end_of_data( reader )) + { + while (reader->state != READER_STATE_EOF && (hr = read_node( reader )) == S_OK) { /* nothing */ }; + if (hr != S_OK) return hr; + } + switch (move) + { + case WS_MOVE_TO_FIRST_NODE: + if ((ptr = list_head( &reader->current->parent->children ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + success = TRUE; + } + break; + + case WS_MOVE_TO_NEXT_NODE: + if ((ptr = list_next( &reader->current->parent->children, &reader->current->entry ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + success = TRUE; + } + break; + + case WS_MOVE_TO_PREVIOUS_NODE: + if ((ptr = list_prev( &reader->current->parent->children, &reader->current->entry ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + success = TRUE; + } + break; + + case WS_MOVE_TO_CHILD_NODE: + if ((ptr = list_head( &reader->current->children ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + success = TRUE; + } + break; + + case WS_MOVE_TO_BOF: + reader->current = reader->root; + success = TRUE; + break; + + case WS_MOVE_TO_EOF: + if ((ptr = list_tail( &reader->root->children ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + success = TRUE; + } + break; + + default: + FIXME( "unhandled move %u\n", move ); + return E_NOTIMPL; + } + + if (found) + { + *found = success; + return S_OK; + } + return success ? S_OK : WS_E_INVALID_FORMAT; +} + +/************************************************************************** + * WsMoveReader [webservices.@] + */ +HRESULT WINAPI WsMoveReader( WS_XML_READER *handle, WS_MOVE_TO move, BOOL *found, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %u %p %p\n", handle, move, found, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + if (!reader->input_type) return WS_E_INVALID_OPERATION; + + return read_move_to( reader, move, found ); +} + static WCHAR *xmltext_to_widechar( WS_HEAP *heap, const WS_XML_TEXT *text ) { WCHAR *ret; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 1f0bfdc..9fb96fb 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -93,7 +93,7 @@ @ stub WsInitializeMessage @ stub WsMarkHeaderAsUnderstood @ stub WsMatchPolicyAlternative -@ stub WsMoveReader +@ stdcall WsMoveReader(ptr long ptr ptr) @ stub WsMoveWriter @ stub WsOpenChannel @ stub WsOpenListener

1 0

Hans Leidekker : webservices: Parse self-closing tags.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 29b1c115fefa7ee0aee12e583961513b27198759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b1c115fefa7ee0aee12e583… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:38 2015 +0100 webservices: Parse self-closing tags. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 96a3dc3..0e9d533 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -379,6 +379,7 @@ enum reader_state READER_STATE_INITIAL, READER_STATE_BOF, READER_STATE_STARTELEMENT, + READER_STATE_STARTENDELEMENT, READER_STATE_TEXT, READER_STATE_ENDELEMENT, READER_STATE_COMMENT, @@ -928,7 +929,7 @@ static HRESULT read_element( struct reader *reader ) for (;;) { read_skip_whitespace( reader ); - if (!read_cmp( reader, ">", 1 )) break; + if (!read_cmp( reader, ">", 1 ) || !read_cmp( reader, "/>", 2 )) break; if ((hr = read_attribute( reader, &attr )) != S_OK) goto error; if ((hr = append_attribute( elem, attr )) != S_OK) { @@ -938,16 +939,24 @@ static HRESULT read_element( struct reader *reader ) } read_skip_whitespace( reader ); - if (read_cmp( reader, ">", 1 )) + if (read_cmp( reader, ">", 1 ) && read_cmp( reader, "/>", 2 )) { hr = WS_E_INVALID_FORMAT; goto error; } read_insert_node( reader, reader->current, node ); - read_skip( reader, 1 ); - reader->state = READER_STATE_STARTELEMENT; - + if (!read_cmp( reader, "/>", 2 )) + { + read_skip( reader, 2 ); + reader->current = reader->current->parent; + reader->state = READER_STATE_STARTENDELEMENT; + } + else + { + read_skip( reader, 1 ); + reader->state = READER_STATE_STARTELEMENT; + } return S_OK; error: @@ -1056,6 +1065,7 @@ static HRESULT read_endelement( struct reader *reader ) { case READER_STATE_TEXT: case READER_STATE_STARTELEMENT: + case READER_STATE_STARTENDELEMENT: break; default: return WS_E_INVALID_FORMAT;

1 0

Hans Leidekker : webservices: Implement WsAlloc.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: e3859dffad37240f8498a20689745b37f7c1c14d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3859dffad37240f8498a2068… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:37 2015 +0100 webservices: Implement WsAlloc. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 17 +++++++++++++++++ dlls/webservices/tests/reader.c | 27 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 48b9c01..96a3dc3 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -170,6 +170,23 @@ void ws_free( WS_HEAP *handle, void *ptr ) HeapFree( heap->handle, 0, ptr ); } +/************************************************************************** + * WsAlloc [webservices.@] + */ +HRESULT WINAPI WsAlloc( WS_HEAP *handle, SIZE_T size, void **ptr, WS_ERROR *error ) +{ + void *mem; + + TRACE( "%p %u %p %p\n", handle, (ULONG)size, ptr, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !ptr) return E_INVALIDARG; + + if (!(mem = ws_alloc( handle, size ))) return E_OUTOFMEMORY; + *ptr = mem; + return S_OK; +} + static struct heap *alloc_heap(void) { static const ULONG count = sizeof(heap_props)/sizeof(heap_props[0]); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1f9558c..dab57f1 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1453,6 +1453,32 @@ static void test_WsXmlStringEquals(void) ok( hr == S_OK, "got %08x\n", hr ); } +static void test_WsAlloc(void) +{ + HRESULT hr; + WS_HEAP *heap; + void *ptr; + + hr = WsCreateHeap( 256, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + ptr = NULL; + hr = WsAlloc( NULL, 16, &ptr, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( ptr == NULL, "ptr set\n" ); + + ptr = NULL; + hr = WsAlloc( heap, 512, &ptr, NULL ); + todo_wine ok( hr == WS_E_QUOTA_EXCEEDED, "got %08x\n", hr ); + todo_wine ok( ptr == NULL, "ptr not set\n" ); + + ptr = NULL; + hr = WsAlloc( heap, 16, &ptr, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( ptr != NULL, "ptr not set\n" ); + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -1468,4 +1494,5 @@ START_TEST(reader) test_WsReadType(); test_WsGetXmlAttribute(); test_WsXmlStringEquals(); + test_WsAlloc(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 3378ea9..1f0bfdc 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -9,7 +9,7 @@ @ stub WsAddErrorString @ stub WsAddMappedHeader @ stub WsAddressMessage -@ stub WsAlloc +@ stdcall WsAlloc(ptr long ptr ptr) @ stub WsAsyncExecute @ stub WsCall @ stub WsCheckMustUnderstandHeaders diff --git a/include/webservices.h b/include/webservices.h index 0ebb6c4..594a6ba 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -464,6 +464,7 @@ typedef struct _WS_XML_NODE_POSITION { void *node; } WS_XML_NODE_POSITION; +HRESULT WINAPI WsAlloc(WS_HEAP*, SIZE_T, void**, WS_ERROR*); HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); HRESULT WINAPI WsCreateHeap(SIZE_T, SIZE_T, const WS_HEAP_PROPERTY*, ULONG, WS_HEAP**, WS_ERROR*); HRESULT WINAPI WsCreateReader(const WS_XML_READER_PROPERTY*, ULONG, WS_XML_READER**, WS_ERROR*);

1 0

Hans Leidekker : webservices: Keep track of the parent-child relationship between nodes.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: ff990d3426f34c1dcc2bc363fa3d1ec391316f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff990d3426f34c1dcc2bc363f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:36 2015 +0100 webservices: Keep track of the parent-child relationship between nodes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 223 +++++++++++++++++++++++++++++----------------- 1 file changed, 143 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff990d3426f34c1dcc2bc…

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 49638f1a7f6ec239648d5ee598bef500ca395f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49638f1a7f6ec239648d5ee59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:35 2015 +0100 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 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index a6e892e..0ebb6c4 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -388,6 +388,21 @@ typedef struct _WS_XML_NODE { } WS_XML_NODE; typedef enum { + WS_MOVE_TO_ROOT_ELEMENT, + WS_MOVE_TO_NEXT_ELEMENT, + WS_MOVE_TO_PREVIOUS_ELEMENT, + WS_MOVE_TO_CHILD_ELEMENT, + WS_MOVE_TO_END_ELEMENT, + WS_MOVE_TO_PARENT_ELEMENT, + WS_MOVE_TO_NEXT_NODE, + WS_MOVE_TO_PREVIOUS_NODE, + WS_MOVE_TO_FIRST_NODE, + WS_MOVE_TO_BOF, + WS_MOVE_TO_EOF, + WS_MOVE_TO_CHILD_NODE +} WS_MOVE_TO; + +typedef enum { WS_XML_TEXT_TYPE_UTF8 = 1, WS_XML_TEXT_TYPE_UTF16 = 2, WS_XML_TEXT_TYPE_BASE64 = 3, @@ -471,6 +486,8 @@ HRESULT WINAPI WsGetReaderProperty(WS_XML_READER*, WS_XML_READER_PROPERTY_ID, vo HRESULT WINAPI WsGetWriterProperty(WS_XML_WRITER*, WS_XML_WRITER_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetXmlAttribute(WS_XML_READER*, const WS_XML_STRING*, WS_HEAP*, WCHAR**, ULONG*, WS_ERROR*); +HRESULT WINAPI WsMoveReader(WS_XML_READER*, WS_MOVE_TO, BOOL*, WS_ERROR*); +HRESULT WINAPI WsMoveWriter(WS_XML_WRITER*, WS_MOVE_TO, BOOL*, WS_ERROR*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadEndElement(WS_XML_READER*, WS_ERROR*); @@ -492,10 +509,12 @@ HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_ ULONG, WS_ERROR*); HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndElement(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteEndStartElement(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, WS_ERROR*); HRESULT WINAPI WsWriteStartElement(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, const WS_XML_STRING*, WS_ERROR*); +HRESULT WINAPI WsWriteText(WS_XML_WRITER*, const WS_XML_TEXT*, WS_ERROR*); HRESULT WINAPI WsWriteType(WS_XML_WRITER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsXmlStringEquals(const WS_XML_STRING*, const WS_XML_STRING*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Implement WsXmlStringEquals.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 4977635361dff84b23de926815ec916707908fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4977635361dff84b23de92681… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:34 2015 +0100 webservices: Implement WsXmlStringEquals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 15 ++++++++++++ dlls/webservices/tests/reader.c | 48 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index aeba36c..4195184 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1564,3 +1564,18 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, reader->read_bufptr = reader->input_data; return S_OK; } + +/************************************************************************** + * WsXmlStringEquals [webservices.@] + */ +HRESULT WINAPI WsXmlStringEquals( const WS_XML_STRING *str1, const WS_XML_STRING *str2, WS_ERROR *error ) +{ + TRACE( "%s %s %p\n", debugstr_xmlstr(str1), debugstr_xmlstr(str2), error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!str1 || !str2) return E_INVALIDARG; + + if (str1->length != str2->length) return S_FALSE; + if (!memcmp( str1->bytes, str2->bytes, str1->length )) return S_OK; + return S_FALSE; +} diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 3f23d90..1f9558c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1406,6 +1406,53 @@ static void test_WsGetXmlAttribute(void) WsFreeHeap( heap ); } +static void test_WsXmlStringEquals(void) +{ + BYTE bom[] = {0xef,0xbb,0xbf}; + WS_XML_STRING str1 = {0, NULL}, str2 = {0, NULL}; + HRESULT hr; + + hr = WsXmlStringEquals( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsXmlStringEquals( &str1, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsXmlStringEquals( NULL, &str2, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + str1.length = 1; + str1.bytes = (BYTE *)"a"; + hr = WsXmlStringEquals( &str1, &str1, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + str2.length = 1; + str2.bytes = (BYTE *)"b"; + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + str2.length = 1; + str2.bytes = bom; + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + str1.length = 3; + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + str2.length = 3; + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + str1.length = 3; + str1.bytes = bom; + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); +} + START_TEST(reader) { test_WsCreateError(); @@ -1420,4 +1467,5 @@ START_TEST(reader) test_WsReadNode(); test_WsReadType(); test_WsGetXmlAttribute(); + test_WsXmlStringEquals(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6e0f4f2..3378ea9 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -190,4 +190,4 @@ @ stub WsWriteXmlBuffer @ stub WsWriteXmlBufferToBytes @ stub WsWriteXmlnsAttribute -@ stub WsXmlStringEquals +@ stdcall WsXmlStringEquals(ptr ptr ptr) diff --git a/include/webservices.h b/include/webservices.h index 8bef315..a6e892e 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -498,6 +498,7 @@ HRESULT WINAPI WsWriteStartElement(WS_XML_WRITER*, const WS_XML_STRING*, const W const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsWriteType(WS_XML_WRITER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsXmlStringEquals(const WS_XML_STRING*, const WS_XML_STRING*, WS_ERROR*); #define WS_S_ASYNC 0x003d0000 #define WS_S_END 0x003d0001

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
63
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 November 2015