Module: wine Branch: master Commit: ea0d29184c3ac433324e5fc102b00fdae4e63576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0d29184c3ac433324e5fc102...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Sun Apr 3 11:50:24 2016 +0300
msxml3/mxwriter: Implement notation declaration output.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msxml3/mxwriter.c | 51 +++++++++++++++++++++++++++++++++---------- dlls/msxml3/tests/saxreader.c | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 12 deletions(-)
diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index c1215bf..585abac 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -46,6 +46,8 @@ static const WCHAR quotW[] = {'"'}; static const WCHAR closetagW[] = {'>','\r','\n'}; static const WCHAR crlfW[] = {'\r','\n'}; static const WCHAR entityW[] = {'<','!','E','N','T','I','T','Y',' '}; +static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; +static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '};
/* should be ordered as encoding names are sorted */ typedef enum @@ -1532,8 +1534,6 @@ static HRESULT WINAPI SAXLexicalHandler_startDTD(ISAXLexicalHandler *iface,
if (publicId) { - static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; - write_output_buffer(This, publicW, sizeof(publicW)/sizeof(WCHAR)); write_output_buffer_quoted(This, publicId, publicId_len);
@@ -1549,8 +1549,6 @@ static HRESULT WINAPI SAXLexicalHandler_startDTD(ISAXLexicalHandler *iface, } else if (systemId) { - static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; - write_output_buffer(This, systemW, sizeof(systemW)/sizeof(WCHAR)); write_output_buffer_quoted(This, systemId, systemId_len); if (*systemId) @@ -1763,8 +1761,6 @@ static HRESULT WINAPI SAXDeclHandler_externalEntityDecl(ISAXDeclHandler *iface, const WCHAR *name, int n_name, const WCHAR *publicId, int n_publicId, const WCHAR *systemId, int n_systemId) { - static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; - static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; mxwriter *This = impl_from_ISAXDeclHandler( iface );
TRACE("(%p)->(%s:%d %s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, @@ -2290,14 +2286,45 @@ static ULONG WINAPI SAXDTDHandler_Release(ISAXDTDHandler *iface) }
static HRESULT WINAPI SAXDTDHandler_notationDecl(ISAXDTDHandler *iface, - const WCHAR *name, INT nname, - const WCHAR *publicid, INT npublicid, - const WCHAR *systemid, INT nsystemid) + const WCHAR *name, INT n_name, + const WCHAR *publicid, INT n_publicid, + const WCHAR *systemid, INT n_systemid) { + static const WCHAR notationW[] = {'<','!','N','O','T','A','T','I','O','N',' '}; mxwriter *This = impl_from_ISAXDTDHandler( iface ); - FIXME("(%p)->(%s:%d, %s:%d, %s:%d): stub\n", This, debugstr_wn(name, nname), nname, - debugstr_wn(publicid, npublicid), npublicid, debugstr_wn(systemid, nsystemid), nsystemid); - return E_NOTIMPL; + + TRACE("(%p)->(%s:%d, %s:%d, %s:%d)\n", This, debugstr_wn(name, n_name), n_name, + debugstr_wn(publicid, n_publicid), n_publicid, debugstr_wn(systemid, n_systemid), n_systemid); + + if (!name || !n_name) + return E_INVALIDARG; + + write_output_buffer(This, notationW, sizeof(notationW)/sizeof(WCHAR)); + write_output_buffer(This, name, n_name); + + if (!publicid && !systemid) + return E_INVALIDARG; + + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + if (publicid) + { + write_output_buffer(This, publicW, sizeof(publicW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, publicid, n_publicid); + if (systemid) + { + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, systemid, n_systemid); + } + } + else + { + write_output_buffer(This, systemW, sizeof(systemW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, systemid, n_systemid); + } + + write_output_buffer(This, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + + return S_OK; }
static HRESULT WINAPI SAXDTDHandler_unparsedEntityDecl(ISAXDTDHandler *iface, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 27a6f99..3a93ea7 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4789,6 +4789,7 @@ static void test_mxwriter_dtd(void) ISAXLexicalHandler *lexical; IVBSAXDeclHandler *vbdecl; ISAXDeclHandler *decl; + ISAXDTDHandler *dtd; IMXWriter *writer; VARIANT dest; HRESULT hr; @@ -4987,6 +4988,9 @@ static void test_mxwriter_dtd(void) hr = IVBSAXDeclHandler_externalEntityDecl(vbdecl, NULL, NULL, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr);
+ hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), 0, NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), -1, NULL, 0, NULL, 0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
@@ -5012,6 +5016,43 @@ static void test_mxwriter_dtd(void)
VariantClear(&dest);
+ /* notation declaration */ + hr = IMXWriter_QueryInterface(writer, &IID_ISAXDTDHandler, (void**)&dtd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, NULL, 0, NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), NULL, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), _bstr_("sysid"), strlen("sysid")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), NULL, 0, _bstr_("sysid"), strlen("sysid")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_( + "<!NOTATION name" + "<!NOTATION name PUBLIC \"pubid\">\r\n" + "<!NOTATION name PUBLIC \"pubid\" \"sysid\">\r\n" + "<!NOTATION name SYSTEM \"sysid\">\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + + VariantClear(&dest); + + ISAXDTDHandler_Release(dtd); + ISAXContentHandler_Release(content); ISAXLexicalHandler_Release(lexical); IVBSAXLexicalHandler_Release(vblexical);
-
Alexandre Julliard