March 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : msxml3: Respect stylesheet output mode when dumping resulting document.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 02af74400ff2b4762e589e5f3f4d14fe20a461c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02af74400ff2b4762e589e5f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 13 15:31:41 2014 +0400 msxml3: Respect stylesheet output mode when dumping resulting document. --- dlls/msxml3/main.c | 2 ++ dlls/msxml3/node.c | 31 +++++++++---------------------- dlls/msxml3/tests/domdoc.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 22 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 1381904..5967ac0 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -173,6 +173,7 @@ DECL_FUNCPTR(xsltFreeTransformContext); DECL_FUNCPTR(xsltNewTransformContext); DECL_FUNCPTR(xsltParseStylesheetDoc); DECL_FUNCPTR(xsltQuoteUserParams); +DECL_FUNCPTR(xsltSaveResultTo); # undef DECL_FUNCPTR #endif @@ -197,6 +198,7 @@ static void init_libxslt(void) LOAD_FUNCPTR(xsltNewTransformContext, 1); LOAD_FUNCPTR(xsltParseStylesheetDoc, 1); LOAD_FUNCPTR(xsltQuoteUserParams, 1); + LOAD_FUNCPTR(xsltSaveResultTo, 1); #undef LOAD_FUNCPTR if (pxsltInit) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index aee38e0..e3016a5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -67,6 +67,7 @@ MAKE_FUNCPTR(xsltFreeTransformContext); MAKE_FUNCPTR(xsltNewTransformContext); MAKE_FUNCPTR(xsltParseStylesheetDoc); MAKE_FUNCPTR(xsltQuoteUserParams); +MAKE_FUNCPTR(xsltSaveResultTo); # undef MAKE_FUNCPTR #endif @@ -1058,30 +1059,16 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, { const xmlChar *content; - if(result->type == XML_HTML_DOCUMENT_NODE) + xmlOutputBufferPtr output = xmlAllocOutputBuffer(NULL); + if (output) { - xmlOutputBufferPtr output = xmlAllocOutputBuffer(NULL); - if (output) - { + if(result->type == XML_HTML_DOCUMENT_NODE) htmldoc_dumpcontent(output, result->doc); - content = get_output_buffer_content(output); - *p = bstr_from_xmlChar(content); - xmlOutputBufferClose(output); - } - } - else - { - xmlBufferPtr buf = xmlBufferCreate(); - if (buf) - { - int size = xmlNodeDump(buf, NULL, (xmlNodePtr)result, 0, 0); - if(size > 0) - { - content = xmlBufferContent(buf); - *p = bstr_from_xmlChar(content); - } - xmlBufferFree(buf); - } + else + pxsltSaveResultTo(output, result->doc, xsltSS); + content = get_output_buffer_content(output); + *p = bstr_from_xmlChar(content); + xmlOutputBufferClose(output); } xmlFreeDoc(result); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b5e7441..79805cc 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11659,6 +11659,32 @@ static const char xsltext_xsl[] = "</xsl:template>" "</xsl:stylesheet>"; +static const char omitxmldecl_xsl[] = +"<?xml version=\"1.0\"?>" +"<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >" +"<xsl:output method=\"xml\" omit-xml-declaration=\"yes\"/>" +"<xsl:template match=\"/\">" +" <xsl:for-each select=\"/a/item\">" +" <xsl:element name=\"node\">" +" <xsl:value-of select=\"@name\"/>" +" </xsl:element>" +" </xsl:for-each>" +"</xsl:template>" +"</xsl:stylesheet>"; + +static const char omitxmldecl_doc[] = +"<?xml version=\"1.0\"?>" +"<a>" +" <item name=\"item1\"/>" +" <item name=\"item2\"/>" +"</a>"; + +static const char omitxmldecl_result[] = +"<node>item1</node><node>item2</node>"; + +static const char omitxmldecl_result2[] = +"<node>item1</node><node>item2</node>\n"; + static void test_xsltext(void) { IXMLDOMDocument *doc, *doc2; @@ -11680,6 +11706,19 @@ static void test_xsltext(void) ok(!lstrcmpW(ret, _bstr_("testdata")), "transform result %s\n", wine_dbgstr_w(ret)); SysFreeString(ret); + /* omit-xml-declaration */ + hr = IXMLDOMDocument_loadXML(doc, _bstr_(omitxmldecl_xsl), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_loadXML(doc2, _bstr_(omitxmldecl_doc), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_transformNode(doc2, (IXMLDOMNode*)doc, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + /* Old enough libxslt places extra '\n' at the end of the output. */ + ok(!lstrcmpW(ret, _bstr_(omitxmldecl_result)) || + !lstrcmpW(ret, _bstr_(omitxmldecl_result2)), "transform result %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + IXMLDOMDocument_Release(doc2); IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Matteo Bruni : d3dx9: Fix a WARN.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: db4bf1e1d47bdb42349f766d7ca492bfa20aaee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4bf1e1d47bdb42349f766d7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:06 2014 +0100 d3dx9: Fix a WARN. --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 13f4524..260dfa5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5340,7 +5340,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s (ID3DInclude *)include, flags, (ID3DBlob **)compilation_errors, pool); if (FAILED(hr)) { - WARN("Failed to initialize shader reflection\n"); + WARN("Failed to create effect object.\n"); HeapFree(GetProcessHeap(), 0, object); return hr; }

