March 2012 - Wine-commits - list.winehq.org

Jacek Caban : msxml3: Avoid BAD_CAST in schemasInit.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: f0f5c45b93e0cb190098b1e128ad1c3369b131b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f5c45b93e0cb190098b1e12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 15 12:33:17 2012 +0100 msxml3: Avoid BAD_CAST in schemasInit. --- dlls/msxml3/schema.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index e6af8b2..903f311 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -718,7 +718,7 @@ static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, void schemasInit(void) { int len; - char* buf; + xmlChar* buf; if (!(datatypes_rsrc = FindResourceA(MSXML_hInstance, "DATATYPES", "XML"))) { FIXME("failed to find resource for %s\n", DT_nsURI); @@ -737,7 +737,7 @@ void schemasInit(void) * need a null-terminated string */ while (buf[len] != '>') buf[len--] = 0; - datatypes_src = BAD_CAST buf; + datatypes_src = buf; datatypes_len = len + 1; if (xmlGetExternalEntityLoader() != external_entity_loader)

1 0

Jacek Caban : ieframe: Use Custom IEnumOLEVERBVtbl implementation in IOleObject::EnumVerbs.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: bae8f52b5b74be991fc4ddc6baf589fa1a4cd91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae8f52b5b74be991fc4ddc6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 15 13:10:37 2012 +0100 ieframe: Use Custom IEnumOLEVERBVtbl implementation in IOleObject::EnumVerbs. OleRegEnumVerbs can't work because CLSID_WebBrowser doesn't have required registries set --- dlls/ieframe/oleobject.c | 109 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 108 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 3906f85..601e458 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -290,6 +290,102 @@ static void release_client_site(WebBrowser *This) } } +typedef struct { + IEnumOLEVERB IEnumOLEVERB_iface; + + LONG ref; +} EnumOLEVERB; + +static inline EnumOLEVERB *impl_from_IEnumOLEVERB(IEnumOLEVERB *iface) +{ + return CONTAINING_RECORD(iface, EnumOLEVERB, IEnumOLEVERB_iface); +} + +static HRESULT WINAPI EnumOLEVERB_QueryInterface(IEnumOLEVERB *iface, REFIID riid, void **ppv) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumOLEVERB_iface; + }else if(IsEqualGUID(&IID_IEnumOLEVERB, riid)) { + TRACE("(%p)->(IID_IEnumOLEVERB %p)\n", This, ppv); + *ppv = &This->IEnumOLEVERB_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumOLEVERB_AddRef(IEnumOLEVERB *iface) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumOLEVERB_Release(IEnumOLEVERB *iface) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI EnumOLEVERB_Next(IEnumOLEVERB *iface, ULONG celt, OLEVERB *rgelt, ULONG *pceltFetched) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); + + if(pceltFetched) + *pceltFetched = 0; + return S_OK; +} + +static HRESULT WINAPI EnumOLEVERB_Skip(IEnumOLEVERB *iface, ULONG celt) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + TRACE("(%p)->(%u)\n", This, celt); + return S_OK; +} + +static HRESULT WINAPI EnumOLEVERB_Reset(IEnumOLEVERB *iface) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + TRACE("(%p)\n", This); + return S_OK; +} + +static HRESULT WINAPI EnumOLEVERB_Clone(IEnumOLEVERB *iface, IEnumOLEVERB **ppenum) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + FIXME("(%p)->(%p)\n", This, ppenum); + return E_NOTIMPL; +} + +static const IEnumOLEVERBVtbl EnumOLEVERBVtbl = { + EnumOLEVERB_QueryInterface, + EnumOLEVERB_AddRef, + EnumOLEVERB_Release, + EnumOLEVERB_Next, + EnumOLEVERB_Skip, + EnumOLEVERB_Reset, + EnumOLEVERB_Clone +}; + /********************************************************************** * Implement the IOleObject interface for the WebBrowser control */ @@ -491,8 +587,19 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag static HRESULT WINAPI OleObject_EnumVerbs(IOleObject *iface, IEnumOLEVERB **ppEnumOleVerb) { WebBrowser *This = impl_from_IOleObject(iface); + EnumOLEVERB *ret; + TRACE("(%p)->(%p)\n", This, ppEnumOleVerb); - return OleRegEnumVerbs(&CLSID_WebBrowser, ppEnumOleVerb); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumOLEVERB_iface.lpVtbl = &EnumOLEVERBVtbl; + ret->ref = 1; + + *ppEnumOleVerb = &ret->IEnumOLEVERB_iface; + return S_OK; } static HRESULT WINAPI OleObject_Update(IOleObject *iface)

