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

Kai Tietz : widl: Allow hidden-attribute on type.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 94c94260ead202321c32fc24f11d370e757484a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c94260ead202321c32fc24f… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:08:51 2013 +0200 widl: Allow hidden-attribute on type. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c104917..8217e2e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2055,7 +2055,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_HELPSTRING */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstring" }, /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstringcontext" }, /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, - /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, + /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, "id" }, /* ATTR_IDEMPOTENT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ignore" },

1 0

Kai Tietz : widl: Allow inputsync-attribute on functions.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: f58353ecb6c862822e8070d663b467e9831192a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58353ecb6c862822e8070d66… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:10:30 2013 +0200 widl: Allow inputsync-attribute on functions. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8217e2e..c55ee41 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2064,7 +2064,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_IMPLICIT_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "implicit_handle" }, /* ATTR_IN */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "in" }, /* ATTR_INLINE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inline" }, - /* ATTR_INPUTSYNC */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, + /* ATTR_INPUTSYNC */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, "length_is" }, /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "lcid" }, /* ATTR_LICENSED */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "licensed" },

1 0

Kai Tietz : widl: Allow version-attribute on type and enum.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: da282872ff5cb5e15f3e3fadaa98d32d9e018a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da282872ff5cb5e15f3e3fada… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:12:28 2013 +0200 widl: Allow version-attribute on type and enum. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c55ee41..08a42bb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2113,7 +2113,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_UUID */ { 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "uuid" }, /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, /* ATTR_VARARG */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, - /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "version" }, + /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, "version" }, /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "vi_progid" }, /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, };

1 0

