July 2008 - Wine-Commits - list.winehq.org

Piotr Caban : msxml3: Skip the first XML declaration in file generated by domdoc_save.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 616fd8206253f00fdff692e2d359ccba645e2649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=616fd8206253f00fdff692e2d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:57:35 2008 +0200 msxml3: Skip the first XML declaration in file generated by domdoc_save. This is the last patch needed for Photoshop CS3 installer. --- dlls/msxml3/domdoc.c | 20 ++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 2 -- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2b6b768..a2d7243 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1690,7 +1690,7 @@ static HRESULT WINAPI domdoc_save( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); HANDLE handle; - xmlChar *mem; + xmlChar *mem, *p; int size; HRESULT ret = S_OK; DWORD written; @@ -1738,7 +1738,23 @@ static HRESULT WINAPI domdoc_save( } xmlDocDumpMemory(get_doc(This), &mem, &size); - if(!WriteFile(handle, mem, (DWORD)size, &written, NULL) || written != (DWORD)size) + + /* + * libxml2 always adds XML declaration on top of the file and one for each processing instruction node in DOM tree. + * MSXML adds XML declaration only for processing instruction nodes. + * We skip the first XML declaration generated by libxml2 to get exactly what we need. + */ + p = mem; + if(size > 2 && p[0] == '<' && p[1] == '?') { + while(p < mem+size && (p[0] != '?' || p[1] != '>')) + p++; + p += 2; + while(p < mem+size && isspace(*p)) + p++; + size -= p-mem; + } + + if(!WriteFile(handle, p, (DWORD)size, &written, NULL) || written != (DWORD)size) { WARN("write error\n"); ret = S_FALSE; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 120ada5..08b8476 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3304,9 +3304,7 @@ static void test_DocumentSaveToFile(void) ReadFile(file, buffer, sizeof(buffer), &read, NULL); ok(read != 0, "could not read file\n"); - todo_wine { ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); - } DeleteFile("test.xml"); }

1 0

