February 2013 - Wine-Commits

Jacek Caban : oleaut32: Fixed copy&paste mistake in SysFreeString.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 820c7635ab853554a78d8e6e2e9d5825979422db URL: http://source.winehq.org/git/wine.git/?a=commit;h=820c7635ab853554a78d8e6e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 19 12:13:08 2013 +0100 oleaut32: Fixed copy&paste mistake in SysFreeString. Spotted by Piotr. --- dlls/oleaut32/oleaut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index df9216b..56eea1a 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -265,7 +265,7 @@ void WINAPI SysFreeString(BSTR str) /* According to tests, freeing a string that's already in cache doesn't corrupt anything. * For that to work we need to search the cache. */ for(i=0; i < cache_entry->cnt; i++) { - if(cache_entry->buf[(cache_entry->head+cache_entry->cnt) % BUCKET_BUFFER_SIZE] == bstr) { + if(cache_entry->buf[(cache_entry->head+i) % BUCKET_BUFFER_SIZE] == bstr) { WARN_(heap)("String already is in cache!\n"); LeaveCriticalSection(&cs_bstr_cache); return;

1 0

Jacek Caban : jscript: Fixed BSTR leak.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: ee880b28c5d3d1aecd2b04e6082f8ddad99bdac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee880b28c5d3d1aecd2b04e60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 19 12:45:56 2013 +0100 jscript: Fixed BSTR leak. --- dlls/jscript/compile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index ad00591..c776c83 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -791,7 +791,7 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st if(FAILED(hres)) return hres; - *str = SysAllocStringLen(jsstr->str, jsstr_length(jsstr)); + *str = compiler_alloc_bstr(ctx, jsstr->str); jsstr_release(jsstr); break; }

1 0