1 0

Jacek Caban : ieframe: Added EnumVerbs tests.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 10a584a688f1bb4b1e9995c27b5413d448849258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a584a688f1bb4b1e9995c27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 15 13:10:56 2012 +0100 ieframe: Added EnumVerbs tests. --- dlls/ieframe/tests/webbrowser.c | 52 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 945be60..41fe00a 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1946,6 +1946,54 @@ static void test_ClassInfo(IUnknown *unk) IProvideClassInfo2_Release(class_info); } +static void test_EnumVerbs(IWebBrowser2 *wb) +{ + IEnumOLEVERB *enum_verbs; + IOleObject *oleobj; + OLEVERB verbs[20]; + ULONG fetched; + HRESULT hres; + + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + + hres = IOleObject_EnumVerbs(oleobj, &enum_verbs); + IOleObject_Release(oleobj); + ok(hres == S_OK, "EnumVerbs failed: %08x\n", hres); + ok(enum_verbs != NULL, "enum_verbs == NULL\n"); + + fetched = 0xdeadbeef; + hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + fetched = 0xdeadbeef; + hres = IEnumOLEVERB_Next(enum_verbs, 1, verbs, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + hres = IEnumOLEVERB_Reset(enum_verbs); + ok(hres == S_OK, "Reset failed: %08x\n", hres); + + fetched = 0xdeadbeef; + hres = IEnumOLEVERB_Next(enum_verbs, 1, verbs, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + hres = IEnumOLEVERB_Next(enum_verbs, 1, verbs, NULL); + ok(hres == S_OK, "Next failed: %08x\n", hres); + + hres = IEnumOLEVERB_Skip(enum_verbs, 20); + ok(hres == S_OK, "Reset failed: %08x\n", hres); + + fetched = 0xdeadbeef; + hres = IEnumOLEVERB_Next(enum_verbs, 1, verbs, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + IEnumOLEVERB_Release(enum_verbs); +} + static void test_ie_funcs(IUnknown *unk) { IWebBrowser2 *wb; @@ -3201,6 +3249,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_QueryInterface(unk); test_ready_state(READYSTATE_UNINITIALIZED); test_ClassInfo(unk); + test_EnumVerbs(wb); test_LocationURL(unk, ""); test_ConnectionPoint(unk, TRUE); test_ClientSite(unk, &ClientSite, !do_download); @@ -3248,6 +3297,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_download(DWL_FROM_GOBACK|DWL_HTTP); } + test_EnumVerbs(wb); test_TranslateAccelerator(unk); test_dochost_qs(unk); @@ -3279,12 +3329,14 @@ static void test_WebBrowserV1(void) hres = CoCreateInstance(&CLSID_WebBrowser_V1, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get WebBrowserV1 instance: %08x\n", hres); + trace("%08x %p\n", hres, wb); test_QueryStatusWB(wb, FALSE, FALSE); test_ExecWB(wb, FALSE, FALSE); test_QueryInterface((IUnknown*)wb); test_ready_state(READYSTATE_UNINITIALIZED); test_ClassInfo((IUnknown*)wb); + test_EnumVerbs(wb); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref);

1 0

Nikolay Sivov : msxml3: Implement getValueFromQName() for MXAttributes.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 72187762a3fc2a5c11c747c3e0eed0fd9eb4f74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72187762a3fc2a5c11c747c3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 15 09:58:34 2012 +0300 msxml3: Implement getValueFromQName() for MXAttributes. --- dlls/msxml3/mxwriter.c | 19 +++++++++++++++---- dlls/msxml3/tests/saxreader.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 3bb4c7a..f0e4b75 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1873,12 +1873,23 @@ static HRESULT WINAPI SAXAttributes_getValueFromName(ISAXAttributes *iface, cons return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getValueFromQName(ISAXAttributes *iface, const WCHAR * pQName, - int nQName, const WCHAR ** pValue, int * nValue) +static HRESULT WINAPI SAXAttributes_getValueFromQName(ISAXAttributes *iface, const WCHAR *qname, + int qname_len, const WCHAR **value, int *value_len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%s:%d %p %p): stub\n", This, debugstr_wn(pQName, nQName), nQName, pValue, nValue); - return E_NOTIMPL; + HRESULT hr; + int index; + + TRACE("(%p)->(%s:%d %p %p)\n", This, debugstr_wn(qname, qname_len), qname_len, value, value_len); + + if (!qname || !value || !value_len) + return (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3) ? E_POINTER : E_INVALIDARG; + + hr = ISAXAttributes_getIndexFromQName(iface, qname, qname_len, &index); + if (hr == S_OK) + hr = ISAXAttributes_getValue(iface, index, value, value_len); + + return hr; } static const ISAXAttributesVtbl SAXAttributesVtbl = { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e9cfda8..15dfe41 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3437,6 +3437,40 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getIndexFromQName(saxattr, _bstr_(table->qname), strlen(table->qname)-1, &index); EXPECT_HR(hr, E_INVALIDARG); ok(index == -1, "%d: got wrong index %d\n", i, index); + + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes40) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes60)) + { + hr = ISAXAttributes_getValueFromQName(saxattr, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, &value, NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + else + { + hr = ISAXAttributes_getValueFromQName(saxattr, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + /* versions 4 and 6 crash */ + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), NULL, &len); + EXPECT_HR(hr, E_POINTER); + } + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), &value, &len); + EXPECT_HR(hr, S_OK); } len = -1;

1 0

Nikolay Sivov : msxml3: Added IVBSAXAttributes for MXAttributes.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: a58249cd5c9fa4c7524049b154063b9808d869f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58249cd5c9fa4c7524049b15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 15 12:53:45 2012 +0300 msxml3: Added IVBSAXAttributes for MXAttributes. --- dlls/msxml3/mxwriter.c | 231 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 39 +++++++ 2 files changed, 270 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a58249cd5c9fa4c752404…

1 0

Vincent Povirk : gdiplus: Test SetSurroundColors with fewer colors than points on the path.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 7a9f6abd85b48396d76ab52aa714737f653d4821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9f6abd85b48396d76ab52aa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 29 14:56:55 2012 -0600 gdiplus: Test SetSurroundColors with fewer colors than points on the path. --- dlls/gdiplus/tests/brush.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 68b8881..44bb760 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -866,6 +866,16 @@ static void test_gradientsurroundcolorcount(void) todo_wine expect(0x0000ff00, color[1]); expect(0xdeadbeef, color[2]); + count = 1; + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + todo_wine expect(Ok, status); + expect(1, count); + + count = 0; + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + todo_wine expect(InvalidParameter, status); + expect(0, count); + GdipDeleteBrush((GpBrush*)grad); status = GdipCreatePathGradient(getbounds_ptf, 3, WrapModeClamp, &grad);

1 0

Vincent Povirk : gdiplus: Implement path gradient surround color accessors.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 7e90dc3dc70b4c19b9f98c44e1279c9659287435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e90dc3dc70b4c19b9f98c44e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 29 15:23:38 2012 -0600 gdiplus: Implement path gradient surround color accessors. --- dlls/gdiplus/brush.c | 54 +++++++++++++++++++++++++++---------- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/tests/brush.c | 56 +++++++++++++++++++++++---------------- 3 files changed, 74 insertions(+), 38 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 48dd14d..b7dd1d5 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -83,17 +83,20 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) dest->blendcount = count; dest->blendfac = GdipAlloc(count * sizeof(REAL)); dest->blendpos = GdipAlloc(count * sizeof(REAL)); + dest->surroundcolors = GdipAlloc(dest->surroundcolorcount * sizeof(ARGB)); - if(!dest->blendfac || !dest->blendpos){ + if(!dest->blendfac || !dest->blendpos || !dest->surroundcolors){ GdipDeletePath(dest->path); GdipFree(dest->blendfac); GdipFree(dest->blendpos); + GdipFree(dest->surroundcolors); GdipFree(dest); return OutOfMemory; } memcpy(dest->blendfac, src->blendfac, count * sizeof(REAL)); memcpy(dest->blendpos, src->blendpos, count * sizeof(REAL)); + memcpy(dest->surroundcolors, src->surroundcolors, dest->surroundcolorcount * sizeof(ARGB)); break; } @@ -499,9 +502,11 @@ static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) (*grad)->blendfac = GdipAlloc(sizeof(REAL)); (*grad)->blendpos = GdipAlloc(sizeof(REAL)); - if(!(*grad)->blendfac || !(*grad)->blendpos){ + (*grad)->surroundcolors = GdipAlloc(sizeof(ARGB)); + if(!(*grad)->blendfac || !(*grad)->blendpos || !(*grad)->surroundcolors){ GdipFree((*grad)->blendfac); GdipFree((*grad)->blendpos); + GdipFree((*grad)->surroundcolors); GdipFree(*grad); *grad = NULL; return OutOfMemory; @@ -521,6 +526,8 @@ static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) (*grad)->center.Y = bounds.Y + bounds.Height / 2; (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0; + (*grad)->surroundcolors[0] = 0xffffffff; + (*grad)->surroundcolorcount = 1; TRACE("<-- %p\n", *grad); @@ -870,6 +877,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) GdipDeletePath(((GpPathGradient*) brush)->path); GdipFree(((GpPathGradient*) brush)->blendfac); GdipFree(((GpPathGradient*) brush)->blendpos); + GdipFree(((GpPathGradient*) brush)->surroundcolors); break; case BrushTypeLinearGradient: GdipFree(((GpLineGradient*)brush)->blendfac); @@ -1086,32 +1094,40 @@ GpStatus WINGDIPAPI GdipGetPathGradientRectI(GpPathGradient *brush, GpRect *rect GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient *grad, ARGB *argb, INT *count) { - static int calls; + INT i; TRACE("(%p,%p,%p)\n", grad, argb, count); if(!grad || !argb || !count || (*count < grad->path->pathdata.Count)) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + for (i=0; i<grad->path->pathdata.Count; i++) + { + if (i < grad->surroundcolorcount) + argb[i] = grad->surroundcolors[i]; + else + argb[i] = grad->surroundcolors[grad->surroundcolorcount-1]; + } - return NotImplemented; + *count = grad->surroundcolorcount; + + return Ok; } GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient *brush, INT *count) { - static int calls; - TRACE("(%p, %p)\n", brush, count); if (!brush || !count) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + /* Yes, this actually returns the number of points in the path (which is the + * required size of a buffer to get the surround colors), rather than the + * number of surround colors. The real count is returned when getting the + * colors. */ + *count = brush->path->pathdata.Count; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetPathGradientWrapMode(GpPathGradient *brush, @@ -1503,7 +1519,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient *grad, GDIPCONST ARGB *argb, INT *count) { - static int calls; + ARGB *new_surroundcolors; TRACE("(%p,%p,%p)\n", grad, argb, count); @@ -1511,10 +1527,18 @@ GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient (*count > grad->path->pathdata.Count)) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + new_surroundcolors = GdipAlloc(*count * sizeof(ARGB)); + if (!new_surroundcolors) + return OutOfMemory; - return NotImplemented; + memcpy(new_surroundcolors, argb, *count * sizeof(ARGB)); + + GdipFree(grad->surroundcolors); + + grad->surroundcolors = new_surroundcolors; + grad->surroundcolorcount = *count; + + return Ok; } GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient *grad, diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 909f489..3cd01b4 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -196,6 +196,8 @@ struct GpPathGradient{ REAL* blendfac; /* blend factors */ REAL* blendpos; /* blend positions */ INT blendcount; + ARGB *surroundcolors; + INT surroundcolorcount; }; struct GpLineGradient{ diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 44bb760..89dcac6 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -781,25 +781,25 @@ static void test_gradientsurroundcolorcount(void) count = 0; status = GdipGetPathGradientSurroundColorCount(grad, &count); - todo_wine expect(Ok, status); - todo_wine expect(2, count); + expect(Ok, status); + expect(2, count); color[0] = color[1] = color[2] = 0xdeadbeef; count = 3; status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); - todo_wine expect(1, count); - todo_wine expect(0xffffffff, color[0]); - todo_wine expect(0xffffffff, color[1]); + expect(Ok, status); + expect(1, count); + expect(0xffffffff, color[0]); + expect(0xffffffff, color[1]); expect(0xdeadbeef, color[2]); color[0] = color[1] = color[2] = 0xdeadbeef; count = 2; status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); - todo_wine expect(1, count); - todo_wine expect(0xffffffff, color[0]); - todo_wine expect(0xffffffff, color[1]); + expect(Ok, status); + expect(1, count); + expect(0xffffffff, color[0]); + expect(0xffffffff, color[1]); expect(0xdeadbeef, color[2]); color[0] = color[1] = color[2] = 0xdeadbeef; @@ -843,7 +843,7 @@ static void test_gradientsurroundcolorcount(void) } status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); + expect(Ok, status); expect(2, count); status = GdipGetPathGradientSurroundColorCount(NULL, &count); @@ -854,26 +854,31 @@ static void test_gradientsurroundcolorcount(void) count = 0; status = GdipGetPathGradientSurroundColorCount(grad, &count); - todo_wine expect(Ok, status); - todo_wine expect(2, count); + expect(Ok, status); + expect(2, count); color[0] = color[1] = color[2] = 0xdeadbeef; count = 2; status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); + expect(Ok, status); expect(2, count); - todo_wine expect(0x00ff0000, color[0]); - todo_wine expect(0x0000ff00, color[1]); + expect(0x00ff0000, color[0]); + expect(0x0000ff00, color[1]); expect(0xdeadbeef, color[2]); count = 1; status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); + expect(Ok, status); expect(1, count); count = 0; + status = GdipGetPathGradientSurroundColorCount(grad, &count); + expect(Ok, status); + expect(2, count); + + count = 0; status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); expect(0, count); GdipDeleteBrush((GpBrush*)grad); @@ -884,11 +889,11 @@ static void test_gradientsurroundcolorcount(void) color[0] = color[1] = color[2] = 0xdeadbeef; count = 3; status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); - todo_wine expect(1, count); - todo_wine expect(0xffffffff, color[0]); - todo_wine expect(0xffffffff, color[1]); - todo_wine expect(0xffffffff, color[2]); + expect(Ok, status); + expect(1, count); + expect(0xffffffff, color[0]); + expect(0xffffffff, color[1]); + expect(0xffffffff, color[2]); color[0] = color[1] = color[2] = 0xdeadbeef; count = 2; @@ -899,6 +904,11 @@ static void test_gradientsurroundcolorcount(void) expect(0xdeadbeef, color[1]); expect(0xdeadbeef, color[2]); + count = 0; + status = GdipGetPathGradientSurroundColorCount(grad, &count); + expect(Ok, status); + expect(3, count); + GdipDeleteBrush((GpBrush*)grad); }