Kai Tietz : widl: Add async_uuid attribute base support in parser.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: f05853b28a8bf288d300e42f53fff9feeac327d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f05853b28a8bf288d300e42f5… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:48:34 2013 +0200 widl: Add async_uuid attribute base support in parser. --- tools/widl/parser.y | 2 ++ tools/widl/widltypes.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 08a42bb..5751598 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -556,6 +556,7 @@ attribute: { $$ = NULL; } | tUSESGETLASTERROR { $$ = make_attr(ATTR_USESGETLASTERROR); } | tUSERMARSHAL '(' type ')' { $$ = make_attrp(ATTR_USERMARSHAL, $3); } | tUUID '(' uuid_string ')' { $$ = make_attrp(ATTR_UUID, $3); } + | tASYNCUUID '(' uuid_string ')' { $$ = make_attrp(ATTR_ASYNCUUID, $3); } | tV1ENUM { $$ = make_attr(ATTR_V1ENUM); } | tVARARG { $$ = make_attr(ATTR_VARARG); } | tVERSION '(' version ')' { $$ = make_attrv(ATTR_VERSION, $3); } @@ -2020,6 +2021,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "appobject" }, /* ATTR_ASYNC */ { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, + /* ATTR_ASYNCUUID */ { 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "async_uuid" }, /* ATTR_AUTO_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "auto_handle" }, /* ATTR_BINDABLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "bindable" }, /* ATTR_BROADCAST */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "broadcast" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 84e4467..efde0b0 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -70,6 +70,7 @@ enum attr_type ATTR_ANNOTATION, ATTR_APPOBJECT, ATTR_ASYNC, + ATTR_ASYNCUUID, ATTR_AUTO_HANDLE, ATTR_BINDABLE, ATTR_BROADCAST,

1 0

Marcus Meissner : scrrun: Added missing FindClose in error case (Coverity).
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 1cefdf3f66ee7a3370092acffdf7b9ec0c17351e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cefdf3f66ee7a3370092acff… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 17 09:37:04 2013 +0200 scrrun: Added missing FindClose in error case (Coverity). --- dlls/scrrun/filesystem.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 19f5f2b..2750108 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1375,8 +1375,10 @@ static inline HRESULT delete_file(const WCHAR *file, DWORD file_len, VARIANT_BOO return create_error(GetLastError()); len = get_parent_folder_name(file, file_len); - if(len+1 >= MAX_PATH) + if(len+1 >= MAX_PATH) { + FindClose(f); return E_FAIL; + } if(len) { memcpy(path, file, len*sizeof(WCHAR)); path[len++] = '\\'; @@ -1432,8 +1434,10 @@ static HRESULT delete_folder(const WCHAR *folder, DWORD folder_len, VARIANT_BOOL return create_error(GetLastError()); len = get_parent_folder_name(folder, folder_len); - if(len+1 >= MAX_PATH) + if(len+1 >= MAX_PATH) { + FindClose(f); return E_FAIL; + } if(len) { memcpy(path, folder, len*sizeof(WCHAR)); path[len++] = '\\'; @@ -1547,8 +1551,10 @@ static inline HRESULT copy_file(const WCHAR *source, DWORD source_len, } dst_len = destination_len; - if(dst_len+1 >= MAX_PATH) + if(dst_len+1 >= MAX_PATH) { + FindClose(f); return E_FAIL; + } memcpy(dst_path, destination, dst_len*sizeof(WCHAR)); if(dst_path[dst_len-1]!= '\\' && dst_path[dst_len-1]!='/') dst_path[dst_len++] = '\\';

1 0

Marcus Meissner : usp10: Added missing break (Coverity).
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 90117bd1753acf3e4264d3f12e9c902572abb8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=90117bd1753acf3e4264d3f12… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 17 09:37:15 2013 +0200 usp10: Added missing break (Coverity). --- dlls/usp10/breaking.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index 6e044b2..2f80f9a 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -97,6 +97,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT break; case b_CM: la[i].fCharStop = FALSE; + break; } } @@ -111,8 +112,10 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT case b_SG: case b_XX: break_class[i] = b_AL; + break; case b_CJ: break_class[i] = b_NS; + break; } }

1 0

Francois Gouget : ntdll/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 1dbc3d092455aaa0fa4cb6633b15c4393f0f01a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbc3d092455aaa0fa4cb6633… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 17 10:28:45 2013 +0200 ntdll/tests: Add a trailing '\n' to an ok() call. --- dlls/ntdll/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 617a92c..3a1efdd 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1386,7 +1386,7 @@ static void test_file_disposition_information(void) GetTempFileNameA( ".", "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); - ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed" ); + ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" ); CloseHandle( handle ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation );

1 0

Francois Gouget : imm32/tests: Fix a trailing '\n' in an ok() call.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 120e24431d6a78a595c0e1e293f760712e71046a URL: http://source.winehq.org/git/wine.git/?a=commit;h=120e24431d6a78a595c0e1e29… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 17 10:28:56 2013 +0200 imm32/tests: Fix a trailing '\n' in an ok() call. --- dlls/imm32/tests/imm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 62bdb64..92cbccb 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -698,7 +698,7 @@ static void test_ImmGetIMCLockCount(void) count = ImmGetIMCLockCount(imc); ok(count == 0, "expect 0, returned %d\n", count); ic = ImmLockIMC(imc); - ok(ic != NULL, "ImmLockIMC failed\n!"); + ok(ic != NULL, "ImmLockIMC failed!\n"); count = ImmGetIMCLockCount(imc); ok(count == 1, "expect 1, returned %d\n", count); ret = ImmUnlockIMC(imc);

1 0

Jacek Caban : mshtml: Use winehq snapshot instead of the main page in tests .
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 36d999527bb19fbe86653a45707a33aa9325cffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d999527bb19fbe86653a457… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 18 13:39:18 2013 +0200 mshtml: Use winehq snapshot instead of the main page in tests. --- dlls/mshtml/tests/htmldoc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 079b564..68f0478 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -238,7 +238,7 @@ static const char html_page[] = static const char css_data[] = "body {color: red; margin: 0}"; static const WCHAR http_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/','t','e','s','t','s','/','w','i','n','e','h','q','_','s','n','a','p','s','h','o','t','/',0}; static const WCHAR doc_url[] = {'w','i','n','e','t','e','s','t',':','d','o','c',0}; @@ -2893,7 +2893,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT(Exec_ShellDocView_67); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(V_VT(pvaIn) == VT_BSTR, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); - ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected %s\n", + ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected \"%s\"\n", wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url); ok(pvaOut != NULL, "pvaOut == NULL\n"); ok(V_VT(pvaOut) == VT_BOOL, "V_VT(pvaOut) = %d\n", V_VT(pvaOut)); @@ -5755,8 +5755,8 @@ static void test_load_history(IHTMLDocument2 *doc) ok(hres == S_OK, "Could not get IPersistHistory iface: %08x\n", hres); prev_url = nav_url; - nav_url = "http://www.winehq.org/#test"; - nav_serv_url = "http://www.winehq.org/"; + nav_url = "http://test.winehq.org/tests/winehq_snapshot/#test"; + nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; SET_EXPECT(Exec_ShellDocView_138); SET_EXPECT(Exec_ShellDocView_67); @@ -7327,9 +7327,9 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_travellog(doc); test_binding_ui((IUnknown*)doc); - nav_url = nav_serv_url = "http://www.winehq.org/"; /* for valid prev nav_url */ + nav_url = nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */ if(support_wbapp) { - test_put_href(doc, FALSE, "#test", "http://www.winehq.org/#test", FALSE, TRUE, 0); + test_put_href(doc, FALSE, "#test", "http://test.winehq.org/tests/winehq_snapshot/#test", FALSE, TRUE, 0); test_travellog(doc); test_refresh(doc); }

1 0

Nikolay Sivov : xmllite: Support reporting of a local name and value for attributes.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: e51ab3c03a47a242bd2d0b75f3e75bb4d0a92908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51ab3c03a47a242bd2d0b75f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 19 10:42:38 2013 +0400 xmllite: Support reporting of a local name and value for attributes. --- dlls/xmllite/reader.c | 34 ++++++++++++++++++++++++++++++---- dlls/xmllite/tests/reader.c | 14 +++++--------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 38d539d..4dc8185 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -226,6 +226,7 @@ struct element { struct list entry; strval qname; + strval localname; }; typedef struct @@ -437,7 +438,7 @@ static void reader_dec_depth(xmlreader *reader) if (reader->depth > 1) reader->depth--; } -static HRESULT reader_push_element(xmlreader *reader, strval *qname) +static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *localname) { struct element *elem; HRESULT hr; @@ -451,6 +452,14 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname) return hr; } + hr = reader_strvaldup(reader, localname, &elem->localname); + if (FAILED(hr)) + { + reader_free_strvalued(reader, &elem->qname); + reader_free(reader, elem); + return hr; + } + if (!list_empty(&reader->elements)) { hr = reader_inc_depth(reader); @@ -473,6 +482,7 @@ static void reader_pop_element(xmlreader *reader) { list_remove(&elem->entry); reader_free_strvalued(reader, &elem->qname); + reader_free_strvalued(reader, &elem->localname); reader_free(reader, elem); reader_dec_depth(reader); } @@ -1524,8 +1534,7 @@ static HRESULT reader_parse_sys_literal(xmlreader *reader, strval *literal) } if (*cur == quote) reader_skipn(reader, 1); - literal->str = start; - literal->len = cur-start; + reader_init_strvalue(start, cur-start, literal); TRACE("%s\n", debugstr_wn(start, cur-start)); return S_OK; } @@ -1872,7 +1881,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca { /* skip '>' */ reader_skipn(reader, 1); - return reader_push_element(reader, qname); + return reader_push_element(reader, qname, local); } hr = reader_parse_attribute(reader); @@ -2413,6 +2422,9 @@ static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) if (!This->attr_count) return S_FALSE; This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); + reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); + reader_set_strvalue(This, StringValue_Value, &This->attr->value); + return S_OK; } @@ -2430,7 +2442,11 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) next = list_next(&This->attrs, &This->attr->entry); if (next) + { This->attr = LIST_ENTRY(next, struct attribute, entry); + reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); + reader_set_strvalue(This, StringValue_Value, &This->attr->value); + } return next ? S_OK : S_FALSE; } @@ -2446,11 +2462,21 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); + struct element *elem; TRACE("(%p)\n", This); if (!This->attr_count) return S_FALSE; This->attr = NULL; + + /* FIXME: support other node types with 'attributes' like DTD */ + elem = LIST_ENTRY(list_head(&This->elements), struct element, entry); + if (elem) + { + reader_set_strvalue(This, StringValue_QualifiedName, &elem->qname); + reader_set_strvalue(This, StringValue_LocalName, &elem->localname); + } + return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 548abb1..6d81482 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1048,18 +1048,16 @@ static void test_read_dtd(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(len == lstrlenW(sysW), "got %u\n", len); ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); -} + len = 0; str = NULL; hr = IXmlReader_GetValue(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(len == lstrlenW(sysvalW), "got %u\n", len); ok(!lstrcmpW(str, sysvalW), "got %s\n", wine_dbgstr_w(str)); -} + hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1067,9 +1065,10 @@ todo_wine { str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); - +} len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); @@ -1617,12 +1616,11 @@ static void test_read_attribute(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine { ok(len == strlen(test->name), "got %u\n", len); str_exp = a2w(test->name); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); free_str(str_exp); - } + len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); @@ -1638,13 +1636,11 @@ static void test_read_attribute(void) str = NULL; hr = IXmlReader_GetValue(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine { ok(len == strlen(test->value), "got %u\n", len); str_exp = a2w(test->value); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); free_str(str_exp); } - } IStream_Release(stream); test++;

1 0