1 0

Henri Verbeet : d3d8/tests: Move some stateblock tests to device.c.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 8db0401f60687d7d67c1bc254a25e535d3da7f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db0401f60687d7d67c1bc254… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 13 12:51:17 2014 +0100 d3d8/tests: Move some stateblock tests to device.c. --- dlls/d3d8/tests/device.c | 210 ++++++++++++++++++++++++++++++++ dlls/d3d8/tests/stateblock.c | 270 ++++++------------------------------------ 2 files changed, 249 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8db0401f60687d7d67c1b…

1 0

Henri Verbeet : wined3d: Only use a single allocation for each struct private_data.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 64dd435e2ae491f1e6b9174ceda486e9743a46de URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dd435e2ae491f1e6b9174ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 13 12:51:15 2014 +0100 wined3d: Only use a single allocation for each struct private_data. --- dlls/wined3d/resource.c | 50 +++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8813af7..6c3fd7a 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -33,14 +33,12 @@ struct private_data GUID tag; DWORD flags; /* DDSPD_* */ - + DWORD size; union { - void *data; + BYTE data[1]; IUnknown *object; } ptr; - - DWORD size; }; static DWORD resource_access_from_pool(enum wined3d_pool pool) @@ -207,40 +205,32 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc const void *data, DWORD data_size, DWORD flags) { struct private_data *d; + const void *ptr = data; TRACE("resource %p, riid %s, data %p, data_size %u, flags %#x.\n", resource, debugstr_guid(guid), data, data_size, flags); - if (flags & WINED3DSPD_IUNKNOWN && data_size != sizeof(IUnknown *)) + if (flags & WINED3DSPD_IUNKNOWN) { - WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); - return WINED3DERR_INVALIDCALL; + if (data_size != sizeof(IUnknown *)) + { + WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); + return WINED3DERR_INVALIDCALL; + } + ptr = &data; } - d = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d)); - if (!d) return E_OUTOFMEMORY; + if (!(d = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(struct private_data, ptr.data[data_size])))) + return E_OUTOFMEMORY; + wined3d_resource_free_private_data(resource, guid); d->tag = *guid; d->flags = flags; + d->size = data_size; + memcpy(d->ptr.data, ptr, data_size); if (flags & WINED3DSPD_IUNKNOWN) - { - d->ptr.object = (IUnknown *)data; - d->size = sizeof(IUnknown *); IUnknown_AddRef(d->ptr.object); - } - else - { - d->ptr.data = HeapAlloc(GetProcessHeap(), 0, data_size); - if (!d->ptr.data) - { - HeapFree(GetProcessHeap(), 0, d); - return E_OUTOFMEMORY; - } - d->size = data_size; - memcpy(d->ptr.data, data, data_size); - } - wined3d_resource_free_private_data(resource, guid); list_add_tail(&resource->privateData, &d->entry); return WINED3D_OK; @@ -294,16 +284,8 @@ HRESULT CDECL wined3d_resource_free_private_data(struct wined3d_resource *resour if (!data) return WINED3DERR_NOTFOUND; if (data->flags & WINED3DSPD_IUNKNOWN) - { - if (data->ptr.object) - IUnknown_Release(data->ptr.object); - } - else - { - HeapFree(GetProcessHeap(), 0, data->ptr.data); - } + IUnknown_Release(data->ptr.object); list_remove(&data->entry); - HeapFree(GetProcessHeap(), 0, data); return WINED3D_OK;

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::vAlign property implementation.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 3679619909f9ce04d5deb8f4046e7dba80261972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3679619909f9ce04d5deb8f40… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Mar 13 16:27:32 2014 +0800 mshtml: Added IHTMLTableRow::vAlign property implementation. --- dlls/mshtml/htmltablerow.c | 29 +++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index ef01763..832cb6c 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -135,15 +135,36 @@ static HRESULT WINAPI HTMLTableRow_get_align(IHTMLTableRow *iface, BSTR *p) static HRESULT WINAPI HTMLTableRow_put_vAlign(IHTMLTableRow *iface, BSTR v) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&val, v); + + nsres = nsIDOMHTMLTableRowElement_SetVAlign(This->nsrow, &val); + nsAString_Finish(&val); + + if (NS_FAILED(nsres)){ + ERR("Set VAlign(%s) failed!\n", debugstr_w(v)); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTableRow_get_vAlign(IHTMLTableRow *iface, BSTR *p) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&val, NULL); + nsres = nsIDOMHTMLTableRowElement_GetVAlign(This->nsrow, &val); + + return return_nsstr(nsres, &val, p); } static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b485203..013a2a9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5605,6 +5605,18 @@ static void test_tr_elem(IHTMLElement *elem) ok(!strcmp_wa(bstr, "left"), "get_align returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + bstr = a2bstr("top"); + hres = IHTMLTableRow_put_vAlign(row, bstr); + ok(hres == S_OK, "set_valign failed: %08x\n", hres); + SysFreeString(bstr); + + bstr = NULL; + hres = IHTMLTableRow_get_vAlign(row, &bstr); + ok(hres == S_OK, "get_valign failed: %08x\n", hres); + ok(bstr != NULL, "get_valign returned NULL\n"); + ok(!strcmp_wa(bstr, "top"), "get_valign returned %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + IHTMLTableRow_Release(row); }