1 0

Vincent Povirk : gdiplus: Use the surround colors in path gradient rendering.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 3cd51c0acf4ddf77d1a6979ee24386b4d24eb3c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd51c0acf4ddf77d1a6979ee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 29 15:40:15 2012 -0600 gdiplus: Use the surround colors in path gradient rendering. --- dlls/gdiplus/graphics.c | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 67361a2..cbaf3ed 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1191,7 +1191,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, REAL min_yf, max_yf, line1_xf, line2_xf; INT min_y, max_y, min_x, max_x; INT x, y; - ARGB outer_color=0xffffffff; + ARGB outer_color; if (fill->focus.X != 0.0 || fill->focus.Y != 0.0) { @@ -1241,6 +1241,8 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, int start_center_line=0, end_center_line=0; int seen_start=0, seen_end=0, seen_center=0; REAL center_distance; + ARGB start_color, end_color; + REAL dy, dx; type = flat_path->pathdata.Types[i]; @@ -1249,13 +1251,23 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, start_point = flat_path->pathdata.Points[i]; + start_color = fill->surroundcolors[min(i, fill->surroundcolorcount-1)]; + if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath || i+1 >= flat_path->pathdata.Count) + { end_point = flat_path->pathdata.Points[figure_start]; + end_color = fill->surroundcolors[min(figure_start, fill->surroundcolorcount-1)]; + } else if ((flat_path->pathdata.Types[i+1] & PathPointTypePathTypeMask) == PathPointTypeLine) + { end_point = flat_path->pathdata.Points[i+1]; + end_color = fill->surroundcolors[min(i+1, fill->surroundcolorcount-1)]; + } else continue; + outer_color = start_color; + min_yf = center_point.Y; if (min_yf > start_point.Y) min_yf = start_point.Y; if (min_yf > end_point.Y) min_yf = end_point.Y; @@ -1274,9 +1286,12 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, else max_y = (INT)ceil(max_yf); + dy = end_point.Y - start_point.Y; + dx = end_point.X - start_point.X; + /* This is proportional to the distance from start-end line to center point. */ - center_distance = (end_point.Y - start_point.Y) * (start_point.X - center_point.X) + - (end_point.X - start_point.X) * (center_point.Y - start_point.Y); + center_distance = dy * (start_point.X - center_point.X) + + dx * (center_point.Y - start_point.Y); for (y=min_y; y<max_y; y++) { @@ -1327,9 +1342,19 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, for (x=min_x; x<max_x; x++) { + REAL xf = (REAL)x; REAL distance; - distance = (end_point.Y - start_point.Y) * (start_point.X - (REAL)x) + + if (start_color != end_color) + { + REAL blend_amount, pdy, pdx; + pdy = yf - center_point.Y; + pdx = xf - center_point.X; + blend_amount = ( (center_point.Y - start_point.Y) * pdx + (start_point.X - center_point.X) * pdy ) / ( dy * pdx - dx * pdy ); + outer_color = blend_colors(start_color, end_color, blend_amount); + } + + distance = (end_point.Y - start_point.Y) * (start_point.X - xf) + (end_point.X - start_point.X) * (yf - start_point.Y); distance = distance / center_distance;

1 0

Alexander Morozov : ntoskrnl.exe: Fix a typo.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 70dcc417601e2e3e9ae1215690f22f7b1e0b8a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70dcc417601e2e3e9ae121569… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Mar 15 20:15:56 2012 +0400 ntoskrnl.exe: Fix a typo. --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6eda074..285541a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -243,8 +243,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) code = reply->code; ioctl = reply->next; device = wine_server_get_ptr( reply->user_ptr ); - client_tid = reply->client_pid; - client_pid = reply->client_tid; + client_tid = reply->client_tid; + client_pid = reply->client_pid; in_size = reply->in_size; out_size = reply->out_size; }