Piotr Caban : vbscript: Added IMatchCollection2::_NewEnum implementation.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 56b2a7b1bd86211d5bad9bda8c238b0b7aa133d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b2a7b1bd86211d5bad9bda8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:42:27 2013 +0100 vbscript: Added IMatchCollection2::_NewEnum implementation. --- dlls/vbscript/vbregexp.c | 162 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 160 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 7e2a1cf..0aaa140 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -98,6 +98,16 @@ typedef struct Match2 { SubMatches *sub_matches; } Match2; +typedef struct MatchCollectionEnum { + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + IMatchCollection2 *mc; + LONG pos; + LONG count; +} MatchCollectionEnum; + typedef struct MatchCollection2 { IMatchCollection2 IMatchCollection2_iface; @@ -528,6 +538,149 @@ static HRESULT create_match2(DWORD pos, match_state_t **result, IMatch2 **match) return hres; } +static inline MatchCollectionEnum* impl_from_IMatchCollectionEnum(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, MatchCollectionEnum, IEnumVARIANT_iface); +} + +static HRESULT WINAPI MatchCollectionEnum_QueryInterface( + IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { + TRACE("(%p)->(IID_IEnumVARIANT %p)\n", This, ppv); + *ppv = &This->IEnumVARIANT_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MatchCollectionEnum_AddRef(IEnumVARIANT *iface) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI MatchCollectionEnum_Release(IEnumVARIANT *iface) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + IMatchCollection2_Release(This->mc); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI MatchCollectionEnum_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + DWORD i; + HRESULT hres = S_OK; + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + + if(This->pos>=This->count) { + if(pCeltFetched) + *pCeltFetched = 0; + return S_FALSE; + } + + for(i=0; i<celt && This->pos+i<This->count; i++) { + V_VT(rgVar+i) = VT_DISPATCH; + hres = IMatchCollection2_get_Item(This->mc, This->pos+i, &V_DISPATCH(rgVar+i)); + if(FAILED(hres)) + break; + } + if(FAILED(hres)) { + while(i--) + VariantClear(rgVar+i); + return hres; + } + + if(pCeltFetched) + *pCeltFetched = i; + This->pos += i; + return S_OK; +} + +static HRESULT WINAPI MatchCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + + TRACE("(%p)->(%u)\n", This, celt); + + if(This->pos+celt <= This->count) + This->pos += celt; + else + This->pos = This->count; + return S_OK; +} + +static HRESULT WINAPI MatchCollectionEnum_Reset(IEnumVARIANT *iface) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + + TRACE("(%p)\n", This); + + This->pos = 0; + return S_OK; +} + +static HRESULT WINAPI MatchCollectionEnum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl MatchCollectionEnum_Vtbl = { + MatchCollectionEnum_QueryInterface, + MatchCollectionEnum_AddRef, + MatchCollectionEnum_Release, + MatchCollectionEnum_Next, + MatchCollectionEnum_Skip, + MatchCollectionEnum_Reset, + MatchCollectionEnum_Clone +}; + +static HRESULT create_enum_variant_mc2(IMatchCollection2 *mc, ULONG pos, IEnumVARIANT **enum_variant) +{ + MatchCollectionEnum *ret; + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumVARIANT_iface.lpVtbl = &MatchCollectionEnum_Vtbl; + ret->ref = 1; + ret->pos = pos; + IMatchCollection2_get_Count(mc, &ret->count); + ret->mc = mc; + IMatchCollection2_AddRef(mc); + + *enum_variant = &ret->IEnumVARIANT_iface; + return S_OK; +} + static inline MatchCollection2* impl_from_IMatchCollection2(IMatchCollection2 *iface) { return CONTAINING_RECORD(iface, MatchCollection2, IMatchCollection2_iface); @@ -667,8 +820,13 @@ static HRESULT WINAPI MatchCollection2_get_Count(IMatchCollection2 *iface, LONG static HRESULT WINAPI MatchCollection2_get__NewEnum(IMatchCollection2 *iface, IUnknown **ppEnum) { MatchCollection2 *This = impl_from_IMatchCollection2(iface); - FIXME("(%p)->(%p)\n", This, ppEnum); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppEnum); + + if(!ppEnum) + return E_POINTER; + + return create_enum_variant_mc2(&This->IMatchCollection2_iface, 0, (IEnumVARIANT**)ppEnum); } static const IMatchCollection2Vtbl MatchCollection2Vtbl = {

1 0

Piotr Caban : vbscript: Added RegExp.Execute tests.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: d4ccce8ddb32955fabdf9207067741a6c4ce51ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ccce8ddb32955fabdf92070… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:42:13 2013 +0100 vbscript: Added RegExp.Execute tests. --- dlls/vbscript/tests/regexp.vbs | 171 ++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/rsrc.rc | 3 + dlls/vbscript/tests/run.c | 20 ++++- 3 files changed, 190 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4ccce8ddb32955fabdf9…

1 0

Piotr Caban : vbscript: Added RegExp2::Execute implementation.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: f26bdf92ccd1b1e63621bd142aa4518de8a49389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26bdf92ccd1b1e63621bd142… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:41:30 2013 +0100 vbscript: Added RegExp2::Execute implementation. --- dlls/vbscript/vbregexp.c | 718 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 715 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f26bdf92ccd1b1e63621b…

1 0

Jacek Caban : mshtml: Fixed tests on some broken Vista versions.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: f5cb8c175c736eb51f105f8b308119bb8933fa08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5cb8c175c736eb51f105f8b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 19 11:30:32 2013 +0100 mshtml: Fixed tests on some broken Vista versions. --- dlls/mshtml/tests/activex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index ce9b711..fab2c92 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -2348,7 +2348,7 @@ static void release_doc(IHTMLDocument2 *doc) set_client_site(doc, FALSE); ref = IHTMLDocument2_Release(doc); - ok(!ref, "ref = %d\n", ref); + ok(!ref || broken(ref == 1) /* Vista */, "ref = %d\n", ref); if(client_site) { IOleClientSite_Release(client_site);

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipFillRectangles using GdipFillPath.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 6b474b555eb1affba22d436d61d02fbc2f8c9169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b474b555eb1affba22d436d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:50 2013 +0800 gdiplus: Reimplement GdipFillRectangles using GdipFillPath. --- dlls/gdiplus/graphics.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ffb36bb..01e127c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3829,20 +3829,23 @@ GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRectF *rects, INT count) { - GpStatus ret; - INT i; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, brush, rects, count); if(!rects) return InvalidParameter; - for(i = 0; i < count; i++){ - ret = GdipFillRectangle(graphics, brush, rects[i].X, rects[i].Y, rects[i].Width, rects[i].Height); - if(ret != Ok) return ret; - } + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - return Ok; + status = GdipAddPathRectangles(path, rects, count); + if (status == Ok) + status = GdipFillPath(graphics, brush, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRect *rects,

1 0

Dmitry Timoshkov : gdiplus: Slightly simplify GdipFillClosedCurve2 implementation.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: bb16c926b416e83244901a5e4bf7d0acc67bd88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb16c926b416e83244901a5e4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:45 2013 +0800 gdiplus: Slightly simplify GdipFillClosedCurve2 implementation. --- dlls/gdiplus/graphics.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 32102a6..ffb36bb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3486,7 +3486,7 @@ GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPointF *points, INT count, REAL tension, GpFillMode fill) { GpPath *path; - GpStatus stat; + GpStatus status; TRACE("(%p, %p, %p, %d, %.2f, %d)\n", graphics, brush, points, count, tension, fill); @@ -3500,25 +3500,15 @@ GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics *graphics, GpBrush *brush, if(count == 1) /* Do nothing */ return Ok; - stat = GdipCreatePath(fill, &path); - if(stat != Ok) - return stat; - - stat = GdipAddPathClosedCurve2(path, points, count, tension); - if(stat != Ok){ - GdipDeletePath(path); - return stat; - } + status = GdipCreatePath(fill, &path); + if (status != Ok) return status; - stat = GdipFillPath(graphics, brush, path); - if(stat != Ok){ - GdipDeletePath(path); - return stat; - } + status = GdipAddPathClosedCurve2(path, points, count, tension); + if (status == Ok) + status = GdipFillPath(graphics, brush, path); GdipDeletePath(path); - - return Ok; + return status; } GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics *graphics, GpBrush *brush,

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawRectangles using GdipDrawPath.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 338958287a9aae8d4b6e6a26f077f9706ffc7b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=338958287a9aae8d4b6e6a26f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:39 2013 +0800 gdiplus: Reimplement GdipDrawRectangles using GdipDrawPath. --- dlls/gdiplus/graphics.c | 46 +++++++++------------------------------------- 1 files changed, 9 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 39c2b0f..32102a6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3431,9 +3431,8 @@ GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, GDIPCONST GpRectF* rects, INT count) { - GpPointF *ptf; - POINT *pti; - INT save_state, i; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, pen, rects, count); @@ -3443,42 +3442,15 @@ GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf = GdipAlloc(4 * count * sizeof(GpPointF)); - pti = GdipAlloc(4 * count * sizeof(POINT)); - - if(!ptf || !pti){ - GdipFree(ptf); - GdipFree(pti); - return OutOfMemory; - } - - for(i = 0; i < count; i++){ - ptf[4 * i + 3].X = ptf[4 * i].X = rects[i].X; - ptf[4 * i + 1].Y = ptf[4 * i].Y = rects[i].Y; - ptf[4 * i + 2].X = ptf[4 * i + 1].X = rects[i].X + rects[i].Width; - ptf[4 * i + 3].Y = ptf[4 * i + 2].Y = rects[i].Y + rects[i].Height; - } - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - transform_and_round_points(graphics, pti, ptf, 4 * count); - - for(i = 0; i < count; i++) - Polygon(graphics->hdc, &pti[4 * i], 4); - - restore_dc(graphics, save_state); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - GdipFree(ptf); - GdipFree(pti); + status = GdipAddPathRectangles(path, rects, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return Ok; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics *graphics, GpPen *pen,

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawArc using GdipDrawPath.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 89f380f69b36680cba2bc16ea03ee60231a73230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f380f69b36680cba2bc16ea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:08 2013 +0800 gdiplus: Reimplement GdipDrawArc using GdipDrawPath. --- dlls/gdiplus/graphics.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 738a54c..b408db4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2503,9 +2503,8 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - INT save_state, num_pts; - GpPointF points[MAX_ARC_PTS]; - GpStatus retval; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height, startAngle, sweepAngle); @@ -2516,21 +2515,15 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - num_pts = arc2polybezier(points, x, y, width, height, startAngle, sweepAngle); - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, points, num_pts, TRUE); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathArc(path, x, y, width, height, startAngle, sweepAngle); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return retval; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x,

1 0