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