Piotr Caban : msxml3: Added test of files generated by IXMLDOMDocument_save .
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 82b2a83337c53f2bde270a2e04d8c2214d066829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b2a83337c53f2bde270a2e0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:57:16 2008 +0200 msxml3: Added test of files generated by IXMLDOMDocument_save. --- dlls/msxml3/tests/domdoc.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 997d31c..120ada5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3263,6 +3263,54 @@ static void test_DocumentSaveToDocument(void) IXMLDOMDocument_Release(doc); } +static void test_DocumentSaveToFile(void) +{ + IXMLDOMDocument *doc = NULL; + IXMLDOMElement *pRoot; + HANDLE file; + char buffer[100]; + DWORD read = 0; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + VARIANT vFile; + + V_VT(&vFile) = VT_BSTR; + V_BSTR(&vFile) = _bstr_("test.xml"); + + hr = IXMLDOMDocument_save(doc, vFile); + ok(hr == S_OK, "ret %08x\n", hr ); + } + } + + IXMLDOMElement_Release(pRoot); + IXMLDOMDocument_Release(doc); + + file = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); + if(file == INVALID_HANDLE_VALUE) + return; + + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read != 0, "could not read file\n"); + todo_wine { + ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); + } + + DeleteFile("test.xml"); +} + static void test_testTransforms(void) { IXMLDOMDocument *doc = NULL; @@ -3389,6 +3437,7 @@ START_TEST(domdoc) test_xmlTypes(); test_nodeTypeTests(); test_DocumentSaveToDocument(); + test_DocumentSaveToFile(); test_testTransforms(); test_Namespaces();

1 0

Piotr Caban : msxml3: Split DOMDocument_create.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 7f84185aa472a185675a6a166e99245bf43e4a64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f84185aa472a185675a6a166… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:55:47 2008 +0200 msxml3: Split DOMDocument_create. --- dlls/msxml3/domdoc.c | 39 +++++++++++++++++++++++---------------- dlls/msxml3/msxml_private.h | 2 ++ 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f48669b..2b6b768 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2200,13 +2200,10 @@ static const IObjectSafetyVtbl domdocObjectSafetyVtbl = { xmldoc_Safety_SetInterfaceSafetyOptions }; -HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document) { domdoc *doc; HRESULT hr; - xmlDocPtr xmldoc; - - TRACE("(%p,%p)\n", pUnkOuter, ppObj); doc = HeapAlloc( GetProcessHeap(), 0, sizeof (*doc) ); if( !doc ) @@ -2229,19 +2226,9 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->safeopt = 0; doc->bsc = NULL; - xmldoc = xmlNewDoc(NULL); - if(!xmldoc) - { - HeapFree(GetProcessHeap(), 0, doc); - return E_OUTOFMEMORY; - } - - xmldoc->_private = 0; - doc->node_unk = create_basic_node( (xmlNodePtr)xmldoc, (IUnknown*)&doc->lpVtbl ); if(!doc->node_unk) { - xmlFreeDoc(xmldoc); HeapFree(GetProcessHeap(), 0, doc); return E_FAIL; } @@ -2256,12 +2243,32 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) /* The ref on doc->node is actually looped back into this object, so release it */ IXMLDOMNode_Release(doc->node); - *ppObj = &doc->lpVtbl; + *document = (IXMLDOMDocument2*)&doc->lpVtbl; - TRACE("returning iface %p\n", *ppObj); + TRACE("returning iface %p\n", *document); return S_OK; } +HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + xmlDocPtr xmldoc; + HRESULT hr; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + xmldoc = xmlNewDoc(NULL); + if(!xmldoc) + return E_OUTOFMEMORY; + + xmldoc->_private = 0; + + hr = DOMDocument_create_from_xmldoc(xmldoc, (IXMLDOMDocument2**)ppObj); + if(FAILED(hr)) + xmlFreeDoc(xmldoc); + + return hr; +} + #else HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index f6932d1..f0c6093 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -91,6 +91,8 @@ extern HRESULT SchemaCache_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj ); +extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document); + /* typelibs */ enum tid_t { IXMLDOMAttribute_tid,

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_ownerDocument.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 800463c21b85b6dfb13e085ff8e6b978f6ceeaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=800463c21b85b6dfb13e085ff… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:56:28 2008 +0200 msxml3: Implemented xmlnode_get_ownerDocument. --- dlls/msxml3/node.c | 7 +++++-- dlls/msxml3/tests/domdoc.c | 6 ++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d4703dd..bdc9ac9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -701,8 +701,11 @@ static HRESULT WINAPI xmlnode_get_ownerDocument( IXMLDOMNode *iface, IXMLDOMDocument** DOMDocument) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + + TRACE("%p (%p)\n", This, DOMDocument); + + return DOMDocument_create_from_xmldoc(This->node->doc, (IXMLDOMDocument2**)DOMDocument); } static HRESULT WINAPI xmlnode_cloneNode( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3c1669e..997d31c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -898,9 +898,7 @@ static void test_domnode( void ) { owner = NULL; r = IXMLDOMNode_get_ownerDocument( element, &owner ); - todo_wine { ok( r == S_OK, "get_ownerDocument return code\n"); - } ok( owner != doc, "get_ownerDocument return\n"); type = NODE_INVALID; @@ -1260,7 +1258,7 @@ todo_wine if (element) IXMLDOMElement_Release( element ); if (doc) - IXMLDOMDocument_Release( doc ); + ok(IXMLDOMDocument_Release( doc ) == 0, "document is not destroyed\n"); } static void test_refs(void) @@ -1608,7 +1606,7 @@ static void test_get_text(void) r = IXMLDOMDocument_getElementsByTagName( doc, str, &node_list ); ok( r == S_OK, "ret %08x\n", r ); SysFreeString(str); - + r = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); ok( r == E_INVALIDARG, "ret %08x\n", r );

1 0

