Module: wine Branch: master Commit: 855ca45f295bcace966a603d354f6a9cb99ab596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855ca45f295bcace966a603d35...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Sat Feb 12 15:42:15 2011 +0300
msxml3: Add basic putref_stylesheet() implementation.
---
dlls/msxml3/stylesheet.c | 27 ++++++++++++++- dlls/msxml3/tests/domdoc.c | 75 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 97 insertions(+), 5 deletions(-)
diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 8455b30..446a97f 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -41,6 +41,8 @@ typedef struct _xsltemplate { IXSLTemplate IXSLTemplate_iface; LONG ref; + + IXMLDOMNode *node; } xsltemplate;
static inline xsltemplate *impl_from_IXSLTemplate( IXSLTemplate *iface ) @@ -48,6 +50,13 @@ static inline xsltemplate *impl_from_IXSLTemplate( IXSLTemplate *iface ) return CONTAINING_RECORD(iface, xsltemplate, IXSLTemplate_iface); }
+static void xsltemplate_set_node( xsltemplate *This, IXMLDOMNode *node ) +{ + if (This->node) IXMLDOMNode_Release(This->node); + This->node = node; + if (node) IXMLDOMNode_AddRef(node); +} + static HRESULT WINAPI xsltemplate_QueryInterface( IXSLTemplate *iface, REFIID riid, @@ -85,7 +94,10 @@ static ULONG WINAPI xsltemplate_Release( IXSLTemplate *iface )
ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) + { + if (This->node) IXMLDOMNode_Release( This->node ); heap_free( This ); + }
return ref; } @@ -166,8 +178,18 @@ static HRESULT WINAPI xsltemplate_putref_stylesheet( IXSLTemplate *iface, { xsltemplate *This = impl_from_IXSLTemplate( iface );
- FIXME("(%p)->(%p): stub\n", This, node); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, node); + + if (!node) + { + xsltemplate_set_node(This, NULL); + return S_OK; + } + + /* FIXME: test for document type */ + xsltemplate_set_node(This, node); + + return S_OK; }
static HRESULT WINAPI xsltemplate_get_stylesheet( IXSLTemplate *iface, @@ -217,6 +239,7 @@ HRESULT XSLTemplate_create(IUnknown *pUnkOuter, void **ppObj)
This->IXSLTemplate_iface.lpVtbl = &xsltemplate_vtbl; This->ref = 1; + This->node = NULL;
*ppObj = &This->IXSLTemplate_iface;
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 34cc322..c1b5bb4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -627,12 +627,10 @@ static void* _create_object(const GUID *clsid, const char *name, const IID *iid, #define _create(cls) cls, #cls
#define create_document(iid) _create_object(&_create(CLSID_DOMDocument), iid, __LINE__) - #define create_document_version(v, iid) _create_object(&_create(CLSID_DOMDocument ## v), iid, __LINE__) - #define create_cache(iid) _create_object(&_create(CLSID_XMLSchemaCache), iid, __LINE__) - #define create_cache_version(v, iid) _create_object(&_create(CLSID_XMLSchemaCache ## v), iid, __LINE__) +#define create_xsltemplate(iid) _create_object(&_create(CLSID_XSLTemplate), iid, __LINE__)
static BSTR alloc_str_from_narrow(const char *str) { @@ -7660,6 +7658,76 @@ static void test_get_xml(void) free_bstrs(); }
+static void test_xsltemplate(void) +{ + IXSLTemplate *template; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + HRESULT hr; + ULONG ref1, ref2; + + template = create_xsltemplate(&IID_IXSLTemplate); + if (!template) return; + + /* works as reset */ + hr = IXSLTemplate_putref_stylesheet(template, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + doc = create_document(&IID_IXMLDOMDocument); + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc, _bstr_("<a>test</a>"), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + /* putref with non-xsl document */ + hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc); + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc, _bstr_(szTransformSSXML), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + /* not a freethreaded document */ + hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc); + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + + IXMLDOMDocument_Release(doc); + + hr = CoCreateInstance(&CLSID_FreeThreadedDOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + if (hr != S_OK) + { + win_skip("failed to create free threaded document instance: 0x%08x\n", hr); + IXSLTemplate_Release(template); + return; + } + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc, _bstr_(szTransformSSXML), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + /* freethreaded document */ + ref1 = IXMLDOMDocument_AddRef(doc); + IXMLDOMDocument_Release(doc); + hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref2 = IXMLDOMDocument_AddRef(doc); + IXMLDOMDocument_Release(doc); + ok(ref2 > ref1, "got %d\n", ref2); + + /* drop reference */ + hr = IXSLTemplate_putref_stylesheet(template, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref2 = IXMLDOMDocument_AddRef(doc); + IXMLDOMDocument_Release(doc); + ok(ref2 == ref1, "got %d\n", ref2); + + IXMLDOMDocument_Release(doc); + IXSLTemplate_Release(template); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -7724,6 +7792,7 @@ START_TEST(domdoc) test_createProcessingInstruction(); test_put_nodeTypedValue(); test_get_xml(); + test_xsltemplate();
CoUninitialize(); }