https://git.reactos.org/?p=reactos.git;a=commitdiff;h=608bbe1136df255e67a493ab794c9a2903d6df62
commit 608bbe1136df255e67a493ab794c9a2903d6df62 Author: Thomas Faber <[email protected]> AuthorDate: Sun Nov 20 10:03:50 2022 -0500 Commit: Thomas Faber <[email protected]> CommitDate: Wed Nov 23 22:02:47 2022 -0500 [MSXML3][MSXML3_WINETEST] Partial sync to Wine to enable libxml2 update. CORE-17766 xml2: Import upstream release 2.10.0. wine commit id 015491ab32742ace5218d37b1149c58803858214 by Alexandre Julliard <[email protected]> Note: Upstream msxml3_test has switched away from WINE_NO_LONG_TYPES, so I've kept the old printf format specifiers for now. Once we do a full sync, we can get rid of __ROS_LONG64__ for this test and use them unmodified. --- dll/win32/msxml3/main.c | 2 -- modules/rostests/winetests/msxml3/schema.c | 45 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dll/win32/msxml3/main.c b/dll/win32/msxml3/main.c index fb94bb2de06..9c66c7282c6 100644 --- a/dll/win32/msxml3/main.c +++ b/dll/win32/msxml3/main.c @@ -380,8 +380,6 @@ static void init_char_encoders(void) }; int i; - xmlInitCharEncodingHandlers(); - for (i = 0; i < ARRAY_SIZE(encoder); i++) { if (!xmlFindCharEncodingHandler(encoder[i].encoding)) diff --git a/modules/rostests/winetests/msxml3/schema.c b/modules/rostests/winetests/msxml3/schema.c index c7796e768d8..bf2922f09c3 100644 --- a/modules/rostests/winetests/msxml3/schema.c +++ b/modules/rostests/winetests/msxml3/schema.c @@ -1132,27 +1132,28 @@ static void test_regex(void) struct regex_test { const WCHAR *regex; const WCHAR *input; - BOOL todo; }; struct regex_test tests[] = { - { L"\\!", L"!", TRUE }, - { L"\\\"", L"\"", TRUE }, - { L"\\#", L"#", TRUE }, - { L"\\$", L"$", TRUE }, - { L"\\%", L"%", TRUE }, - { L"\\,", L",", TRUE }, - { L"\\/", L"/", TRUE }, - { L"\\:", L":", TRUE }, - { L"\\;", L";", TRUE }, - { L"\\=", L"=", TRUE }, - { L"\\>", L">", TRUE }, - { L"\\@", L"@", TRUE }, - { L"\\`", L"`", TRUE }, - { L"\\~", L"~", TRUE }, - { L"\\uCAFE", L"\xCAFE", TRUE }, + { L"\\!", L"!" }, + { L"\\\"", L"\"" }, + { L"\\#", L"#" }, + { L"\\$", L"$" }, + { L"\\%", L"%" }, + { L"\\,", L"," }, + { L"\\/", L"/" }, + { L"\\:", L":" }, + { L"\\;", L";" }, + { L"\\=", L"=" }, + { L"\\>", L">" }, + { L"\\@", L"@" }, + { L"\\`", L"`" }, + { L"\\~", L"~" }, + { L"\\uCAFE", L"\xCAFE" }, /* non-BMP character in surrogate pairs: */ - { L"\\uD83D\\uDE00", L"\xD83D\xDE00", TRUE } + { L"\\uD83D\\uDE00", L"\xD83D\xDE00" }, + /* "x{,2}" is non-standard and only works on libxml2 <= v2.9.10 */ + { L"x{0,2}", L"x" } }; int i; @@ -1173,15 +1174,13 @@ static void test_regex(void) if (doc60 && schema60 && cache60) { HRESULT hr = validate_regex_document(doc60, schema60, cache60, tests[i].regex, tests[i].input); - todo_wine_if(tests[i].todo) - ok(hr == S_OK, "got 0x%08x for version 60 regex %s input %s\n", - hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); + ok(hr == S_OK, "got 0x%08x for for version 60 regex %s input %s\n", + hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); if (doc40 && schema40 && cache40) { hr = validate_regex_document(doc40, schema40, cache40, tests[i].regex, tests[i].input); - todo_wine_if(tests[i].todo) - ok(hr == S_OK, "got 0x%08x for version 40 regex %s input %s\n", - hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); + ok(hr == S_OK, "got 0x%08x version 40 regex %s input %s\n", + hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); } } else
