wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Huw Davies : gdi32: Add a small rectangle buffer to reduce memory allocation.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: af5014f4c8332d1f717f11690d12bcd739004bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5014f4c8332d1f717f11690… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 18 11:32:27 2016 +0100 gdi32: Add a small rectangle buffer to reduce memory allocation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/region.c | 49 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b476864..cbe66a8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -355,12 +355,14 @@ extern BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) DECLSPEC_HIDDEN; extern INT mirror_region( HRGN dst, HRGN src, INT width ) DECLSPEC_HIDDEN; extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y ) DECLSPEC_HIDDEN; +#define RGN_DEFAULT_RECTS 4 typedef struct { INT size; INT numRects; RECT *rects; RECT extents; + RECT rects_buf[RGN_DEFAULT_RECTS]; } WINEREGION; /* return the region data without making a copy */ diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index a5dc2ff..a4cf733 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -131,8 +131,17 @@ static BOOL grow_region( WINEREGION *rgn, int size ) if (size <= rgn->size) return TRUE; - new_rects = HeapReAlloc( GetProcessHeap(), 0, rgn->rects, size * sizeof(RECT) ); - if (!new_rects) return FALSE; + if (rgn->rects == rgn->rects_buf) + { + new_rects = HeapAlloc( GetProcessHeap(), 0, size * sizeof(RECT) ); + if (!new_rects) return FALSE; + memcpy( new_rects, rgn->rects, rgn->numRects * sizeof(RECT) ); + } + else + { + new_rects = HeapReAlloc( GetProcessHeap(), 0, rgn->rects, size * sizeof(RECT) ); + if (!new_rects) return FALSE; + } rgn->rects = new_rects; rgn->size = size; return TRUE; @@ -406,9 +415,6 @@ static BOOL REGION_SubtractRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2) static BOOL REGION_XorRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2); static BOOL REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn); -#define RGN_DEFAULT_RECTS 2 - - /*********************************************************************** * get_region_type */ @@ -445,7 +451,16 @@ static void REGION_DumpRegion(WINEREGION *pReg) */ static BOOL init_region( WINEREGION *pReg, INT n ) { - if (!(pReg->rects = HeapAlloc(GetProcessHeap(), 0, n * sizeof( RECT )))) return FALSE; + n = max( n, RGN_DEFAULT_RECTS ); + + if (n > RGN_DEFAULT_RECTS) + { + if (!(pReg->rects = HeapAlloc( GetProcessHeap(), 0, n * sizeof( RECT ) ))) + return FALSE; + } + else + pReg->rects = pReg->rects_buf; + pReg->size = n; empty_region(pReg); return TRUE; @@ -456,7 +471,8 @@ static BOOL init_region( WINEREGION *pReg, INT n ) */ static void destroy_region( WINEREGION *pReg ) { - HeapFree( GetProcessHeap(), 0, pReg->rects ); + if (pReg->rects != pReg->rects_buf) + HeapFree( GetProcessHeap(), 0, pReg->rects ); } /*********************************************************************** @@ -491,12 +507,16 @@ static WINEREGION *alloc_region( INT n ) static inline void move_rects( WINEREGION *dst, WINEREGION *src ) { destroy_region( dst ); - dst->rects = src->rects; + if (src->rects == src->rects_buf) + { + dst->rects = dst->rects_buf; + memcpy( dst->rects, src->rects, src->numRects * sizeof(RECT) ); + } + else + dst->rects = src->rects; dst->size = src->size; dst->numRects = src->numRects; - src->rects = NULL; - src->size = 0; - src->numRects = 0; + init_region( src, 0 ); } /*********************************************************************** @@ -1176,10 +1196,9 @@ static BOOL REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn) { WINEREGION region; - region.rects = &region.extents; + init_region( &region, 1 ); region.numRects = 1; - region.size = 1; - region.extents = *rect; + region.extents = *region.rects = *rect; return REGION_UnionRegion(rgn, rgn, &region); } @@ -1625,7 +1644,7 @@ static INT REGION_Coalesce ( */ static void REGION_compact( WINEREGION *reg ) { - if ((reg->numRects < reg->size / 2) && (reg->numRects > 2)) + if ((reg->numRects < reg->size / 2) && (reg->numRects > RGN_DEFAULT_RECTS)) { RECT *new_rects = HeapReAlloc( GetProcessHeap(), 0, reg->rects, reg->numRects * sizeof(RECT) ); if (new_rects)

1 0

Huw Davies : gdi32: Add helpers to allocate, grow and free regions.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 01c33fb98361f2fd34e161c4447901d73cdd2461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c33fb98361f2fd34e161c44… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 18 11:32:26 2016 +0100 gdi32: Add helpers to allocate, grow and free regions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 186 ++++++++++++++++++++++++++++------------------------ 1 file changed, 101 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01c33fb98361f2fd34e16…

1 0