Piotr Caban : msxml3: Use OnDataAvailable for reading stream.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: d8b22b9fb58406ec4eda6cb9eed8cdfc6f153cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b22b9fb58406ec4eda6cb9e… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:55:10 2008 +0200 msxml3: Use OnDataAvailable for reading stream. --- dlls/msxml3/domdoc.c | 132 +++++++++++++++++++++++++++---------------------- 1 files changed, 73 insertions(+), 59 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 9327330..fca096c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -86,6 +86,7 @@ struct bsc_t { domdoc *doc; IBinding *binding; + IStream *memstream; }; static inline bsc_t *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) @@ -93,6 +94,20 @@ static inline bsc_t *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) return (bsc_t *)((char*)iface - FIELD_OFFSET(bsc_t, lpVtbl)); } +static xmlDocPtr doparse( char *ptr, int len ) +{ +#ifdef HAVE_XMLREADMEMORY + /* + * use xmlReadMemory if possible so we can suppress + * writing errors to stderr + */ + return xmlReadMemory( ptr, len, NULL, NULL, + XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); +#else + return xmlParseMemory( ptr, len ); +#endif +} + static HRESULT WINAPI bsc_QueryInterface( IBindStatusCallback *iface, REFIID riid, @@ -134,6 +149,8 @@ static ULONG WINAPI bsc_Release( IBinding_Release(This->binding); if(This->doc && This->doc->bsc == This) This->doc->bsc = NULL; + if(This->memstream) + IStream_Release(This->memstream); HeapFree(GetProcessHeap(), 0, This); } @@ -146,12 +163,17 @@ static HRESULT WINAPI bsc_OnStartBinding( IBinding* pib) { bsc_t *This = impl_from_IBindStatusCallback(iface); + HRESULT hr; TRACE("(%p)->(%x %p)\n", This, dwReserved, pib); This->binding = pib; IBindStatusCallback_AddRef(pib); + hr = CreateStreamOnHGlobal(NULL, TRUE, &This->memstream); + if(FAILED(hr)) + return hr; + return S_OK; } @@ -185,6 +207,7 @@ static HRESULT WINAPI bsc_OnStopBinding( LPCWSTR szError) { bsc_t *This = impl_from_IBindStatusCallback(iface); + HRESULT hr; TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); @@ -193,6 +216,25 @@ static HRESULT WINAPI bsc_OnStopBinding( This->binding = NULL; } + if(This->doc && SUCCEEDED(hresult)) { + HGLOBAL hglobal; + hr = GetHGlobalFromStream(This->memstream, &hglobal); + if(SUCCEEDED(hr)) + { + DWORD len = GlobalSize(hglobal); + char *ptr = GlobalLock(hglobal); + xmlDocPtr xmldoc; + if(len != 0) { + xmldoc = doparse( ptr, len ); + if(xmldoc) { + xmldoc->_private = 0; + attach_xmlnode(This->doc->node, (xmlNodePtr) xmldoc); + } + } + GlobalUnlock(hglobal); + } + } + return S_OK; } @@ -213,6 +255,22 @@ static HRESULT WINAPI bsc_OnDataAvailable( FORMATETC* pformatetc, STGMEDIUM* pstgmed) { + bsc_t *This = impl_from_IBindStatusCallback(iface); + BYTE buf[4096]; + DWORD read, written; + HRESULT hr; + + TRACE("(%p)->(%x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + + do + { + hr = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &read); + if(FAILED(hr)) + break; + + hr = IStream_Write(This->memstream, buf, read, &written); + } while(SUCCEEDED(hr) && written != 0 && read != 0); + return S_OK; } @@ -1335,29 +1393,11 @@ static HRESULT WINAPI domdoc_nodeFromID( return E_NOTIMPL; } -static xmlDocPtr doparse( char *ptr, int len ) -{ -#ifdef HAVE_XMLREADMEMORY - /* - * use xmlReadMemory if possible so we can suppress - * writing errors to stderr - */ - return xmlReadMemory( ptr, len, NULL, NULL, - XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); -#else - return xmlParseMemory( ptr, len ); -#endif -} - -static xmlDocPtr doread( domdoc *This, LPWSTR filename ) +static HRESULT doread( domdoc *This, LPWSTR filename ) { - xmlDocPtr xmldoc = NULL; HRESULT hr; IBindCtx *pbc; - IStream *stream, *memstream; WCHAR url[INTERNET_MAX_URL_LENGTH]; - BYTE buf[4096]; - DWORD read, written; TRACE("%s\n", debugstr_w( filename )); @@ -1369,13 +1409,13 @@ static xmlDocPtr doread( domdoc *This, LPWSTR filename ) if(!PathSearchAndQualifyW(filename, fullpath, sizeof(fullpath)/sizeof(WCHAR))) { WARN("can't find path\n"); - return NULL; + return E_FAIL; } if(FAILED(UrlCreateFromPathW(fullpath, url, &needed, 0))) { ERR("can't create url from path\n"); - return NULL; + return E_FAIL; } filename = url; } @@ -1399,44 +1439,17 @@ static xmlDocPtr doread( domdoc *This, LPWSTR filename ) hr = CreateURLMoniker(NULL, filename, &moniker); if(SUCCEEDED(hr)) { + IStream *stream; hr = IMoniker_BindToStorage(moniker, pbc, NULL, &IID_IStream, (LPVOID*)&stream); IMoniker_Release(moniker); + if(stream) + IStream_Release(stream); } } IBindCtx_Release(pbc); } - if(FAILED(hr)) - return NULL; - hr = CreateStreamOnHGlobal(NULL, TRUE, &memstream); - if(FAILED(hr)) - { - IStream_Release(stream); - return NULL; - } - - do - { - IStream_Read(stream, buf, sizeof(buf), &read); - hr = IStream_Write(memstream, buf, read, &written); - } while(SUCCEEDED(hr) && written != 0 && read != 0); - - if(SUCCEEDED(hr)) - { - HGLOBAL hglobal; - hr = GetHGlobalFromStream(memstream, &hglobal); - if(SUCCEEDED(hr)) - { - DWORD len = GlobalSize(hglobal); - char *ptr = GlobalLock(hglobal); - if(len != 0) - xmldoc = doparse( ptr, len ); - GlobalUnlock(hglobal); - } - } - IStream_Release(memstream); - IStream_Release(stream); - return xmldoc; + return hr; } static HRESULT WINAPI domdoc_load( @@ -1446,10 +1459,10 @@ static HRESULT WINAPI domdoc_load( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); LPWSTR filename = NULL; - xmlDocPtr xmldoc = NULL; HRESULT hr = S_FALSE; IXMLDOMDocument2 *pNewDoc = NULL; IStream *pStream = NULL; + xmlDocPtr xmldoc; TRACE("type %d\n", V_VT(&xmlSource) ); @@ -1519,9 +1532,9 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { - xmldoc = doread( This, filename ); + hr = doread( This, filename ); - if ( !xmldoc ) + if ( FAILED(hr) ) This->error = E_FAIL; else { @@ -1530,11 +1543,12 @@ static HRESULT WINAPI domdoc_load( } } - if(!xmldoc) + if(!filename || FAILED(hr)) { xmldoc = xmlNewDoc(NULL); - - xmldoc->_private = 0; - attach_xmlnode(This->node, (xmlNodePtr) xmldoc); + xmldoc->_private = 0; + attach_xmlnode(This->node, (xmlNodePtr) xmldoc); + hr = S_FALSE; + } TRACE("ret (%d)\n", hr);

1 0

Piotr Caban : msxml3: Return better bindf in GetBindInfo.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 8221a65049dbe3fa5465d5e41875ea8613256dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8221a65049dbe3fa5465d5e41… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:55:20 2008 +0200 msxml3: Return better bindf in GetBindInfo. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index fca096c..f48669b 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -243,7 +243,7 @@ static HRESULT WINAPI bsc_GetBindInfo( DWORD* grfBINDF, BINDINFO* pbindinfo) { - *grfBINDF = BINDF_RESYNCHRONIZE; + *grfBINDF = BINDF_GETNEWESTVERSION|BINDF_PULLDATA|BINDF_RESYNCHRONIZE|BINDF_PRAGMA_NO_CACHE; return S_OK; }

1 0

Piotr Caban : msxml3: Store current bsc in domdoc.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: a08962d41cbb7dc1903ae56a9869deaf9da3d495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a08962d41cbb7dc1903ae56a9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:55:03 2008 +0200 msxml3: Store current bsc in domdoc. --- dlls/msxml3/domdoc.c | 95 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 57 insertions(+), 38 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c9734b7..9327330 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -49,13 +49,44 @@ static const WCHAR SZ_PROPERTY_SELECTION_LANGUAGE[] = {'S','e','l','e','c','t',' static const WCHAR SZ_VALUE_XPATH[] = {'X','P','a','t','h',0}; static const WCHAR SZ_VALUE_XSLPATTERN[] = {'X','S','L','P','a','t','t','e','r','n',0}; -typedef struct { +typedef struct bsc_t bsc_t; + +typedef struct _domdoc +{ + const struct IXMLDOMDocument2Vtbl *lpVtbl; + const struct IPersistStreamVtbl *lpvtblIPersistStream; + const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; + const struct IObjectSafetyVtbl *lpvtblIObjectSafety; + LONG ref; + VARIANT_BOOL async; + VARIANT_BOOL validating; + VARIANT_BOOL resolving; + VARIANT_BOOL preserving; + BOOL bUseXPath; + IUnknown *node_unk; + IXMLDOMNode *node; + IXMLDOMSchemaCollection *schema; + bsc_t *bsc; + HRESULT error; + + /* IPersistStream */ + IStream *stream; + + /* IObjectWithSite*/ + IUnknown *site; + + /* IObjectSafety */ + DWORD safeopt; +} domdoc; + +struct bsc_t { const struct IBindStatusCallbackVtbl *lpVtbl; LONG ref; + domdoc *doc; IBinding *binding; -} bsc_t; +}; static inline bsc_t *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) { @@ -101,6 +132,8 @@ static ULONG WINAPI bsc_Release( if(!ref) { if(This->binding) IBinding_Release(This->binding); + if(This->doc && This->doc->bsc == This) + This->doc->bsc = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -206,45 +239,18 @@ static const struct IBindStatusCallbackVtbl bsc_vtbl = bsc_OnObjectAvailable }; -static bsc_t *create_bsc(void) +static bsc_t *create_bsc(domdoc *doc) { bsc_t *bsc = HeapAlloc(GetProcessHeap(), 0, sizeof(bsc)); bsc->lpVtbl = &bsc_vtbl; bsc->ref = 1; + bsc->doc = doc; bsc->binding = NULL; return bsc; } -typedef struct _domdoc -{ - const struct IXMLDOMDocument2Vtbl *lpVtbl; - const struct IPersistStreamVtbl *lpvtblIPersistStream; - const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; - const struct IObjectSafetyVtbl *lpvtblIObjectSafety; - LONG ref; - VARIANT_BOOL async; - VARIANT_BOOL validating; - VARIANT_BOOL resolving; - VARIANT_BOOL preserving; - BOOL bUseXPath; - IUnknown *node_unk; - IXMLDOMNode *node; - IXMLDOMSchemaCollection *schema; - HRESULT error; - - /* IPersistStream */ - IStream *stream; - - /* IObjectWithSite*/ - IUnknown *site; - - /* IObjectSafety */ - DWORD safeopt; - -} domdoc; - LONG xmldoc_add_ref(xmlDocPtr doc) { LONG ref = InterlockedIncrement((LONG*)&doc->_private); @@ -481,6 +487,13 @@ static ULONG WINAPI domdoc_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { + if(This->bsc) { + if(This->bsc->binding) + IBinding_Abort(This->bsc->binding); + This->bsc->doc = NULL; + IBindStatusCallback_Release((IBindStatusCallback*)&This->bsc->lpVtbl); + } + if (This->site) IUnknown_Release( This->site ); IUnknown_Release( This->node_unk ); @@ -1336,7 +1349,7 @@ static xmlDocPtr doparse( char *ptr, int len ) #endif } -static xmlDocPtr doread( LPWSTR filename ) +static xmlDocPtr doread( domdoc *This, LPWSTR filename ) { xmlDocPtr xmldoc = NULL; HRESULT hr; @@ -1345,7 +1358,6 @@ static xmlDocPtr doread( LPWSTR filename ) WCHAR url[INTERNET_MAX_URL_LENGTH]; BYTE buf[4096]; DWORD read, written; - bsc_t *bsc; TRACE("%s\n", debugstr_w( filename )); @@ -1368,12 +1380,19 @@ static xmlDocPtr doread( LPWSTR filename ) filename = url; } - bsc = create_bsc(); - hr = CreateBindCtx(0, &pbc); if(SUCCEEDED(hr)) { - hr = RegisterBindStatusCallback(pbc, (IBindStatusCallback*)&bsc->lpVtbl, NULL, 0); + if(This->bsc) { + if(This->bsc->binding) + IBinding_Abort(This->bsc->binding); + This->bsc->doc = NULL; + IBindStatusCallback_Release((IBindStatusCallback*)&This->bsc->lpVtbl); + } + + This->bsc = create_bsc(This); + + hr = RegisterBindStatusCallback(pbc, (IBindStatusCallback*)&This->bsc->lpVtbl, NULL, 0); if(SUCCEEDED(hr)) { IMoniker *moniker; @@ -1415,7 +1434,6 @@ static xmlDocPtr doread( LPWSTR filename ) GlobalUnlock(hglobal); } } - IBindStatusCallback_Release((IBindStatusCallback*)&bsc->lpVtbl); IStream_Release(memstream); IStream_Release(stream); return xmldoc; @@ -1501,7 +1519,7 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { - xmldoc = doread( filename ); + xmldoc = doread( This, filename ); if ( !xmldoc ) This->error = E_FAIL; @@ -2195,6 +2213,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->stream = NULL; doc->site = NULL; doc->safeopt = 0; + doc->bsc = NULL; xmldoc = xmlNewDoc(NULL); if(!xmldoc)

1 0

Piotr Caban : msxml3: Store IBinding in bsc.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 56e231a4e55e478e08537822eb1c4d51a7dd26fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e231a4e55e478e08537822e… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:54:51 2008 +0200 msxml3: Store IBinding in bsc. --- dlls/msxml3/domdoc.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 20f5ecb..c9734b7 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -53,6 +53,8 @@ typedef struct { const struct IBindStatusCallbackVtbl *lpVtbl; LONG ref; + + IBinding *binding; } bsc_t; static inline bsc_t *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) @@ -96,8 +98,11 @@ static ULONG WINAPI bsc_Release( TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + if(This->binding) + IBinding_Release(This->binding); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -107,6 +112,13 @@ static HRESULT WINAPI bsc_OnStartBinding( DWORD dwReserved, IBinding* pib) { + bsc_t *This = impl_from_IBindStatusCallback(iface); + + TRACE("(%p)->(%x %p)\n", This, dwReserved, pib); + + This->binding = pib; + IBindStatusCallback_AddRef(pib); + return S_OK; } @@ -139,6 +151,15 @@ static HRESULT WINAPI bsc_OnStopBinding( HRESULT hresult, LPCWSTR szError) { + bsc_t *This = impl_from_IBindStatusCallback(iface); + + TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); + + if(This->binding) { + IBinding_Release(This->binding); + This->binding = NULL; + } + return S_OK; } @@ -191,6 +212,7 @@ static bsc_t *create_bsc(void) bsc->lpVtbl = &bsc_vtbl; bsc->ref = 1; + bsc->binding = NULL; return bsc; }