1 0

Michael Stefaniuc : dmloader: Pass the object to the IDirectMusicContainer_Release helper.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: c600be1ff50cdcb1fbdf4757dac3a710a694ee8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c600be1ff50cdcb1fbdf4757d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 23:07:09 2014 +0100 dmloader: Pass the object to the IDirectMusicContainer_Release helper. --- dlls/dmloader/container.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 871c8b0..f53a074 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -36,8 +36,8 @@ static ULONG WINAPI IDirectMusicContainerImpl_IPersistStream_AddRef (LPPERSISTST */ /* IUnknown/IDirectMusicContainer part: */ -static HRESULT DMUSIC_DestroyDirectMusicContainerImpl (LPDIRECTMUSICCONTAINER iface) { - ICOM_THIS_MULTI(IDirectMusicContainerImpl, ContainerVtbl, iface); +static HRESULT destroy_dmcontainer(IDirectMusicContainerImpl *This) +{ LPDIRECTMUSICLOADER pLoader; LPDIRECTMUSICGETLOADER pGetLoader; struct list *pEntry; @@ -108,7 +108,7 @@ static ULONG WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_Release (LPD DWORD dwRef = InterlockedDecrement (&This->dwRef); TRACE("(%p): ReleaseRef to %d\n", This, dwRef); if (dwRef == 0) { - DMUSIC_DestroyDirectMusicContainerImpl (iface); + destroy_dmcontainer(This); HeapFree(GetProcessHeap(), 0, This); }

1 0

Michael Stefaniuc : dmloader/tests: Centralize the skip().
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 82f771e34768b4914bb5cbaeec7cde28be15689e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f771e34768b4914bb5cbaee… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 23:00:53 2014 +0100 dmloader/tests: Centralize the skip(). --- dlls/dmloader/tests/loader.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 8759033..3d8dd80 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -27,17 +27,26 @@ static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* he "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ "data\x00\x01\x00\x00"; /* 256 byte data segment (silence) */ +static BOOL missing_dmloader(void) +{ + IDirectMusicLoader *dml; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicLoader, (void**)&dml); + + if (hr == S_OK && dml) + { + IDirectMusicLoader_Release(dml); + return FALSE; + } + return TRUE; +} + static void test_release_object(void) { HRESULT hr; IDirectMusicLoader8* loader = NULL; hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); - if ( FAILED(hr) ) - { - skip("CoCreateInstance failed.\n"); - return; - } hr = IDirectMusicLoader_ReleaseObject(loader, NULL); ok(hr == E_POINTER, "Expected E_POINTER, received %#x\n", hr); @@ -128,6 +137,13 @@ static void test_simple_playing(void) START_TEST(loader) { CoInitialize(NULL); + + if (missing_dmloader()) + { + skip("dmloader not available\n"); + CoUninitialize(); + return; + } test_release_object(); test_simple_playing(); CoUninitialize();

1 0

Michael Stefaniuc : dmloader: Don' t crash on container destruction if it was never loaded.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: e1676fc989471fd551f4e0654eefad783440ea1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1676fc989471fd551f4e0654… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 23:10:12 2014 +0100 dmloader: Don't crash on container destruction if it was never loaded. --- dlls/dmloader/container.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index f53a074..4fb5f97 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -68,7 +68,6 @@ static HRESULT destroy_dmcontainer(IDirectMusicContainerImpl *This) IStream_Release (This->pStream); /* FIXME: release allocated entries */ - unlock_module(); return S_OK; } @@ -108,8 +107,10 @@ static ULONG WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_Release (LPD DWORD dwRef = InterlockedDecrement (&This->dwRef); TRACE("(%p): ReleaseRef to %d\n", This, dwRef); if (dwRef == 0) { - destroy_dmcontainer(This); + if (This->pStream) + destroy_dmcontainer(This); HeapFree(GetProcessHeap(), 0, This); + unlock_module(); } return dwRef;

1 0

Henri Verbeet : d3d9/tests: Move some stateblock tests to device.c.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 6f1b494a9074e1f9bfb41ecf410f7cac7d82579e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1b494a9074e1f9bfb41ecf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 13 12:51:16 2014 +0100 d3d9/tests: Move some stateblock tests to device.c. --- dlls/d3d9/tests/device.c | 400 ++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/stateblock.c | 432 ++++-------------------------------------- 2 files changed, 436 insertions(+), 396 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f1b494a9074e1f9bfb41…

1 0

Jacek Caban : mshtml: Merge htmldoc3.c into htmldoc.c.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: f2676d3729c3e5ac197073431148fa13552e6735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2676d3729c3e5ac197073431… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 13 14:12:50 2014 +0100 mshtml: Merge htmldoc3.c into htmldoc.c. --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmldoc.c | 1254 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmldoc3.c | 1294 ------------------------------------------ dlls/mshtml/mshtml_private.h | 2 - 4 files changed, 1253 insertions(+), 1298 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2676d3729c3e5ac19707…

1 0