[PATCH v2 0/6] MR10183: msxml/tests: Extend PI test with newlines.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> -- v2: msxml3: Add SAX error messages. https://gitlab.winehq.org/wine/wine/-/merge_requests/10183
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/tests/saxreader.c | 8 ++++---- dlls/msxml4/tests/saxreader.c | 16 +++++++--------- dlls/msxml6/tests/saxreader.c | 20 +++++--------------- 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 8a747362776..fdcd83a2362 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -762,7 +762,7 @@ static const char test3_cdata_xml[] = "<?xml version=\"1.0\" ?><a><![CDATA[Some text data]]></a>"; static const char test_pi_xml[] = -"<?xml version=\"1.0\" ?><a><?t some text ?></a>"; +"<?xml version=\"1.0\" ?><a><?t some t\rex\r\nt ?></a>"; static const char test_chardata_xml[] = "<?xml version=\"1.0\" ?><a>\nabc<b>de\nf</b>gh\n</a>"; @@ -962,8 +962,8 @@ static struct call_entry pi_test[] = { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, { CH_STARTDOCUMENT, 0, 0, S_OK }, { CH_STARTELEMENT, 1, 26, S_OK, L"", L"a", L"a" }, - { CH_PROCESSINGINSTRUCTION, 1, 30, S_OK, L"t", L"some text " }, - { CH_ENDELEMENT, 1, 44, S_OK, L"", L"a", L"a" }, + { CH_PROCESSINGINSTRUCTION, 1, 30, S_OK, L"t", L"some t\nex\nt " }, + { CH_ENDELEMENT, 3, 7, S_OK, L"", L"a", L"a" }, { CH_ENDDOCUMENT, 0, 0, S_OK }, { CH_ENDTEST } }; @@ -2556,7 +2556,7 @@ static void test_saxreader_pi(void) hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); sprintf(seqname, "%s: pi test", table->name); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, FALSE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE); VariantClear(&var); ISAXXMLReader_Release(reader); diff --git a/dlls/msxml4/tests/saxreader.c b/dlls/msxml4/tests/saxreader.c index 76cda76b99e..004bad49e17 100644 --- a/dlls/msxml4/tests/saxreader.c +++ b/dlls/msxml4/tests/saxreader.c @@ -745,7 +745,7 @@ static const char test3_cdata_xml[] = "<?xml version=\"1.0\" ?><a><![CDATA[Some text data]]></a>"; static const char test_pi_xml[] = -"<?xml version=\"1.0\" ?><a><?t some text ?></a>"; +"<?xml version=\"1.0\" ?><a><?t some t\rex\r\nt ?></a>"; static const char test_chardata_xml[] = "<?xml version=\"1.0\" ?><a>\nabc<b>de\nf</b>gh\n</a>"; @@ -933,14 +933,14 @@ static struct call_entry attribute_norm_alt[] = { { CH_ENDTEST } }; -static struct call_entry pi_test_v4[] = +static struct call_entry pi_test[] = { { CH_PUTDOCUMENTLOCATOR, 1, 0, S_OK }, { CH_STARTDOCUMENT, 1, 22, S_OK }, { CH_STARTELEMENT, 1, 25, S_OK, L"", L"a", L"a" }, - { CH_PROCESSINGINSTRUCTION, 1, 41, S_OK, L"t", L"some text " }, - { CH_ENDELEMENT, 1, 45, S_OK, L"", L"a", L"a" }, - { CH_ENDDOCUMENT, 1, 45, S_OK }, + { CH_PROCESSINGINSTRUCTION, 3, 4, S_OK, L"t", L"some t\nex\nt " }, + { CH_ENDELEMENT, 3, 8, S_OK, L"", L"a", L"a" }, + { CH_ENDDOCUMENT, 3, 8, S_OK }, { CH_ENDTEST } }; @@ -2398,7 +2398,6 @@ static void test_saxreader_cdata(void) static void test_saxreader_pi(void) { - struct call_entry *test_seq; ISAXXMLReader *reader; VARIANT var; HRESULT hr; @@ -2417,11 +2416,10 @@ static void test_saxreader_pi(void) V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown *)create_test_stream(test_pi_xml, -1); - test_seq = pi_test_v4; - set_expected_seq(test_seq); + set_expected_seq(pi_test); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "pi test", FALSE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, pi_test, "pi test", TRUE); VariantClear(&var); ISAXXMLReader_Release(reader); diff --git a/dlls/msxml6/tests/saxreader.c b/dlls/msxml6/tests/saxreader.c index dd99d936f57..c8d2b6bd5f6 100644 --- a/dlls/msxml6/tests/saxreader.c +++ b/dlls/msxml6/tests/saxreader.c @@ -697,7 +697,7 @@ static const char test3_cdata_xml[] = "<?xml version=\"1.0\" ?><a><![CDATA[Some text data]]></a>"; static const char test_pi_xml[] = -"<?xml version=\"1.0\" ?><a><?t some text ?></a>"; +"<?xml version=\"1.0\" ?><a><?t some t\rex\r\nt ?></a>"; static const char test_chardata_xml[] = "<?xml version=\"1.0\" ?><a>\nabc<b>de\nf</b>gh\n</a>"; @@ -4004,9 +4004,9 @@ static struct call_entry pi_test[] = { CH_PUTDOCUMENTLOCATOR, 1, 0, S_OK }, { CH_STARTDOCUMENT, 1, 22, S_OK }, { CH_STARTELEMENT, 1, 25, S_OK, L"", L"a", L"a" }, - { CH_PROCESSINGINSTRUCTION, 1, 41, S_OK, L"t", L"some text " }, - { CH_ENDELEMENT, 1, 45, S_OK, L"", L"a", L"a" }, - { CH_ENDDOCUMENT, 1, 45, S_OK }, + { CH_PROCESSINGINSTRUCTION, 3, 4, S_OK, L"t", L"some t\nex\nt " }, + { CH_ENDELEMENT, 3, 8, S_OK, L"", L"a", L"a" }, + { CH_ENDDOCUMENT, 3, 8, S_OK }, { CH_ENDTEST } }; @@ -4804,16 +4804,6 @@ static void test_saxreader(void) hr = ISAXXMLReader_putEntityResolver(reader, NULL); ok(hr == S_OK || broken(hr == E_FAIL), "Unexpected hr %#lx.\n", hr); - /* PI */ - V_VT(&var) = VT_UNKNOWN; - V_UNKNOWN(&var) = (IUnknown *)create_test_stream(test_pi_xml, -1); - test_seq = pi_test; - set_expected_seq(test_seq); - hr = ISAXXMLReader_parse(reader, var); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "pi test 1", FALSE); - VariantClear(&var); - ISAXXMLReader_Release(reader); free_bstrs(); @@ -5184,7 +5174,7 @@ static void test_saxreader_pi(void) set_expected_seq(pi_test); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, pi_test, "pi test 1", FALSE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, pi_test, "pi test 1", TRUE); VariantClear(&var); ISAXXMLReader_Release(reader); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10183
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/saxreader.c | 12 ++++++++++-- dlls/msxml3/tests/saxreader.c | 6 +++--- dlls/msxml4/tests/saxreader.c | 2 +- dlls/msxml6/tests/saxreader.c | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0321f18750f..89e76add533 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -3947,8 +3947,16 @@ static void saxreader_parse_pi(struct saxlocator *locator) return; } - saxreader_string_append(locator, &buffer, &ch, 1); - saxreader_skip(locator, 1); + if (saxreader_cmp(locator, L"\r\n") + || saxreader_cmp(locator, L"\r")) + { + saxreader_string_append(locator, &buffer, L"\n", 1); + } + else + { + saxreader_string_append(locator, &buffer, &ch, 1); + saxreader_skip(locator, 1); + } ch = *saxreader_get_ptr_noread(locator); } diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index fdcd83a2362..c5a73a8d254 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2556,7 +2556,7 @@ static void test_saxreader_pi(void) hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); sprintf(seqname, "%s: pi test", table->name); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, FALSE); VariantClear(&var); ISAXXMLReader_Release(reader); @@ -3137,7 +3137,7 @@ static void test_saxreader_normalize_line_breaks(void) set_expected_seq(normalize_line_breaks_pi_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, normalize_line_breaks_pi_seq, "Normalize line breaks: PI", TRUE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, normalize_line_breaks_pi_seq, "Normalize line breaks: PI", FALSE); /* Disable normalization */ hr = ISAXXMLReader_putFeature(reader, L"normalize-line-breaks", VARIANT_FALSE); @@ -3182,7 +3182,7 @@ static void test_saxreader_normalize_line_breaks(void) set_expected_seq(normalize_line_breaks_off_pi_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, normalize_line_breaks_off_pi_seq, "Normalize line breaks (off): PI", FALSE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, normalize_line_breaks_off_pi_seq, "Normalize line breaks (off): PI", TRUE); ISAXXMLReader_Release(reader); table++; diff --git a/dlls/msxml4/tests/saxreader.c b/dlls/msxml4/tests/saxreader.c index 004bad49e17..75e6782b5af 100644 --- a/dlls/msxml4/tests/saxreader.c +++ b/dlls/msxml4/tests/saxreader.c @@ -2419,7 +2419,7 @@ static void test_saxreader_pi(void) set_expected_seq(pi_test); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, pi_test, "pi test", TRUE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, pi_test, "pi test", FALSE); VariantClear(&var); ISAXXMLReader_Release(reader); diff --git a/dlls/msxml6/tests/saxreader.c b/dlls/msxml6/tests/saxreader.c index c8d2b6bd5f6..a56b27d4916 100644 --- a/dlls/msxml6/tests/saxreader.c +++ b/dlls/msxml6/tests/saxreader.c @@ -5174,7 +5174,7 @@ static void test_saxreader_pi(void) set_expected_seq(pi_test); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, pi_test, "pi test 1", TRUE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, pi_test, "pi test 1", FALSE); VariantClear(&var); ISAXXMLReader_Release(reader); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10183
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/saxreader.c | 16 +++++++++++++--- dlls/msxml3/tests/saxreader.c | 16 ++++++++-------- dlls/msxml4/tests/saxreader.c | 2 +- dlls/msxml6/tests/saxreader.c | 2 +- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 89e76add533..94a7415cba0 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -3728,9 +3728,19 @@ static BSTR saxreader_parse_attvalue(struct saxlocator *locator) } else { - ch = *saxreader_get_ptr_noread(locator); - saxreader_string_append(locator, &buffer, &ch, 1); - saxreader_skip(locator, 1); + if (saxreader_cmp(locator, L"\r\n") + || saxreader_cmp(locator, L"\r") + || saxreader_cmp(locator, L"\n") + || saxreader_cmp(locator, L"\t")) + { + saxreader_string_append(locator, &buffer, L" ", 1); + } + else + { + ch = *saxreader_get_ptr_noread(locator); + saxreader_string_append(locator, &buffer, &ch, 1); + saxreader_skip(locator, 1); + } } } diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index c5a73a8d254..58dd1c8cd2e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2969,7 +2969,7 @@ static struct call_entry normalize_line_breaks_off_text_seq[] = static struct attribute_entry normalize_line_breaks_attrs[] = { - { L"", L"attr", L"attr", L"a b" }, + { L"", L"attr", L"attr", L"a b c d" }, { NULL } }; @@ -2977,8 +2977,8 @@ static struct call_entry normalize_line_breaks_attr_seq[] = { { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, { CH_STARTDOCUMENT, 0, 0, S_OK }, - { CH_STARTELEMENT, 2, 5, S_OK, L"", L"e", L"e", normalize_line_breaks_attrs }, - { CH_ENDELEMENT, 2, 7, S_OK, L"", L"e", L"e" }, + { CH_STARTELEMENT, 3, 5, S_OK, L"", L"e", L"e", normalize_line_breaks_attrs }, + { CH_ENDELEMENT, 3, 7, S_OK, L"", L"e", L"e" }, { CH_ENDDOCUMENT, 0, 0, S_OK }, { CH_ENDTEST } }; @@ -3049,8 +3049,8 @@ static struct call_entry normalize_line_breaks_off_pi_seq[] = { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, { CH_STARTDOCUMENT, 0, 0, S_OK }, { CH_STARTELEMENT, 1, 4, S_OK, L"", L"e", L"e" }, - { CH_PROCESSINGINSTRUCTION, 1, 9, S_OK, L"pi", L"ab\rc " }, - { CH_ENDELEMENT, 2, 7, S_OK, L"", L"e", L"e" }, + { CH_PROCESSINGINSTRUCTION, 1, 9, S_OK, L"pi", L"ab\rc \r\nd " }, + { CH_ENDELEMENT, 3, 7, S_OK, L"", L"e", L"e" }, { CH_ENDDOCUMENT, 0, 0, S_OK }, { CH_ENDTEST } }; @@ -3109,7 +3109,7 @@ static void test_saxreader_normalize_line_breaks(void) /* Attribute values */ V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("<e attr=\"a\rb\" ></e>"); + V_BSTR(&var) = _bstr_("<e attr=\"a\rb\nc\r\nd\" ></e>"); set_expected_seq(normalize_line_breaks_attr_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -3154,7 +3154,7 @@ static void test_saxreader_normalize_line_breaks(void) /* Attribute values */ V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("<e attr=\"a\rb\" ></e>"); + V_BSTR(&var) = _bstr_("<e attr=\"a\rb\nc\r\nd\" ></e>"); set_expected_seq(normalize_line_breaks_attr_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -3178,7 +3178,7 @@ static void test_saxreader_normalize_line_breaks(void) /* PI */ V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("<e><?pi ab\rc ?></e>"); + V_BSTR(&var) = _bstr_("<e><?pi ab\rc \r\nd ?></e>"); set_expected_seq(normalize_line_breaks_off_pi_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); diff --git a/dlls/msxml4/tests/saxreader.c b/dlls/msxml4/tests/saxreader.c index 75e6782b5af..8859e858eee 100644 --- a/dlls/msxml4/tests/saxreader.c +++ b/dlls/msxml4/tests/saxreader.c @@ -2311,7 +2311,7 @@ static void test_saxreader(void) set_expected_seq(test_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", TRUE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", FALSE); IStream_Release(stream); resolver = (void*)0xdeadbeef; diff --git a/dlls/msxml6/tests/saxreader.c b/dlls/msxml6/tests/saxreader.c index a56b27d4916..4ecec94b9fc 100644 --- a/dlls/msxml6/tests/saxreader.c +++ b/dlls/msxml6/tests/saxreader.c @@ -4793,7 +4793,7 @@ static void test_saxreader(void) set_expected_seq(test_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", TRUE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", FALSE); IStream_Release(stream); resolver = (void*)0xdeadbeef; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10183
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/saxreader.c | 61 +++++++++++++++++++++++++++-------- dlls/msxml3/tests/saxreader.c | 9 ++---- dlls/msxml4/tests/saxreader.c | 3 -- dlls/msxml6/tests/saxreader.c | 2 -- 4 files changed, 51 insertions(+), 24 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 94a7415cba0..21610450fca 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -313,6 +313,7 @@ enum saxreader_feature UseInlineSchema = 0x00001000, UseSchemaLocation = 0x00002000, LexicalHandlerParEntities = 0x00004000, + NormalizeLineBreaks = 0x00008000, FeatureForceDWord = 0xffffffff, }; @@ -329,6 +330,7 @@ static const struct saxreader_feature_pair saxreader_feature_map[] = { { LexicalHandlerParEntities, L"http://xml.org/sax/features/lexical-handler/parameter-entities" }, { NamespacePrefixes, L"http://xml.org/sax/features/namespace-prefixes" }, { Namespaces, L"http://xml.org/sax/features/namespaces" }, + { NormalizeLineBreaks, L"normalize-line-breaks" }, { ProhibitDTD, L"prohibit-dtd" }, { SchemaValidation, L"schema-validation" }, }; @@ -3957,8 +3959,8 @@ static void saxreader_parse_pi(struct saxlocator *locator) return; } - if (saxreader_cmp(locator, L"\r\n") - || saxreader_cmp(locator, L"\r")) + if (locator->saxreader->features & NormalizeLineBreaks + && (saxreader_cmp(locator, L"\r\n") || saxreader_cmp(locator, L"\r"))) { saxreader_string_append(locator, &buffer, L"\n", 1); } @@ -4003,10 +4005,18 @@ static void saxreader_parse_comment(struct saxlocator *locator) } else { - saxreader_string_append(locator, &buffer, &ch, 1); + if (locator->saxreader->features & NormalizeLineBreaks + && (saxreader_cmp(locator, L"\r\n") || saxreader_cmp(locator, L"\r"))) + { + saxreader_string_append(locator, &buffer, L"\n", 1); + } + else + { + saxreader_string_append(locator, &buffer, &ch, 1); + saxreader_skip(locator, 1); + } } - saxreader_skip(locator, 1); ch = *saxreader_get_ptr_noread(locator); } @@ -4257,10 +4267,19 @@ static void saxreader_parse_chardata(struct saxlocator *locator) return; } - if (locator->saxreader->version >= MSXML4) - saxreader_parse_characters_newparser(locator, &context); + if (locator->saxreader->features & NormalizeLineBreaks) + { + if (locator->saxreader->version >= MSXML4) + saxreader_parse_characters_newparser(locator, &context); + else + saxreader_parse_characters(locator, &context); + } else - saxreader_parse_characters(locator, &context); + { + saxreader_string_append(locator, &context.buffer, &context.ch, 1); + saxreader_skip(locator, 1); + context.ch = *saxreader_get_ptr(locator); + } } free(context.buffer.data); @@ -4303,10 +4322,19 @@ static void saxreader_parse_cdata(struct saxlocator *locator) return saxlocator_end_cdata(locator, &context.position); } - if (locator->saxreader->version >= MSXML4) - saxreader_parse_characters_newparser(locator, &context); + if (locator->saxreader->features & NormalizeLineBreaks) + { + if (locator->saxreader->version >= MSXML4) + saxreader_parse_characters_newparser(locator, &context); + else + saxreader_parse_characters(locator, &context); + } else - saxreader_parse_characters(locator, &context); + { + saxreader_string_append(locator, &context.buffer, &context.ch, 1); + saxreader_skip(locator, 1); + context.ch = *saxreader_get_ptr(locator); + } } free(context.buffer.data); @@ -5994,11 +6022,14 @@ static HRESULT WINAPI isaxxmlreader_getFeature(ISAXXMLReader *iface, const WCHAR if (reader->version < MSXML4 && (feature == ExhaustiveErrors || feature == SchemaValidation)) return E_INVALIDARG; + if (feature == NormalizeLineBreaks && reader->version >= MSXML4) + return E_INVALIDARG; if (feature == Namespaces || feature == NamespacePrefixes || feature == ExhaustiveErrors || - feature == SchemaValidation) + feature == SchemaValidation || + feature == NormalizeLineBreaks) return get_feature_value(reader, feature, value); FIXME("%p, %s, %p stub\n", iface, debugstr_w(name), value); @@ -6014,11 +6045,15 @@ static HRESULT WINAPI isaxxmlreader_putFeature(ISAXXMLReader *iface, const WCHAR feature = get_saxreader_feature(name); + if (feature == NormalizeLineBreaks && reader->version >= MSXML4) + return E_INVALIDARG; + /* accepted cases */ if ((feature == ExhaustiveErrors && value == VARIANT_FALSE) || (feature == SchemaValidation && value == VARIANT_FALSE) || feature == Namespaces || - feature == NamespacePrefixes) + feature == NamespacePrefixes || + feature == NormalizeLineBreaks) { return set_feature_value(reader, feature, value); } @@ -6193,7 +6228,7 @@ HRESULT SAXXMLReader_create(MSXML_VERSION version, void **obj) reader->IVBSAXXMLReader_iface.lpVtbl = &vbsaxxmlreadervtbl; reader->ISAXXMLReader_iface.lpVtbl = &saxxmlreadervtbl; reader->refcount = 1; - reader->features = Namespaces | NamespacePrefixes; + reader->features = Namespaces | NamespacePrefixes | NormalizeLineBreaks; reader->version = version; reader->empty_bstr = SysAllocString(L""); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 58dd1c8cd2e..e4b9e88d5e1 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3085,9 +3085,7 @@ static void test_saxreader_normalize_line_breaks(void) v = VARIANT_FALSE; hr = ISAXXMLReader_getFeature(reader, L"normalize-line-breaks", &v); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(v == VARIANT_TRUE, "Unexpected value %d.\n", v); hr = ISAXXMLReader_putContentHandler(reader, &contentHandler); @@ -3141,7 +3139,6 @@ static void test_saxreader_normalize_line_breaks(void) /* Disable normalization */ hr = ISAXXMLReader_putFeature(reader, L"normalize-line-breaks", VARIANT_FALSE); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Text content */ @@ -3150,7 +3147,7 @@ static void test_saxreader_normalize_line_breaks(void) set_expected_seq(normalize_line_breaks_off_text_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, normalize_line_breaks_off_text_seq, "Normalize line breaks (off): text", TRUE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, normalize_line_breaks_off_text_seq, "Normalize line breaks (off): text", FALSE); /* Attribute values */ V_VT(&var) = VT_BSTR; @@ -3174,7 +3171,7 @@ static void test_saxreader_normalize_line_breaks(void) set_expected_seq(normalize_line_breaks_off_cdata_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, normalize_line_breaks_off_cdata_seq, "Normalize line breaks (off): cdata", TRUE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, normalize_line_breaks_off_cdata_seq, "Normalize line breaks (off): cdata", FALSE); /* PI */ V_VT(&var) = VT_BSTR; @@ -3182,7 +3179,7 @@ static void test_saxreader_normalize_line_breaks(void) set_expected_seq(normalize_line_breaks_off_pi_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, normalize_line_breaks_off_pi_seq, "Normalize line breaks (off): PI", TRUE); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, normalize_line_breaks_off_pi_seq, "Normalize line breaks (off): PI", FALSE); ISAXXMLReader_Release(reader); table++; diff --git a/dlls/msxml4/tests/saxreader.c b/dlls/msxml4/tests/saxreader.c index 8859e858eee..5169f54f53a 100644 --- a/dlls/msxml4/tests/saxreader.c +++ b/dlls/msxml4/tests/saxreader.c @@ -2871,16 +2871,13 @@ static void test_saxreader_normalize_line_breaks(void) v = 123; hr = ISAXXMLReader_getFeature(reader, L"normalize-line-breaks", &v); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); ok(v == 123, "Unexpected value %d.\n", v); hr = ISAXXMLReader_putFeature(reader, L"normalize-line-breaks", VARIANT_FALSE); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = ISAXXMLReader_putFeature(reader, L"normalize-line-breaks", VARIANT_TRUE); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); ISAXXMLReader_Release(reader); diff --git a/dlls/msxml6/tests/saxreader.c b/dlls/msxml6/tests/saxreader.c index 4ecec94b9fc..91bbbf7ab17 100644 --- a/dlls/msxml6/tests/saxreader.c +++ b/dlls/msxml6/tests/saxreader.c @@ -4820,12 +4820,10 @@ static void test_saxreader_normalize_line_breaks(void) v = 123; hr = ISAXXMLReader_getFeature(reader, L"normalize-line-breaks", &v); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); ok(v == 123, "Unexpected value %d.\n", v); hr = ISAXXMLReader_putFeature(reader, L"normalize-line-breaks", VARIANT_FALSE); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); ISAXXMLReader_Release(reader); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10183
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/tests/saxreader.c | 35 ++++++++++++++++++++++++++++++----- dlls/msxml4/tests/saxreader.c | 25 +++++++++++++++++++++++++ dlls/msxml6/tests/saxreader.c | 25 +++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e4b9e88d5e1..16f4448a75c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3190,6 +3190,35 @@ static void test_saxreader_normalize_line_breaks(void) free_bstrs(); } +static void test_saxreader_exhaustive_errors(void) +{ + static const GUID *classes[] = { &CLSID_SAXXMLReader, &CLSID_SAXXMLReader30 }; + ISAXXMLReader *reader; + VARIANT_BOOL v; + HRESULT hr; + + for (int i = 0; i < ARRAYSIZE(classes); ++i) + { + hr = CoCreateInstance(classes[i], NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void **)&reader); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + v = 123; + hr = ISAXXMLReader_getFeature(reader, L"exhaustive-errors", &v); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(v == 123, "Unexpected value %d.\n", v); + + hr = ISAXXMLReader_putFeature(reader, L"exhaustive-errors", VARIANT_TRUE); + todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + hr = ISAXXMLReader_putFeature(reader, L"exhaustive-errors", VARIANT_FALSE); + todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + ISAXXMLReader_Release(reader); + } +} + struct feature_ns_entry_t { const GUID *guid; const char *clsid; @@ -3229,11 +3258,6 @@ static void test_saxreader_features(void) continue; } - value = 123; - hr = ISAXXMLReader_getFeature(reader, L"exhaustive-errors", &value); - ok(hr == E_INVALIDARG, "Failed to get feature value, hr %#lx.\n", hr); - ok(value == 123, "Unexpected value %d.\n", value); - value = 123; hr = ISAXXMLReader_getFeature(reader, L"schema-validation", &value); ok(hr == E_INVALIDARG, "Failed to get feature value, hr %#lx.\n", hr); @@ -6404,6 +6428,7 @@ START_TEST(saxreader) test_saxreader_properties(); test_saxreader_max_xml_size(); test_saxreader_normalize_line_breaks(); + test_saxreader_exhaustive_errors(); test_saxreader_features(); test_saxreader_encoding(); test_saxreader_dispex(); diff --git a/dlls/msxml4/tests/saxreader.c b/dlls/msxml4/tests/saxreader.c index 5169f54f53a..0749146a5c6 100644 --- a/dlls/msxml4/tests/saxreader.c +++ b/dlls/msxml4/tests/saxreader.c @@ -2883,6 +2883,30 @@ static void test_saxreader_normalize_line_breaks(void) ISAXXMLReader_Release(reader); } +static void test_saxreader_exhaustive_errors(void) +{ + ISAXXMLReader *reader; + VARIANT_BOOL v; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SAXXMLReader40, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void **)&reader); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + v = VARIANT_TRUE; + hr = ISAXXMLReader_getFeature(reader, L"exhaustive-errors", &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(v == VARIANT_FALSE, "Unexpected value %d.\n", v); + + hr = ISAXXMLReader_putFeature(reader, L"exhaustive-errors", VARIANT_TRUE); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = ISAXXMLReader_putFeature(reader, L"exhaustive-errors", VARIANT_FALSE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + ISAXXMLReader_Release(reader); +} + static void test_saxreader_features(void) { static const WCHAR *feature_names[] = @@ -5754,6 +5778,7 @@ START_TEST(saxreader) test_saxreader_properties(); test_saxreader_max_xml_size(); test_saxreader_normalize_line_breaks(); + test_saxreader_exhaustive_errors(); test_saxreader_features(); test_saxreader_encoding(); test_saxreader_dispex(); diff --git a/dlls/msxml6/tests/saxreader.c b/dlls/msxml6/tests/saxreader.c index 91bbbf7ab17..847d71ac149 100644 --- a/dlls/msxml6/tests/saxreader.c +++ b/dlls/msxml6/tests/saxreader.c @@ -4829,6 +4829,30 @@ static void test_saxreader_normalize_line_breaks(void) ISAXXMLReader_Release(reader); } +static void test_saxreader_exhaustive_errors(void) +{ + ISAXXMLReader *reader; + VARIANT_BOOL v; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SAXXMLReader60, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void **)&reader); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + v = VARIANT_TRUE; + hr = ISAXXMLReader_getFeature(reader, L"exhaustive-errors", &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(v == VARIANT_FALSE, "Unexpected value %d.\n", v); + + hr = ISAXXMLReader_putFeature(reader, L"exhaustive-errors", VARIANT_TRUE); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = ISAXXMLReader_putFeature(reader, L"exhaustive-errors", VARIANT_FALSE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + ISAXXMLReader_Release(reader); +} + static const WCHAR *feature_names[] = { L"http://xml.org/sax/features/namespaces", @@ -5313,6 +5337,7 @@ START_TEST(saxreader) test_saxreader_properties(); test_saxreader_max_xml_size(); test_saxreader_normalize_line_breaks(); + test_saxreader_exhaustive_errors(); test_saxreader_features(); test_saxreader_encoding(); test_saxreader_dispex(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10183
From: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/msxml.mc | 317 ++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/saxreader.c | 6 +- 3 files changed, 321 insertions(+), 3 deletions(-) create mode 100644 dlls/msxml3/msxml.mc diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 0da2a467a56..a373417df89 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -21,6 +21,7 @@ SOURCES = \ factory.c \ httprequest.c \ main.c \ + msxml.mc \ msxml3_v1.idl \ mxnamespace.c \ mxwriter.c \ diff --git a/dlls/msxml3/msxml.mc b/dlls/msxml3/msxml.mc new file mode 100644 index 00000000000..fe6b2901c23 --- /dev/null +++ b/dlls/msxml3/msxml.mc @@ -0,0 +1,317 @@ +; +; Copyright 2026 Nikolay Sivov for CodeWeavers +; +; This library is free software; you can redistribute it and/or +; modify it under the terms of the GNU Lesser General Public +; License as published by the Free Software Foundation; either +; version 2.1 of the License, or (at your option) any later version. +; +; This library is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +; Lesser General Public License for more details. +; +; You should have received a copy of the GNU Lesser General Public +; License along with this library; if not, write to the Free Software +; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +; + +LanguageNames=(ENU=0x409:msxml) + +SeverityNames=(Error=0x3:STATUS_SEVERITY_ERROR) +FacilityNames=(XML=0xc:FACILITY_INTERNET) + +MessageId=0xe002 +Severity=Error +Facility=XML +SymbolicName=E_SAX_UNDEFINEDREF +Language=ENU +Undefined reference +. +MessageId=0xe003 +Severity=Error +Facility=XML +SymbolicName=E_SAX_INFINITEREFLOOP +Language=ENU +Found self-referential entity +. +MessageId=0xe006 +Severity=Error +Facility=XML +SymbolicName=E_SAX_UNPARSEDENTITYREF +Language=ENU +Unparsed entity reference +. +MessageId=0xe00c +Severity=Error +Facility=XML +SymbolicName=E_SAX_CONTAINSCOLON +Language=ENU +Name text contains colon ':' +. +MessageId=0xe01d +Severity=Error +Facility=XML +SymbolicName=E_SAX_UNDECLAREDPREFIX +Language=ENU +Namespace prefix hasn't been declared +. +MessageId=0xe501 +Severity=Error +Facility=XML +SymbolicName=E_SAX_MISSINGEQUALS +Language=ENU +Expected '=' character +. +MessageId=0xe502 +Severity=Error +Facility=XML +SymbolicName=E_SAX_MISSINGQUOTE +Language=ENU +Expected a quote character +. +MessageId=0xe503 +Severity=Error +Facility=XML +SymbolicName=E_SAX_COMMENTSYNTAX +Language=ENU +Malformed comment +. +MessageId=0xe504 +Severity=Error +Facility=XML +SymbolicName=E_SAX_BADSTARTNAMECHAR +Language=ENU +Invalid name start character +. +MessageId=0xe505 +Severity=Error +Facility=XML +SymbolicName=E_SAX_BADNAMECHAR +Language=ENU +Invalid name character +. +MessageId=0xe506 +Severity=Error +Facility=XML +SymbolicName=E_SAX_BADCHARINSTRING +Language=ENU +The '<' character found in attribute value +. +MessageId=0xe509 +Severity=Error +Facility=XML +SymbolicName=E_SAX_MISSINGWHITESPACE +Language=ENU +Expected whitespace character +. +MessageId=0xe50a +Severity=Error +Facility=XML +SymbolicName=E_SAX_EXPECTINGTAGEND +Language=ENU +Expected end tag character '>' +. +MessageId=0xe50b +Severity=Error +Facility=XML +SymbolicName=E_SAX_BADCHARINDTD +Language=ENU +Invalid character in DTD content +. +MessageId=0xe50d +Severity=Error +Facility=XML +SymbolicName=E_SAX_MISSINGSEMICOLON +Language=ENU +Expected ';' character +. +MessageId=0xe50e +Severity=Error +Facility=XML +SymbolicName=E_SAX_BADCHARINENTREF +Language=ENU +Invalid character in entity reference +. +MessageId=0xe515 +Severity=Error +Facility=XML +SymbolicName=E_SAX_BADCHARINMIXEDMODEL +Language=ENU +Invalid character in mixed DTD content +. +MessageId=0xe516 +Severity=Error +Facility=XML +SymbolicName=E_SAX_MISSING_STAR +Language=ENU +Expected '*' character +. +MessageId=0xe518 +Severity=Error +Facility=XML +SymbolicName=E_SAX_MISSING_PAREN +Language=ENU +Expected parenthesis character +. +MessageId=0xe519 +Severity=Error +Facility=XML +SymbolicName=E_SAX_BADCHARINENUMERATION +Language=ENU +Invalid character in DTD enumeration +. +MessageId=0xe51a +Severity=Error +Facility=XML +SymbolicName=E_SAX_PIDECLSYNTAX +Language=ENU +Invalid PI syntax +. +MessageId=0xe51b +Severity=Error +Facility=XML +SymbolicName=E_SAX_EXPECTINGCLOSEQUOTE +Language=ENU +Expected closing quote character +. +MessageId=0xe51c +Severity=Error +Facility=XML +SymbolicName=E_SAX_MULTIPLE_COLONS +Language=ENU +Multiple colon character found +. +MessageId=0xe51f +Severity=Error +Facility=XML +SymbolicName=E_SAX_INVALID_UNICODE +Language=ENU +Invalid Unicode character +. +MessageId=0xe520 +Severity=Error +Facility=XML +SymbolicName=E_SAX_WHITESPACEORQUESTIONMARK +Language=ENU +Expected whitespace or '?' character +. +MessageId=0xe552 +Severity=Error +Facility=XML +SymbolicName=E_SAX_UNEXPECTEDENDTAG +Language=ENU +Unexpected end tag '>' character +. +MessageId=0xe554 +Severity=Error +Facility=XML +SymbolicName=E_SAX_DUPLICATEATTRIBUTE +Language=ENU +Found duplicate attribute +. +MessageId=0xe556 +Severity=Error +Facility=XML +SymbolicName=E_SAX_INVALIDATROOTLEVEL +Language=ENU +Document root is invalid +. +MessageId=0xe557 +Severity=Error +Facility=XML +SymbolicName=E_SAX_BAD_XMLDECL +Language=ENU +Invalid xml declaration +. +MessageId=0xe558 +Severity=Error +Facility=XML +SymbolicName=E_SAX_MISSINGROOT +Language=ENU +Document root is missing +. +MessageId=0xe559 +Severity=Error +Facility=XML +SymbolicName=E_SAX_UNEXPECTED_EOF +Language=ENU +Unexpected end of input data stream +. +MessageId=0xe55c +Severity=Error +Facility=XML +SymbolicName=E_SAX_INVALID_CDATACLOSINGTAG +Language=ENU +Found unexpected CDATA closing markup ']]>' +. +MessageId=0xe55d +Severity=Error +Facility=XML +SymbolicName=E_SAX_UNCLOSEDPI +Language=ENU +Found unterminated PI declaration +. +MessageId=0xe55f +Severity=Error +Facility=XML +SymbolicName=E_SAX_UNCLOSEDENDTAG +Language=ENU +Found unterminated end tag +. +MessageId=0xe564 +Severity=Error +Facility=XML +SymbolicName=E_SAX_UNCLOSEDCDATA +Language=ENU +Found unterminated CDATA block +. +MessageId=0xe568 +Severity=Error +Facility=XML +SymbolicName=E_SAX_RESERVEDNAMESPACE +Language=ENU +Use namespace prefix is reserved +. +MessageId=0xe56d +Severity=Error +Facility=XML +SymbolicName=E_SAX_ENDTAGMISMATCH +Language=ENU +End tag does not match +. +MessageId=0xe56e +Severity=Error +Facility=XML +SymbolicName=E_SAX_INVALIDENCODING +Language=ENU +Invalid encoding name +. +MessageId=0xe571 +Severity=Error +Facility=XML +SymbolicName=E_SAX_INVALID_MODEL +Language=ENU +Invalid model in DTD contentspec +. +MessageId=0xe572 +Severity=Error +Facility=XML +SymbolicName=E_SAX_INVALID_TYPE +Language=ENU +Invalid DTD attribute type +. +MessageId=0xe579 +Severity=Error +Facility=XML +SymbolicName=E_SAX_INVALID_STANDALONE +Language=ENU +Invalid standalone declaration +. +MessageId=0xe57f +Severity=Error +Facility=XML +SymbolicName=E_SAX_INVALID_VERSION +Language=ENU +Invalid xml version +. diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 21610450fca..4988ce16748 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2149,10 +2149,10 @@ static void saxreader_fatal_error(struct saxlocator *locator) { WCHAR msg[1024]; - if (!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, locator->status, 0, msg, ARRAY_SIZE(msg), NULL)) + if (!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, MSXML_hInstance, locator->status, 0, + msg, ARRAY_SIZE(msg), NULL)) { - FIXME("MSXML errors not yet supported.\n"); - msg[0] = '\0'; + *msg = 0; } if (locator->vbInterface) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10183
participants (2)
-
Nikolay Sivov -
Nikolay Sivov (＠nsivov)