1 0

Piotr Caban : msxml3: Make bsc heap based object.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 0f76b41809f08d0bb8fc519c6096221fdc00dfe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f76b41809f08d0bb8fc519c6… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:54:42 2008 +0200 msxml3: Make bsc heap based object. --- dlls/msxml3/domdoc.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index ec4b446..20f5ecb 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -51,7 +51,14 @@ static const WCHAR SZ_VALUE_XSLPATTERN[] = {'X','S','L','P','a','t','t','e','r', typedef struct { const struct IBindStatusCallbackVtbl *lpVtbl; -} bsc; + + LONG ref; +} bsc_t; + +static inline bsc_t *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) +{ + return (bsc_t *)((char*)iface - FIELD_OFFSET(bsc_t, lpVtbl)); +} static HRESULT WINAPI bsc_QueryInterface( IBindStatusCallback *iface, @@ -73,13 +80,26 @@ static HRESULT WINAPI bsc_QueryInterface( static ULONG WINAPI bsc_AddRef( IBindStatusCallback *iface ) { - return 2; + bsc_t *This = impl_from_IBindStatusCallback(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI bsc_Release( IBindStatusCallback *iface ) { - return 1; + bsc_t *This = impl_from_IBindStatusCallback(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; } static HRESULT WINAPI bsc_OnStartBinding( @@ -165,7 +185,15 @@ static const struct IBindStatusCallbackVtbl bsc_vtbl = bsc_OnObjectAvailable }; -static bsc domdoc_bsc = { &bsc_vtbl }; +static bsc_t *create_bsc(void) +{ + bsc_t *bsc = HeapAlloc(GetProcessHeap(), 0, sizeof(bsc)); + + bsc->lpVtbl = &bsc_vtbl; + bsc->ref = 1; + + return bsc; +} typedef struct _domdoc { @@ -1295,6 +1323,7 @@ static xmlDocPtr doread( LPWSTR filename ) WCHAR url[INTERNET_MAX_URL_LENGTH]; BYTE buf[4096]; DWORD read, written; + bsc_t *bsc; TRACE("%s\n", debugstr_w( filename )); @@ -1317,10 +1346,12 @@ static xmlDocPtr doread( LPWSTR filename ) filename = url; } + bsc = create_bsc(); + hr = CreateBindCtx(0, &pbc); if(SUCCEEDED(hr)) { - hr = RegisterBindStatusCallback(pbc, (IBindStatusCallback*)&domdoc_bsc.lpVtbl, NULL, 0); + hr = RegisterBindStatusCallback(pbc, (IBindStatusCallback*)&bsc->lpVtbl, NULL, 0); if(SUCCEEDED(hr)) { IMoniker *moniker; @@ -1362,6 +1393,7 @@ static xmlDocPtr doread( LPWSTR filename ) GlobalUnlock(hglobal); } } + IBindStatusCallback_Release((IBindStatusCallback*)&bsc->lpVtbl); IStream_Release(memstream); IStream_Release(stream); return xmldoc;

1 0

Piotr Caban : msxml3: Implemented domdoc_put_documentElement.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 223df167cb55be0923379c85b15061dc7b7a4ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223df167cb55be0923379c85b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:54:16 2008 +0200 msxml3: Implemented domdoc_put_documentElement. --- dlls/msxml3/domdoc.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 07166ca..ec4b446 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -914,12 +914,26 @@ static HRESULT WINAPI domdoc_get_documentElement( } -static HRESULT WINAPI domdoc_documentElement( +static HRESULT WINAPI domdoc_put_documentElement( IXMLDOMDocument2 *iface, IXMLDOMElement* DOMElement ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + IXMLDOMNode *elementNode; + xmlnode *xmlNode; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, DOMElement); + + hr = IXMLDOMElement_QueryInterface( DOMElement, &IID_IXMLDOMNode, (void**)&elementNode ); + if(FAILED(hr)) + return hr; + + xmlNode = impl_from_IXMLDOMNode( elementNode ); + xmlDocSetRootElement( get_doc(This), xmlNode->node); + IXMLDOMNode_Release( elementNode ); + + return S_OK; } @@ -1931,7 +1945,7 @@ static const struct IXMLDOMDocument2Vtbl domdoc_vtbl = domdoc_get_doctype, domdoc_get_implementation, domdoc_get_documentElement, - domdoc_documentElement, + domdoc_put_documentElement, domdoc_createElement, domdoc_createDocumentFragment, domdoc_createTextNode,

1 0