wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Jacek Caban : mshtml: Introduce a new debugstr_mshtml_guid helper for printing GUIDs.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: a36876e9d6e13abaf00f7230a973a35f346002a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36876e9d6e13abaf00f7230a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 11:06:08 2014 +0200 mshtml: Introduce a new debugstr_mshtml_guid helper for printing GUIDs. --- dlls/mshtml/htmldoc.c | 135 +++++++++++++++--------------------------- dlls/mshtml/main.c | 48 +++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 98 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a36876e9d6e13abaf00f7…

1 0

Austin English : msxml3: Complain louder if libxslt was missing at compile time.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 980e9225d20ade10cd85c3edea518d78d021dd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=980e9225d20ade10cd85c3ede… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 25 17:37:08 2014 -0700 msxml3: Complain louder if libxslt was missing at compile time. --- dlls/msxml3/node.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b49f46c..47d3159 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -71,6 +71,8 @@ MAKE_FUNCPTR(xsltParseStylesheetDoc); MAKE_FUNCPTR(xsltQuoteUserParams); MAKE_FUNCPTR(xsltSaveResultTo); # undef MAKE_FUNCPTR +#else +WINE_DECLARE_DEBUG_CHANNEL(winediag); #endif static const IID IID_xmlnode = {0x4f2f4ba2,0xb822,0x11df,{0x8b,0x8a,0x68,0x50,0xdf,0xd7,0x20,0x85}}; @@ -1308,7 +1310,8 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, return hr; #else - FIXME("libxslt headers were not found at compile time\n"); + ERR_(winediag)("libxslt headers were not found at compile time. Expect problems.\n"); + return E_NOTIMPL; #endif }

1 0

Nikolay Sivov : oleaut32: Always free TLIBATTR in LoadRegTypeLib() ( Valgrind).
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 0c0fe4efb404f26eb29fc29c287a5273c38147b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0fe4efb404f26eb29fc29c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 26 00:37:15 2014 +0400 oleaut32: Always free TLIBATTR in LoadRegTypeLib() (Valgrind). --- dlls/oleaut32/typelib.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4213ae6..4a16fca 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -542,12 +542,17 @@ HRESULT WINAPI LoadRegTypeLib( TLIBATTR *attr; res = ITypeLib_GetLibAttr(*ppTLib, &attr); - if (res == S_OK && (attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor)) + if (res == S_OK) { + BOOL mismatch = attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor; ITypeLib_ReleaseTLibAttr(*ppTLib, attr); - ITypeLib_Release(*ppTLib); - *ppTLib = NULL; - res = TYPE_E_LIBNOTREGISTERED; + + if (mismatch) + { + ITypeLib_Release(*ppTLib); + *ppTLib = NULL; + res = TYPE_E_LIBNOTREGISTERED; + } } } }

1 0

Nikolay Sivov : msxml3/tests: Fixed attributes map leak (Valgrind).
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 3b16986a355c04c6aacc8b5a63a2499bb4c0176c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b16986a355c04c6aacc8b5a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 26 00:36:56 2014 +0400 msxml3/tests: Fixed attributes map leak (Valgrind). --- dlls/msxml3/tests/domdoc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d064d10..7a2f984 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10522,6 +10522,7 @@ todo_wine EXPECT_HR(hr, S_OK); ok(did == DISPID_DOM_COLLECTION_BASE, "got 0x%08x\n", did); IDispatchEx_Release(dispex); + IXMLDOMNamedNodeMap_Release(map); hr = IXMLDOMDocument_selectNodes(doc, _bstr_("root/b"), &node_list); EXPECT_HR(hr, S_OK); @@ -10543,7 +10544,7 @@ todo_wine hr = IDispatchEx_GetDispID(dispex, _bstr_("1"), 0, &did); EXPECT_HR(hr, S_OK); ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did); - IDispatchEx_Release(dispex); + IXMLDOMNamedNodeMap_Release(map); did = -1; hr = IDispatchEx_GetDispID(dispex, _bstr_("item"), 0, &did); @@ -10636,7 +10637,7 @@ todo_wine ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); - IXMLDOMNamedNodeMap_Release(map); + IDispatchEx_Release(dispex); IXMLDOMElement_Release(elem); /* IXMLDOMImplementation */

1 0