1 0

Eduardo García : po: Update Spanish translation.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: d5a3b47249cd277c6cee0bc98e433f7b4508d7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a3b47249cd277c6cee0bc98… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Wed Mar 14 22:57:42 2012 +0100 po: Update Spanish translation. --- po/es.po | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/po/es.po b/po/es.po index a5c8192..78b2de0 100644 --- a/po/es.po +++ b/po/es.po @@ -2190,17 +2190,13 @@ msgstr "" "certificado, lista de revocación o lista de confianza:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" msgstr "" -"Estándar de Sintaxis de Mensajes Criptográficos/Mensajes PKCS #7 (.p7b)" +"Estándar de Sintaxis para Mensajes Criptográficos/Mensajes PKCS #7 (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Intercambio de Información Personal/PKCS #12 ((.pfx, .p12)" +msgstr "Intercambio de Información Personal/PKCS #12 (*.pfx; *.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2344,23 +2340,17 @@ msgid "Select the format you want to use:" msgstr "Seleccione el formato que quiere utilizar:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "X.509 con codificación &DER (.cer)" +msgstr "X.509 con codificación &DER (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "X.509 con codificación Ba&se64 (.cer):" +msgstr "X.509 con codificación Ba&se64 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" msgstr "" -"Estándar de Sintaxis de Mensajes &Criptográficos/Mensaje PKCS #7 (.p7b)" +"Estándar de Sintaxis para Mensajes &Criptográficos/Mensaje PKCS #7 (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" @@ -2368,10 +2358,8 @@ msgstr "" "&Incluir todos los certificados en la ruta de certificación si es posible" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "Intercambio de Información &Personal/PKCS #12 (.pfx)" +msgstr "Intercambio de Información &Personal/PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -12794,9 +12782,8 @@ msgid "Select an executable file" msgstr "Seleccione un fichero ejecutable" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "Auto&detectar" +msgstr "Autodetectar" #: winecfg.rc:67 msgid "Local hard disk"

1 0