Michael Stefaniuc : amstream: Avoid using the LPUNKNOWN COM iface type.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 8185c9f0245b9615766143c8c437a29c227a1b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8185c9f0245b9615766143c8c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 18 11:20:57 2016 +0200 amstream: Avoid using the LPUNKNOWN COM iface type. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 1149584..2cadf9c 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -117,8 +117,8 @@ static HRESULT WINAPI AMCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter { IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; - LPUNKNOWN punk; - + IUnknown *punk; + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); *ppobj = NULL;

1 0

Michael Stefaniuc : strmbase: Avoid a COM object to interface cast.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: d7f332020ca07eb2ae2a3c997f7d9f2c7d2860c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f332020ca07eb2ae2a3c997… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 18 11:20:26 2016 +0200 strmbase: Avoid a COM object to interface cast. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index b756ae3..970164e 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -324,7 +324,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; TRACE("Late: %i from %i, rate: %g\n", (int)(q.Late/10000), (int)(q.TimeStamp/10000), 1./priv->avg_rate); - hr = IQualityControl_Notify((IQualityControl *)priv, priv->self, q); + hr = IQualityControl_Notify(&priv->IQualityControl_iface, priv->self, q); priv->qos_handled = hr == S_OK; }

1 0

Michael Stefaniuc : strmbase: Don' t cast IQualityControl to the COM object.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 4c224eaba11929f5164f0b94da07c71466acba99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c224eaba11929f5164f0b94d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 18 11:19:17 2016 +0200 strmbase: Don't cast IQualityControl to the COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 46e0193..b756ae3 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -61,28 +61,33 @@ void QualityControlImpl_Destroy(QualityControlImpl *This) HeapFree(GetProcessHeap(),0,This); } +static inline QualityControlImpl *impl_from_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, QualityControlImpl, IQualityControl_iface); +} + HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { - QualityControlImpl *This = (QualityControlImpl*)iface; + QualityControlImpl *This = impl_from_IQualityControl(iface); return IBaseFilter_QueryInterface(This->self, riid, ppv); } ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) { - QualityControlImpl *This = (QualityControlImpl*)iface; + QualityControlImpl *This = impl_from_IQualityControl(iface); return IBaseFilter_AddRef(This->self); } ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) { - QualityControlImpl *This = (QualityControlImpl*)iface; + QualityControlImpl *This = impl_from_IQualityControl(iface); return IBaseFilter_Release(This->self); } HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { + QualityControlImpl *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; - QualityControlImpl *This = (QualityControlImpl*)iface; TRACE("%p %p { 0x%x %u " XTIME_FMT " " XTIME_FMT " }\n", This, sender, qm.Type, qm.Proportion, @@ -110,7 +115,7 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { - QualityControlImpl *This = (QualityControlImpl*)iface; + QualityControlImpl *This = impl_from_IQualityControl(iface); TRACE("%p %p\n", This, tonotify); This->tonotify = tonotify; return S_OK;

1 0

Nikolay Sivov : dwrite: Validate CreateTextFormat() arguments.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: fee64bed4526ffb73fcdc0ba05601ca75a11d44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee64bed4526ffb73fcdc0ba0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 13:03:45 2016 +0300 dwrite: Validate CreateTextFormat() arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 8 ++++++++ dlls/dwrite/tests/layout.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 48d0816..d292764 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5133,6 +5133,14 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle *format = NULL; + if (size <= 0.0f) + return E_INVALIDARG; + + if (((UINT32)weight > DWRITE_FONT_WEIGHT_ULTRA_BLACK) || + ((UINT32)stretch > DWRITE_FONT_STRETCH_ULTRA_EXPANDED) || + ((UINT32)style > DWRITE_FONT_STYLE_ITALIC)) + return E_INVALIDARG; + This = heap_alloc(sizeof(struct dwrite_textformat)); if (!This) return E_OUTOFMEMORY; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ddc63d6..689b3b4 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -933,6 +933,7 @@ static void test_CreateGdiCompatibleTextLayout(void) static void test_CreateTextFormat(void) { + static const WCHAR emptyW[] = {0}; IDWriteFontCollection *collection, *syscoll; DWRITE_PARAGRAPH_ALIGNMENT paralign; DWRITE_READING_DIRECTION readdir; @@ -949,6 +950,34 @@ static void test_CreateTextFormat(void) factory = create_factory(); + /* zero/negative font size */ + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 0.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, -10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid font properties */ + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, 1000, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_ITALIC + 1, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_ITALIC, + 10, 10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* empty family name */ + hr = IDWriteFactory_CreateTextFormat(factory, emptyW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite: Use more intuitive naming for layout stages.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 84a36f27b88c4d4598aaa58e8855f59ab829103a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a36f27b88c4d4598aaa58e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 13:03:44 2016 +0300 dwrite: Use more intuitive naming for layout stages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8a736f9..48d0816 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -224,10 +224,10 @@ struct layout_cluster { }; enum layout_recompute_mask { - RECOMPUTE_NOMINAL_RUNS = 1 << 0, - RECOMPUTE_MINIMAL_WIDTH = 1 << 1, - RECOMPUTE_EFFECTIVE_RUNS = 1 << 2, - RECOMPUTE_EVERYTHING = 0xffff + RECOMPUTE_CLUSTERS = 1 << 0, + RECOMPUTE_MINIMAL_WIDTH = 1 << 1, + RECOMPUTE_LINES = 1 << 2, + RECOMPUTE_EVERYTHING = 0xffff }; struct dwrite_textlayout { @@ -1037,7 +1037,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) { HRESULT hr; - if (!(layout->recompute & RECOMPUTE_NOMINAL_RUNS)) + if (!(layout->recompute & RECOMPUTE_CLUSTERS)) return S_OK; /* nominal breakpoints are evaluated only once, because string never changes */ @@ -1076,7 +1076,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) } } - layout->recompute &= ~RECOMPUTE_NOMINAL_RUNS; + layout->recompute &= ~RECOMPUTE_CLUSTERS; return hr; } @@ -1714,7 +1714,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) UINT32 i, start, line, textpos; HRESULT hr; - if (!(layout->recompute & RECOMPUTE_EFFECTIVE_RUNS)) + if (!(layout->recompute & RECOMPUTE_LINES)) return S_OK; hr = layout_compute(layout); @@ -1910,7 +1910,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) layout->metrics.heightIncludingTrailingWhitespace = layout->metrics.height; /* FIXME: not true for vertical text */ - layout->recompute &= ~RECOMPUTE_EFFECTIVE_RUNS; + layout->recompute &= ~RECOMPUTE_LINES; return hr; } @@ -3765,7 +3765,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetTextAlignment(IDWriteTextFormat return hr; /* if layout is not ready there's nothing to align */ - if (changed && !(This->recompute & RECOMPUTE_EFFECTIVE_RUNS)) + if (changed && !(This->recompute & RECOMPUTE_LINES)) layout_apply_text_alignment(This); return S_OK; @@ -3784,7 +3784,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetParagraphAlignment(IDWriteTextF return hr; /* if layout is not ready there's nothing to align */ - if (changed && !(This->recompute & RECOMPUTE_EFFECTIVE_RUNS)) + if (changed && !(This->recompute & RECOMPUTE_LINES)) layout_apply_par_alignment(This); return S_OK; @@ -3803,7 +3803,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetWordWrapping(IDWriteTextFormat1 return hr; if (changed) - This->recompute |= RECOMPUTE_EFFECTIVE_RUNS; + This->recompute |= RECOMPUTE_LINES; return S_OK; }

1 0

Nikolay Sivov : msscript: Initial support for hosting script engines.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: b22dfdc98ce594e446b9d8e3e4dd6b7303d984da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22dfdc98ce594e446b9d8e3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 16 22:34:18 2016 +0300 msscript: Initial support for hosting script engines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 288 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 15 +- 2 files changed, 291 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b22dfdc98ce594e446b9d…

1 0

Nikolay Sivov : wbemdisp: Fix a crash on null interface pointer.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 1fda7ca72e4a4d784950c0a4503f34a32d3b987b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fda7ca72e4a4d784950c0a45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 15 23:22:50 2016 +0300 wbemdisp: Fix a crash on null interface pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 3 ++- dlls/wbemdisp/tests/wbemdisp.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index d1f2609..a8b1568 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1224,7 +1224,8 @@ static ULONG WINAPI locator_Release( if (!refs) { TRACE( "destroying %p\n", locator ); - IWbemLocator_Release( locator->locator ); + if (locator->locator) + IWbemLocator_Release( locator->locator ); heap_free( locator ); } return refs; diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index e3d432b..3cc4c86 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -243,9 +243,23 @@ static void test_ParseDisplayName(void) IParseDisplayName_Release( displayname ); } +static void test_locator(void) +{ + IUnknown *locator; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&locator ); + ok( hr == S_OK, "got %x\n", hr ); + + IUnknown_Release( locator ); +} + START_TEST(wbemdisp) { CoInitialize( NULL ); + test_ParseDisplayName(); + test_locator(); + CoUninitialize(); }

1 0

Sebastian Lackner : dmsynth: Fix a module refcounting regression.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: a1ee6fa8dd9506cf2b117aeff080d72e199ecd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ee6fa8dd9506cf2b117aeff… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jul 16 17:31:16 2016 +0200 dmsynth: Fix a module refcounting regression. Fixes a regression introduced by 165f8d1fff39df4d51599bf31008c962d4867cd9. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synthsink.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index cb397ef..18ef50f 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -291,6 +291,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(LPCGUID riid, LPVOID* ret_i return hr; } + DMSYNTH_LockModule(); hr = IDirectMusicSynthSink_QueryInterface(&obj->IDirectMusicSynthSink_iface, riid, ret_iface); IDirectMusicSynthSink_Release(&obj->IDirectMusicSynthSink_iface);

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
68
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 July 2016