November 2015 - Wine-Commits

Nikolay Sivov : kernel32: Implement EnumTimeFormatsEx().
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: 61c49bd78e5c96f14870e5c21a2ff75da7ac17b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c49bd78e5c96f14870e5c21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 17:40:10 2015 +0300 kernel32: Implement EnumTimeFormatsEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 22 ++++++++++++++++++++++ include/winnls.h | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c324347..ff67e54 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -428,7 +428,7 @@ @ stdcall EnumSystemLocalesEx(ptr long long ptr) @ stdcall EnumSystemLocalesW(ptr long) @ stdcall EnumTimeFormatsA(ptr long long) -# @ stub EnumTimeFormatsEx +@ stdcall EnumTimeFormatsEx(ptr wstr long long) @ stdcall EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesA(ptr long long) @ stdcall EnumUILanguagesW(ptr long long) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index e421f54..0985e35 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1924,9 +1924,11 @@ struct enumtimeformats_context { enum enum_callback_type type; /* callback kind */ union { TIMEFMT_ENUMPROCW callback; /* user callback pointer */ + TIMEFMT_ENUMPROCEX callbackex; } u; LCID lcid; /* locale of interest */ DWORD flags; + LPARAM lParam; BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ }; @@ -1970,6 +1972,9 @@ static BOOL NLS_EnumTimeFormats(struct enumtimeformats_context *ctxt) case CALLBACK_ENUMPROC: ctxt->u.callback(ctxt->unicode ? bufW : (WCHAR*)bufA); break; + case CALLBACK_ENUMPROCEX: + ctxt->u.callbackex(bufW, ctxt->lParam); + break; default: ; } @@ -2020,6 +2025,23 @@ BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) return NLS_EnumTimeFormats(&ctxt); } +/************************************************************************** + * EnumTimeFormatsEx (KERNEL32.@) + */ +BOOL WINAPI EnumTimeFormatsEx(TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, DWORD flags, LPARAM lParam) +{ + struct enumtimeformats_context ctxt; + + ctxt.type = CALLBACK_ENUMPROCEX; + ctxt.u.callbackex = proc; + ctxt.lcid = LocaleNameToLCID(locale, 0); + ctxt.flags = flags; + ctxt.lParam = lParam; + ctxt.unicode = TRUE; + + return NLS_EnumTimeFormats(&ctxt); +} + struct enumcalendar_context { enum enum_callback_type type; /* callback kind */ union { diff --git a/include/winnls.h b/include/winnls.h index 2f899f8..4b4eb77 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -735,6 +735,7 @@ typedef struct _nlsversioninfoex { typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXEX)(LPWSTR,CALID,LPWSTR,LPARAM); typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXEX)(LPWSTR,CALID,LPARAM); +typedef BOOL (CALLBACK *TIMEFMT_ENUMPROCEX)(LPWSTR,LPARAM); #if defined(STRICT) typedef BOOL (CALLBACK *CALINFO_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *CALINFO_ENUMPROCW)(LPWSTR); @@ -862,6 +863,7 @@ WINBASEAPI BOOL WINAPI EnumLanguageGroupLocalesW(LANGGROUPLOCALE_ENUMPROC WINBASEAPI BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA,LCID,DWORD); WINBASEAPI BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW,LCID,DWORD); #define EnumTimeFormats WINELIB_NAME_AW(EnumTimeFormats) +WINBASEAPI BOOL WINAPI EnumTimeFormatsEx(TIMEFMT_ENUMPROCEX,LPCWSTR,DWORD,LPARAM); WINBASEAPI BOOL WINAPI EnumUILanguagesA(UILANGUAGE_ENUMPROCA,DWORD,LONG_PTR); WINBASEAPI BOOL WINAPI EnumUILanguagesW(UILANGUAGE_ENUMPROCW,DWORD,LONG_PTR); #define EnumUILanguages WINELIB_NAME_AW(EnumUILanguages)

1 0

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

Nov. 10, 2015

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: Implement WsWriteStartElement.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

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: Reset writer state in WsSetOutput and WsSetOutputToBuffer.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

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 WsMoveReader.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

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: Keep track of the parent-child relationship between nodes.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

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 : webservices: Implement WsAlloc.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

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: Parse self-closing tags.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

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 : maintainers: Add Web Services, Windows Management Instrumentation and WinHTTP sections.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: e86470d426ae472f10fb1e06f374d8590d6be690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86470d426ae472f10fb1e06f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:33 2015 +0100 maintainers: Add Web Services, Windows Management Instrumentation and WinHTTP sections. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 19c390d..bb55d55 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -203,11 +203,21 @@ Uniscribe M: Aric Stewart <aric(a)codeweavers.com> F: dlls/usp10/ +Web Services +M: Hans Leidekker <hans(a)codeweavers.com> +F: dlls/webservices/ + Windows Imaging Component M: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/windowscodecs/ F: dlls/windowscodecsext/ +Windows Management Instrumentation +M: Hans Leidekker <hans(a)codeweavers.com> +F: dlls/wbemdisp/ +F: dlls/wbemprox/ +F: dlls/wmiutils/ + Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> P: Sebastian Lackner <sebastian(a)fds-team.de> @@ -217,6 +227,10 @@ Winemaker M: André Hentschel <nerv(a)dawncrow.de> F: tools/winemaker +WinHTTP +M: Hans Leidekker <hans(a)codeweavers.com> +F: dlls/winhttp/ + WPcap M: André Hentschel <nerv(a)dawncrow.de> F: dlls/wpcap/

1 0

Hans Leidekker : webservices: Implement WsXmlStringEquals.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

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