Nikolay Sivov : msxml3: Fix XPath query result leak (Valgrind).
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 98a9fbe79f72180f3095f8db4677e89946caa178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a9fbe79f72180f3095f8db4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 26 00:36:41 2014 +0400 msxml3: Fix XPath query result leak (Valgrind). --- dlls/msxml3/schema.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 8776de8..a4aa083 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1058,8 +1058,6 @@ HRESULT cache_from_doc_ns(IXMLDOMSchemaCollection2 *iface, xmlnode *node) { int pos = 0, len = xmlXPathNodeSetGetLength(nodeset->nodesetval); - if (len == 0) return S_OK; - while (pos < len) { xmlNodePtr node = xmlXPathNodeSetItem(nodeset->nodesetval, pos);

1 0

Nikolay Sivov : msxml3: Fixed attribute value string leak (Valgrind).
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: f9df8845361163c21c4ab8f126cf38813e52c857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9df8845361163c21c4ab8f12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 26 00:36:24 2014 +0400 msxml3: Fixed attribute value string leak (Valgrind). --- dlls/msxml3/element.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5e8822e..4fe53a8 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1284,7 +1284,11 @@ static HRESULT WINAPI domelem_setAttribute( xmlFree(local); if (ns) - return xmlStrEqual(ns->href, xml_value) ? S_OK : E_INVALIDARG; + { + int cmp = xmlStrEqual(ns->href, xml_value); + heap_free(xml_value); + return cmp ? S_OK : E_INVALIDARG; + } } if (!xmlSetNsProp(element, NULL, xml_name, xml_value))

1 0

André Hentschel : Add WWN 368
by Jeremy Newman 27 Apr '14

27 Apr '14

Module: website Branch: master Commit: d2118b287a56764d380849a0e7a136297835562c URL: http://source.winehq.org/git/website.git/?a=commit;h=d2118b287a56764d380849… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 26 16:46:21 2014 +0200 Add WWN 368 --- news/de/2014042501.xml | 11 + news/en/2014042501.xml | 11 + wwn/en/wn20140425_368.xml | 715 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 737 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d2118b287a56764d38…

1 0

Stefan Dösinger : ddraw/tests: Add a test for mipmap palettes.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: e2bf5163ecf2f56f58993bac7f8ca1abc0db0324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2bf5163ecf2f56f58993bac7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 24 14:36:10 2014 +0200 ddraw/tests: Add a test for mipmap palettes. --- dlls/ddraw/tests/ddraw1.c | 98 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 102 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 98 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 122 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 420 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2bf5163ecf2f56f58993…

1 0

Stefan Dösinger : ddraw: Only ddraw7 disallows SetPalette on sublevels.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 590582e6bc1d7f901be9d559a0e9f501c08ece4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=590582e6bc1d7f901be9d559a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 24 14:36:09 2014 +0200 ddraw: Only ddraw7 disallows SetPalette on sublevels. --- dlls/ddraw/surface.c | 78 ++++++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 13458f6..b561af4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -447,6 +447,43 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) return IUnknown_AddRef(surface->texture_outer); } +static HRESULT WINAPI ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectDrawPalette *palette) +{ + struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(palette); + struct ddraw_palette *prev; + + TRACE("iface %p, palette %p.\n", surface, palette); + + if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) + return DDERR_INVALIDPIXELFORMAT; + + wined3d_mutex_lock(); + + prev = surface->palette; + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + if (prev) + prev->flags &= ~DDPCAPS_PRIMARYSURFACE; + if (palette_impl) + palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; + /* Update the wined3d frontbuffer if this is the primary. */ + if (surface->ddraw->wined3d_frontbuffer) + wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, + palette_impl ? palette_impl->wineD3DPalette : NULL); + } + if (palette_impl) + IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); + if (prev) + IDirectDrawPalette_Release(&prev->IDirectDrawPalette_iface); + surface->palette = palette_impl; + wined3d_surface_set_palette(surface->wined3d_surface, palette_impl ? palette_impl->wineD3DPalette : NULL); + + wined3d_mutex_unlock(); + + return DD_OK; +} + static void ddraw_surface_cleanup(struct ddraw_surface *surface) { struct ddraw_surface *surf; @@ -456,7 +493,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) /* The refcount test shows that the palette is detached when the surface * is destroyed. */ - IDirectDrawSurface7_SetPalette(&surface->IDirectDrawSurface7_iface, NULL); + ddraw_surface_set_palette(surface, NULL); /* Loop through all complex attached surfaces and destroy them. * @@ -4640,42 +4677,13 @@ static HRESULT WINAPI ddraw_surface1_SetColorKey(IDirectDrawSurface *iface, DWOR static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDirectDrawPalette *palette) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(palette); - struct ddraw_palette *prev; TRACE("iface %p, palette %p.\n", iface, palette); - if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) - return DDERR_INVALIDPIXELFORMAT; - if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) return DDERR_NOTONMIPMAPSUBLEVEL; - wined3d_mutex_lock(); - - prev = surface->palette; - if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - if (prev) - prev->flags &= ~DDPCAPS_PRIMARYSURFACE; - if (palette_impl) - palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; - /* Update the wined3d frontbuffer if this is the primary. */ - if (surface->ddraw->wined3d_frontbuffer) - wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, - palette_impl ? palette_impl->wineD3DPalette : NULL); - } - if (palette_impl) - IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); - if (prev) - IDirectDrawPalette_Release(&prev->IDirectDrawPalette_iface); - surface->palette = palette_impl; - wined3d_surface_set_palette(surface->wined3d_surface, palette_impl ? palette_impl->wineD3DPalette : NULL); - - wined3d_mutex_unlock(); - - return DD_OK; + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDirectDrawPalette *palette) @@ -4684,7 +4692,7 @@ static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDirectDrawPalette *palette) @@ -4693,7 +4701,7 @@ static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDirectDrawPalette *palette) @@ -4702,7 +4710,7 @@ static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDirectDrawPalette *palette) @@ -4711,7 +4719,7 @@ static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDire TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } /**********************************************************

1 0

Nikolay Sivov : msxml3/tests: Fix enumerator instance leak (Valgrind).
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 039712970bea2938e6b0e2b20861b453afee895b URL: http://source.winehq.org/git/wine.git/?a=commit;h=039712970bea2938e6b0e2b20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 25 16:54:14 2014 +0400 msxml3/tests: Fix enumerator instance leak (Valgrind). --- dlls/msxml3/tests/domdoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1a2ec5e..d064d10 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9415,6 +9415,7 @@ static void test_selection(void) IEnumVARIANT_Release(enum1); IEnumVARIANT_Release(enum2); + IEnumVARIANT_Release(enum3); enum1 = NULL; hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1);

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2014