mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 09:25:06 +00:00
xmllite/writer: Implement WriteChars.
Signed-off-by: David Kahurani <k.kahurani@gmail.com>
This commit is contained in:
parent
0002cb89ec
commit
f3cfbef6af
|
@ -453,6 +453,9 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output)
|
||||||
hr = IXmlWriter_WriteWhitespace(writer, L" ");
|
hr = IXmlWriter_WriteWhitespace(writer, L" ");
|
||||||
ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
|
ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, L"a", 1);
|
||||||
|
ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
hr = IXmlWriter_Flush(writer);
|
hr = IXmlWriter_Flush(writer);
|
||||||
ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
|
ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
@ -1497,6 +1500,15 @@ static void test_writer_state(void)
|
||||||
check_writer_state(writer, WR_E_INVALIDACTION);
|
check_writer_state(writer, WR_E_INVALIDACTION);
|
||||||
IStream_Release(stream);
|
IStream_Release(stream);
|
||||||
|
|
||||||
|
/* WriteChars */
|
||||||
|
stream = writer_set_output(writer);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, L"a", 1);
|
||||||
|
ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
check_writer_state(writer, WR_E_INVALIDACTION);
|
||||||
|
|
||||||
|
IStream_Release(stream);
|
||||||
IXmlWriter_Release(writer);
|
IXmlWriter_Release(writer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2123,6 +2135,130 @@ static void test_WriteString(void)
|
||||||
IStream_Release(stream);
|
IStream_Release(stream);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void test_WriteChars(void)
|
||||||
|
{
|
||||||
|
IXmlWriter *writer;
|
||||||
|
IStream *stream;
|
||||||
|
HRESULT hr;
|
||||||
|
static WCHAR raw[] = {'s', 'a', 'm', 0xd800, 0xdc00, 'p', 'l', 'e', 0};
|
||||||
|
|
||||||
|
hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, NULL, 0);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, NULL, 5);
|
||||||
|
ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, L"", 0);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, L"", 5);
|
||||||
|
ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
stream = writer_set_output(writer);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, L"a", 1);
|
||||||
|
ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteStartElement(writer, NULL, L"chars", NULL);
|
||||||
|
ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
IStream_Release(stream);
|
||||||
|
|
||||||
|
stream = writer_set_output(writer);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteStartElement(writer, NULL, L"chars", NULL);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, NULL, 5);
|
||||||
|
ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, L"<chars>", 20);
|
||||||
|
ok(hr == WC_E_XMLCHARACTER, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, L"<chars>", 7);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_Flush(writer);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
CHECK_OUTPUT(stream,
|
||||||
|
"<chars><chars><chars>");
|
||||||
|
IStream_Release(stream);
|
||||||
|
|
||||||
|
stream = writer_set_output(writer);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteStartElement(writer, NULL, L"chars", NULL);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, raw, 8);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
raw[3] = 0xdc00;
|
||||||
|
raw[4] = 0xd800;
|
||||||
|
hr = IXmlWriter_WriteChars(writer, raw, 8);
|
||||||
|
ok(hr == WR_E_INVALIDSURROGATEPAIR, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_Flush(writer);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
CHECK_OUTPUT(stream, "<chars>sam\U00010000plesam");
|
||||||
|
IStream_Release(stream);
|
||||||
|
|
||||||
|
stream = writer_set_output(writer);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteStartElement(writer, NULL, L"chars", NULL);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, NULL, 0);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteFullEndElement(writer);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_Flush(writer);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
CHECK_OUTPUT(stream,
|
||||||
|
"<chars></chars>");
|
||||||
|
IStream_Release(stream);
|
||||||
|
|
||||||
|
stream = writer_set_output(writer);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteStartElement(writer, NULL, L"chars", NULL);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, L"", 0);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_Flush(writer);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
CHECK_OUTPUT(stream,
|
||||||
|
"<chars");
|
||||||
|
|
||||||
|
IStream_Release(stream);
|
||||||
|
|
||||||
|
stream = writer_set_output(writer);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteStartElement(writer, NULL, L"c", NULL);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_WriteChars(writer, L"", 5);
|
||||||
|
ok(hr == WC_E_XMLCHARACTER, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
hr = IXmlWriter_Flush(writer);
|
||||||
|
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
|
||||||
|
|
||||||
|
CHECK_OUTPUT(stream,
|
||||||
|
"<c>");
|
||||||
|
|
||||||
|
IXmlWriter_Release(writer);
|
||||||
|
IStream_Release(stream);
|
||||||
|
}
|
||||||
|
|
||||||
static void test_WriteDocType(void)
|
static void test_WriteDocType(void)
|
||||||
{
|
{
|
||||||
static const struct
|
static const struct
|
||||||
|
@ -2650,6 +2786,7 @@ START_TEST(writer)
|
||||||
test_WriteAttributeString();
|
test_WriteAttributeString();
|
||||||
test_WriteFullEndElement();
|
test_WriteFullEndElement();
|
||||||
test_WriteCharEntity();
|
test_WriteCharEntity();
|
||||||
|
test_WriteChars();
|
||||||
test_WriteString();
|
test_WriteString();
|
||||||
test_WriteDocType();
|
test_WriteDocType();
|
||||||
test_WriteWhitespace();
|
test_WriteWhitespace();
|
||||||
|
|
|
@ -1104,28 +1104,110 @@ static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR ch)
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch)
|
static HRESULT writer_get_next_write_count(const WCHAR *str, unsigned int length, unsigned int *count)
|
||||||
{
|
{
|
||||||
xmlwriter *This = impl_from_IXmlWriter(iface);
|
if (!is_char(*str)) return WC_E_XMLCHARACTER;
|
||||||
|
|
||||||
FIXME("%p %s %d\n", This, wine_dbgstr_w(pwch), cwch);
|
if (IS_HIGH_SURROGATE(*str))
|
||||||
|
{
|
||||||
|
if (length < 2 || !IS_LOW_SURROGATE(*(str + 1)))
|
||||||
|
return WR_E_INVALIDSURROGATEPAIR;
|
||||||
|
|
||||||
switch (This->state)
|
*count = 2;
|
||||||
|
}
|
||||||
|
else if (IS_LOW_SURROGATE(*str))
|
||||||
|
return WR_E_INVALIDSURROGATEPAIR;
|
||||||
|
else
|
||||||
|
*count = 1;
|
||||||
|
|
||||||
|
return S_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
static HRESULT write_escaped_char(xmlwriter *writer, const WCHAR *string, unsigned int count)
|
||||||
|
{
|
||||||
|
HRESULT hr;
|
||||||
|
|
||||||
|
switch (*string)
|
||||||
|
{
|
||||||
|
case '<':
|
||||||
|
hr = write_output_buffer(writer->output, L"<", 4);
|
||||||
|
break;
|
||||||
|
case '&':
|
||||||
|
hr = write_output_buffer(writer->output, L"&", 5);
|
||||||
|
break;
|
||||||
|
case '>':
|
||||||
|
hr = write_output_buffer(writer->output, L">", 4);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
hr = write_output_buffer(writer->output, string, count);
|
||||||
|
}
|
||||||
|
|
||||||
|
return hr;
|
||||||
|
}
|
||||||
|
|
||||||
|
static HRESULT write_escaped_string(xmlwriter *writer, const WCHAR *string, unsigned int length)
|
||||||
|
{
|
||||||
|
unsigned int count;
|
||||||
|
HRESULT hr = S_OK;
|
||||||
|
|
||||||
|
if (length == ~0u)
|
||||||
|
{
|
||||||
|
while (*string)
|
||||||
|
{
|
||||||
|
if (FAILED(hr = writer_get_next_write_count(string, ~0u, &count))) return hr;
|
||||||
|
if (FAILED(hr = write_escaped_char(writer, string, count))) return hr;
|
||||||
|
|
||||||
|
string += count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
while (length)
|
||||||
|
{
|
||||||
|
if (FAILED(hr = writer_get_next_write_count(string, length, &count))) return hr;
|
||||||
|
if (FAILED(hr = write_escaped_char(writer, string, count))) return hr;
|
||||||
|
|
||||||
|
string += count;
|
||||||
|
length -= count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return hr;
|
||||||
|
}
|
||||||
|
|
||||||
|
static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *characters, UINT length)
|
||||||
|
{
|
||||||
|
xmlwriter *writer = impl_from_IXmlWriter(iface);
|
||||||
|
|
||||||
|
TRACE("%p, %s, %d.\n", iface, debugstr_wn(characters, length), length);
|
||||||
|
|
||||||
|
if ((characters == NULL && length != 0))
|
||||||
|
return E_INVALIDARG;
|
||||||
|
|
||||||
|
if (length == 0)
|
||||||
|
return S_OK;
|
||||||
|
|
||||||
|
switch (writer->state)
|
||||||
{
|
{
|
||||||
case XmlWriterState_Initial:
|
case XmlWriterState_Initial:
|
||||||
return E_UNEXPECTED;
|
return E_UNEXPECTED;
|
||||||
case XmlWriterState_InvalidEncoding:
|
case XmlWriterState_InvalidEncoding:
|
||||||
return MX_E_ENCODING;
|
return MX_E_ENCODING;
|
||||||
|
case XmlWriterState_ElemStarted:
|
||||||
|
writer_close_starttag(writer);
|
||||||
|
break;
|
||||||
|
case XmlWriterState_Ready:
|
||||||
case XmlWriterState_DocClosed:
|
case XmlWriterState_DocClosed:
|
||||||
|
writer->state = XmlWriterState_DocClosed;
|
||||||
return WR_E_INVALIDACTION;
|
return WR_E_INVALIDACTION;
|
||||||
default:
|
default:
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
return E_NOTIMPL;
|
writer->textnode = 1;
|
||||||
|
return write_escaped_string(writer, characters, length);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment)
|
static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment)
|
||||||
{
|
{
|
||||||
xmlwriter *This = impl_from_IXmlWriter(iface);
|
xmlwriter *This = impl_from_IXmlWriter(iface);
|
||||||
|
@ -1684,25 +1766,6 @@ static HRESULT WINAPI xmlwriter_WriteQualifiedName(IXmlWriter *iface, LPCWSTR pw
|
||||||
return E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT writer_get_next_write_count(const WCHAR *str, unsigned int length, unsigned int *count)
|
|
||||||
{
|
|
||||||
if (!is_char(*str)) return WC_E_XMLCHARACTER;
|
|
||||||
|
|
||||||
if (IS_HIGH_SURROGATE(*str))
|
|
||||||
{
|
|
||||||
if (length < 2 || !IS_LOW_SURROGATE(*(str + 1)))
|
|
||||||
return WR_E_INVALIDSURROGATEPAIR;
|
|
||||||
|
|
||||||
*count = 2;
|
|
||||||
}
|
|
||||||
else if (IS_LOW_SURROGATE(*str))
|
|
||||||
return WR_E_INVALIDSURROGATEPAIR;
|
|
||||||
else
|
|
||||||
*count = 1;
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR data)
|
static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR data)
|
||||||
{
|
{
|
||||||
xmlwriter *This = impl_from_IXmlWriter(iface);
|
xmlwriter *This = impl_from_IXmlWriter(iface);
|
||||||
|
@ -1862,58 +1925,6 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT write_escaped_char(xmlwriter *writer, const WCHAR *string, unsigned int count)
|
|
||||||
{
|
|
||||||
HRESULT hr;
|
|
||||||
|
|
||||||
switch (*string)
|
|
||||||
{
|
|
||||||
case '<':
|
|
||||||
hr = write_output_buffer(writer->output, L"<", 4);
|
|
||||||
break;
|
|
||||||
case '&':
|
|
||||||
hr = write_output_buffer(writer->output, L"&", 5);
|
|
||||||
break;
|
|
||||||
case '>':
|
|
||||||
hr = write_output_buffer(writer->output, L">", 4);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
hr = write_output_buffer(writer->output, string, count);
|
|
||||||
}
|
|
||||||
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
static HRESULT write_escaped_string(xmlwriter *writer, const WCHAR *string, unsigned int length)
|
|
||||||
{
|
|
||||||
unsigned int count;
|
|
||||||
HRESULT hr = S_OK;
|
|
||||||
|
|
||||||
if (length == ~0u)
|
|
||||||
{
|
|
||||||
while (*string)
|
|
||||||
{
|
|
||||||
if (FAILED(hr = writer_get_next_write_count(string, ~0u, &count))) return hr;
|
|
||||||
if (FAILED(hr = write_escaped_char(writer, string, count))) return hr;
|
|
||||||
|
|
||||||
string += count;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
while (length)
|
|
||||||
{
|
|
||||||
if (FAILED(hr = writer_get_next_write_count(string, length, &count))) return hr;
|
|
||||||
if (FAILED(hr = write_escaped_char(writer, string, count))) return hr;
|
|
||||||
|
|
||||||
string += count;
|
|
||||||
length -= count;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, const WCHAR *string)
|
static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, const WCHAR *string)
|
||||||
{
|
{
|
||||||
xmlwriter *This = impl_from_IXmlWriter(iface);
|
xmlwriter *This = impl_from_IXmlWriter(iface);
|
||||||
|
|
Loading…
Reference in a new issue