April 2012 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Implement GdipGetPathGradientCenterColor.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: a85bb87cc3e12af45e288904402906503fee190e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85bb87cc3e12af45e2889044… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 31 11:20:11 2012 -0500 gdiplus: Implement GdipGetPathGradientCenterColor. --- dlls/gdiplus/brush.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index b7dd1d5..9eb9dff 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -994,14 +994,14 @@ GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient *grad, GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient *grad, ARGB *colors) { - static int calls; - TRACE("(%p,%p)\n", grad, colors); - if(!(calls++)) - FIXME("not implemented\n"); + if (!grad || !colors) + return InvalidParameter; - return NotImplemented; + *colors = grad->centercolor; + + return Ok; } GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient *grad,

1 0

Henri Verbeet : ddraw: The texture interfaces can' t be queried from version 7 surfaces.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 7dd4f439e33c37d6a1f2afd1febee7062886b751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd4f439e33c37d6a1f2afd1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:02 2012 +0200 ddraw: The texture interfaces can't be queried from version 7 surfaces. --- dlls/ddraw/surface.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0109449..d8c43a1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -222,21 +222,21 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, return E_NOINTERFACE; } - if (IsEqualGUID( &IID_IDirect3DTexture2, riid) - || IsEqualGUID(&IID_IDirect3DTexture, riid)) + if (This->version != 7) { - if (IsEqualGUID( &IID_IDirect3DTexture, riid )) + if (IsEqualGUID(&IID_IDirect3DTexture2, riid)) { - *obj = &This->IDirect3DTexture_iface; - TRACE(" returning Direct3DTexture interface at %p.\n", *obj); + IDirect3DTexture2_AddRef(&This->IDirect3DTexture2_iface); + *obj = &This->IDirect3DTexture2_iface; + return S_OK; } - else + + if (IsEqualGUID( &IID_IDirect3DTexture, riid )) { - *obj = &This->IDirect3DTexture2_iface; - TRACE(" returning Direct3DTexture2 interface at %p.\n", *obj); + IDirect3DTexture2_AddRef(&This->IDirect3DTexture_iface); + *obj = &This->IDirect3DTexture_iface; + return S_OK; } - IUnknown_AddRef( (IUnknown *) *obj); - return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));

1 0

Vincent Povirk : gdiplus: Forbid creating path gradients with fewer than 2 points.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: ad9976eb223d4e0ffe8a3d72187cdfd37d586c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9976eb223d4e0ffe8a3d721… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 31 13:04:12 2012 -0500 gdiplus: Forbid creating path gradients with fewer than 2 points. --- dlls/gdiplus/brush.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index aa02598..4bf4928 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -517,6 +517,9 @@ static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) if(!path || !grad) return InvalidParameter; + if (path->pathdata.Count < 2) + return OutOfMemory; + GdipGetPathWorldBounds(path, &bounds, NULL, NULL); *grad = GdipAlloc(sizeof(GpPathGradient));

1 0

Hans Leidekker : msi/tests: Add tests for MsiEnumComponents and MsiEnumComponentsEx.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: f01cd3a36d3bce0706e6d2bea63838619a4312c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01cd3a36d3bce0706e6d2bea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 17:54:43 2012 +0200 msi/tests: Add tests for MsiEnumComponents and MsiEnumComponentsEx. --- dlls/msi/tests/msi.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index aaf1f42..f12af78 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -57,6 +57,8 @@ static UINT (WINAPI *pMsiGetPatchInfoExA) (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, DWORD *); static UINT (WINAPI *pMsiEnumProductsExA) (LPCSTR, LPCSTR, DWORD, DWORD, CHAR[39], MSIINSTALLCONTEXT *, LPSTR, LPDWORD); +static UINT (WINAPI *pMsiEnumComponentsExA) + (LPCSTR, DWORD, DWORD, CHAR[39], MSIINSTALLCONTEXT *, LPSTR, LPDWORD); static void init_functionpointers(void) { @@ -79,6 +81,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiUseFeatureExA) GET_PROC(hmsi, MsiGetPatchInfoExA) GET_PROC(hmsi, MsiEnumProductsExA) + GET_PROC(hmsi, MsiEnumComponentsExA) GET_PROC(hadvapi32, ConvertSidToStringSidA) GET_PROC(hadvapi32, RegDeleteKeyExA) @@ -11953,6 +11956,169 @@ static void test_MsiEnumProductsEx(void) LocalFree( usersid ); } +static void test_MsiEnumComponents(void) +{ + UINT r; + int found1, found2; + DWORD index; + char comp1[39], comp2[39], guid[39]; + char comp_squashed1[33], comp_squashed2[33]; + char keypath1[MAX_PATH], keypath2[MAX_PATH]; + REGSAM access = KEY_ALL_ACCESS; + char *usersid = get_user_sid(); + HKEY key1 = NULL, key2 = NULL; + + create_test_guid( comp1, comp_squashed1 ); + create_test_guid( comp2, comp_squashed2 ); + + if (is_wow64) access |= KEY_WOW64_64KEY; + + strcpy( keypath1, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\" ); + strcat( keypath1, "S-1-5-18\\Components\\" ); + strcat( keypath1, comp_squashed1 ); + + r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL ); + if (r == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + goto done; + } + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + strcpy( keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\" ); + strcat( keypath2, usersid ); + strcat( keypath2, "\\Components\\" ); + strcat( keypath2, comp_squashed2 ); + + r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL ); + if (r == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + goto done; + } + + r = MsiEnumComponentsA( 0, NULL ); + ok( r == ERROR_INVALID_PARAMETER, "got %u\n", r ); + + index = 0; + guid[0] = 0; + found1 = found2 = 0; + while (!MsiEnumComponentsA( index, guid )) + { + if (!strcmp( guid, comp1 )) found1 = 1; + if (!strcmp( guid, comp2 )) found2 = 1; + ok( guid[0], "empty guid\n" ); + guid[0] = 0; + index++; + } + ok( found1, "comp1 not found\n" ); + ok( found2, "comp2 not found\n" ); + +done: + delete_key( key1, "", access ); + delete_key( key2, "", access ); + RegCloseKey( key1 ); + RegCloseKey( key2 ); + LocalFree( usersid ); +} + +static void test_MsiEnumComponentsEx(void) +{ + UINT r; + int found1, found2; + DWORD len, index; + MSIINSTALLCONTEXT context; + char comp1[39], comp2[39], guid[39], sid[128]; + char comp_squashed1[33], comp_squashed2[33]; + char keypath1[MAX_PATH], keypath2[MAX_PATH]; + HKEY key1 = NULL, key2 = NULL; + REGSAM access = KEY_ALL_ACCESS; + char *usersid = get_user_sid(); + + if (!pMsiEnumComponentsExA) + { + win_skip( "MsiEnumComponentsExA not implemented\n" ); + return; + } + create_test_guid( comp1, comp_squashed1 ); + create_test_guid( comp2, comp_squashed2 ); + + if (is_wow64) access |= KEY_WOW64_64KEY; + + strcpy( keypath1, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\" ); + strcat( keypath1, "S-1-5-18\\Components\\" ); + strcat( keypath1, comp_squashed1 ); + + r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL ); + if (r == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + goto done; + } + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + strcpy( keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\" ); + strcat( keypath2, usersid ); + strcat( keypath2, "\\Components\\" ); + strcat( keypath2, comp_squashed2 ); + + r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL ); + if (r == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + goto done; + } + ok( r == ERROR_SUCCESS, "got %u\n", r ); + r = RegSetValueExA( key2, comp_squashed2, 0, REG_SZ, (const BYTE *)"c:\\doesnotexist", + sizeof("c:\\doesnotexist")); + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + index = 0; + guid[0] = 0; + context = 0xdeadbeef; + sid[0] = 0; + len = sizeof(sid); + found1 = found2 = 0; + while (!pMsiEnumComponentsExA( "S-1-1-0", MSIINSTALLCONTEXT_ALL, index, guid, &context, sid, &len )) + { + if (!strcmp( comp1, guid )) + { + ok( context == MSIINSTALLCONTEXT_MACHINE, "got %u\n", context ); + ok( !sid[0], "got \"%s\"\n", sid ); + ok( !len, "unexpected length %u\n", len ); + found1 = 1; + } + if (!strcmp( comp2, guid )) + { + ok( context == MSIINSTALLCONTEXT_USERUNMANAGED, "got %u\n", context ); + ok( sid[0], "empty sid\n" ); + ok( len == strlen(sid), "unexpected length %u\n", len ); + found2 = 1; + } + index++; + guid[0] = 0; + context = 0xdeadbeef; + sid[0] = 0; + len = sizeof(sid); + } + ok( found1, "comp1 not found\n" ); + ok( found2, "comp2 not found\n" ); + + r = pMsiEnumComponentsExA( NULL, 0, 0, NULL, NULL, NULL, NULL ); + ok( r == ERROR_INVALID_PARAMETER, "got %u\n", r ); + + r = pMsiEnumComponentsExA( NULL, MSIINSTALLCONTEXT_ALL, 0, NULL, NULL, sid, NULL ); + ok( r == ERROR_INVALID_PARAMETER, "got %u\n", r ); + +done: + RegDeleteValueA( key2, comp_squashed2 ); + delete_key( key1, "", access ); + delete_key( key2, "", access ); + RegCloseKey( key1 ); + RegCloseKey( key2 ); + LocalFree( usersid ); +} + START_TEST(msi) { init_functionpointers(); @@ -11986,6 +12152,8 @@ START_TEST(msi) test_MsiGetPatchInfo(); test_MsiEnumProducts(); test_MsiEnumProductsEx(); + test_MsiEnumComponents(); + test_MsiEnumComponentsEx(); } test_MsiGetFileVersion(); test_MsiGetFileSignatureInformation();

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DStateBlock9Impl_QueryInterface ().
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 71aa7cd81edcfc4feae7cc0cfcbf9fcb27dfa542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71aa7cd81edcfc4feae7cc0cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:04 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DStateBlock9Impl_QueryInterface(). --- dlls/d3d9/stateblock.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 6ecf596..9123a1a 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -33,18 +33,18 @@ static inline IDirect3DStateBlock9Impl *impl_from_IDirect3DStateBlock9(IDirect3D static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(IDirect3DStateBlock9 *iface, REFIID riid, void **ppobj) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DStateBlock9)) { + if (IsEqualGUID(riid, &IID_IDirect3DStateBlock9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DStateBlock9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Jacek Caban : jscript: Fixed jsheap_grow implementation.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: b3bafb60a278bfe23d67923d399d46f2da11dd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3bafb60a278bfe23d67923d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 30 18:19:48 2012 +0200 jscript: Fixed jsheap_grow implementation. --- dlls/jscript/jsutils.c | 7 ++++++- dlls/jscript/tests/regexp.js | 4 ++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 040ec58..5e5121a 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -126,13 +126,18 @@ void *jsheap_alloc(jsheap_t *heap, DWORD size) void *jsheap_grow(jsheap_t *heap, void *mem, DWORD size, DWORD inc) { + void *ret; + if(mem == (BYTE*)heap->blocks[heap->last_block] + heap->offset-size && heap->offset+inc < block_size(heap->last_block)) { heap->offset += inc; return mem; } - return jsheap_alloc(heap, size+inc); + ret = jsheap_alloc(heap, size+inc); + if(ret) /* FIXME: avoid coppying for custom blocks */ + memcpy(ret, mem, size); + return ret; } void jsheap_clear(jsheap_t *heap) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 4d513e0..e9f26ef 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -44,6 +44,10 @@ ok(m[0] === "aa", "m[0] = " + m[0]); ok(RegExp.leftContext === " ", "RegExp.leftContext = " + RegExp.leftContext); ok(RegExp.rightContext === "baaa", "RegExp.rightContext = " + RegExp.rightContext); +m = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/.exec( + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); +ok(m === null, "m is not null"); + re = /a+/g; ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex);

1 0

Vincent Povirk : gdiplus: Implement path gradient preset blend accessors.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 5254a76a0c1f9694cb40a8332d69b899b3fb0c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5254a76a0c1f9694cb40a8332… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 31 12:38:17 2012 -0500 gdiplus: Implement path gradient preset blend accessors. --- dlls/gdiplus/brush.c | 85 ++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/gdiplus_private.h | 3 + dlls/gdiplus/graphics.c | 14 +++++++ 3 files changed, 95 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 9eb9dff..07d32dc 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -60,7 +60,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) } case BrushTypePathGradient:{ GpPathGradient *src, *dest; - INT count; + INT count, pcount; GpStatus stat; *clone = GdipAlloc(sizeof(GpPathGradient)); @@ -84,12 +84,21 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) dest->blendfac = GdipAlloc(count * sizeof(REAL)); dest->blendpos = GdipAlloc(count * sizeof(REAL)); dest->surroundcolors = GdipAlloc(dest->surroundcolorcount * sizeof(ARGB)); + pcount = dest->pblendcount; + if (pcount) + { + dest->pblendcolor = GdipAlloc(pcount * sizeof(ARGB)); + dest->pblendpos = GdipAlloc(pcount * sizeof(REAL)); + } - if(!dest->blendfac || !dest->blendpos || !dest->surroundcolors){ + if(!dest->blendfac || !dest->blendpos || !dest->surroundcolors || + (pcount && (!dest->pblendcolor || !dest->pblendpos))){ GdipDeletePath(dest->path); GdipFree(dest->blendfac); GdipFree(dest->blendpos); GdipFree(dest->surroundcolors); + GdipFree(dest->pblendcolor); + GdipFree(dest->pblendpos); GdipFree(dest); return OutOfMemory; } @@ -98,6 +107,12 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) memcpy(dest->blendpos, src->blendpos, count * sizeof(REAL)); memcpy(dest->surroundcolors, src->surroundcolors, dest->surroundcolorcount * sizeof(ARGB)); + if (pcount) + { + memcpy(dest->pblendcolor, src->pblendcolor, pcount * sizeof(ARGB)); + memcpy(dest->pblendpos, src->pblendpos, pcount * sizeof(REAL)); + } + break; } case BrushTypeLinearGradient:{ @@ -878,6 +893,8 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) GdipFree(((GpPathGradient*) brush)->blendfac); GdipFree(((GpPathGradient*) brush)->blendpos); GdipFree(((GpPathGradient*) brush)->surroundcolors); + GdipFree(((GpPathGradient*) brush)->pblendcolor); + GdipFree(((GpPathGradient*) brush)->pblendpos); break; case BrushTypeLinearGradient: GdipFree(((GpLineGradient*)brush)->blendfac); @@ -1413,22 +1430,76 @@ GpStatus WINGDIPAPI GdipSetPathGradientLinearBlend(GpPathGradient *brush, GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient *brush, GDIPCONST ARGB *blend, GDIPCONST REAL *pos, INT count) { - FIXME("(%p,%p,%p,%i): stub\n", brush, blend, pos, count); - return NotImplemented; + ARGB *new_color; + REAL *new_pos; + TRACE("(%p,%p,%p,%i)\n", brush, blend, pos, count); + + if (!brush || !blend || !pos || count < 2 || + pos[0] != 0.0f || pos[count-1] != 1.0f) + { + return InvalidParameter; + } + + new_color = GdipAlloc(count * sizeof(ARGB)); + new_pos = GdipAlloc(count * sizeof(REAL)); + if (!new_color || !new_pos) + { + GdipFree(new_color); + GdipFree(new_pos); + return OutOfMemory; + } + + memcpy(new_color, blend, sizeof(ARGB) * count); + memcpy(new_pos, pos, sizeof(REAL) * count); + + GdipFree(brush->pblendcolor); + GdipFree(brush->pblendpos); + + brush->pblendcolor = new_color; + brush->pblendpos = new_pos; + brush->pblendcount = count; + + return Ok; } GpStatus WINGDIPAPI GdipGetPathGradientPresetBlend(GpPathGradient *brush, ARGB *blend, REAL *pos, INT count) { - FIXME("(%p,%p,%p,%i): stub\n", brush, blend, pos, count); - return NotImplemented; + TRACE("(%p,%p,%p,%i)\n", brush, blend, pos, count); + + if (count < 0) + return OutOfMemory; + + if (!brush || !blend || !pos || count < 2) + return InvalidParameter; + + if (brush->pblendcount == 0) + return GenericError; + + if (count != brush->pblendcount) + { + /* Native lines up the ends of each array, and copies the destination size. */ + FIXME("Braindead behavior on wrong-sized buffer not implemented.\n"); + return InvalidParameter; + } + + memcpy(blend, brush->pblendcolor, sizeof(ARGB) * brush->pblendcount); + memcpy(pos, brush->pblendpos, sizeof(REAL) * brush->pblendcount); + + return Ok; } GpStatus WINGDIPAPI GdipGetPathGradientPresetBlendCount(GpPathGradient *brush, INT *count) { FIXME("(%p,%p): stub\n", brush, count); - return NotImplemented; + + if (!brush || !count) + return InvalidParameter; + + *count = brush->pblendcount; + + return Ok; } GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 3b82b08..c9853ec 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -198,6 +198,9 @@ struct GpPathGradient{ INT blendcount; ARGB *surroundcolors; INT surroundcolorcount; + ARGB* pblendcolor; /* preset blend colors */ + REAL* pblendpos; /* preset blend positions */ + INT pblendcount; }; struct GpLineGradient{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ee6325a..885d9a7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1207,6 +1207,20 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, FIXME("path gradient gamma correction not implemented\n"); } + if (fill->blendcount) + { + static int once; + if (!once++) + FIXME("path gradient blend not implemented\n"); + } + + if (fill->pblendcount) + { + static int once; + if (!once++) + FIXME("path gradient preset blend not implemented\n"); + } + stat = GdipClonePath(fill->path, &flat_path); if (stat != Ok)

1 0

Hans Leidekker : msi: Implement MsiEnumComponentsEx.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 8cebf01702871fe73e9cc7e2b7960a47247f386f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cebf01702871fe73e9cc7e2b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 17:54:12 2012 +0200 msi: Implement MsiEnumComponentsEx. --- dlls/msi/msi.spec | 4 +- dlls/msi/registry.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/msi.h | 6 ++ 3 files changed, 220 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 5f4a51f..8dc884a 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -282,8 +282,8 @@ 286 stdcall MsiEndTransaction(long) 287 stub MsiJoinTransaction 288 stub MsiSetOfflineContextW -289 stub MsiEnumComponentsExA -290 stub MsiEnumComponentsExW +289 stdcall MsiEnumComponentsExA(str long long ptr ptr ptr ptr) +290 stdcall MsiEnumComponentsExW(wstr long long ptr ptr ptr ptr) 291 stub MsiEnumClientsExA 292 stub MsiEnumClientsExW 293 stub MsiGetComponentPathExA diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 0c72648..bc67ab2 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1235,6 +1235,218 @@ UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid) return r; } +UINT WINAPI MsiEnumComponentsExA( LPCSTR user_sid, DWORD ctx, DWORD index, CHAR guid[39], + MSIINSTALLCONTEXT *installed_ctx, LPSTR sid, LPDWORD sid_len ) +{ + UINT r; + WCHAR *user_sidW = NULL, *sidW = NULL, guidW[GUID_SIZE]; + + TRACE("%s, %u, %u, %p, %p, %p, %p\n", debugstr_a(user_sid), ctx, index, guid, installed_ctx, + sid, sid_len); + + if (sid && !sid_len) return ERROR_INVALID_PARAMETER; + if (user_sid && !(user_sidW = strdupAtoW( user_sid ))) return ERROR_OUTOFMEMORY; + if (sid && !(sidW = msi_alloc( *sid_len * sizeof(WCHAR) ))) + { + msi_free( user_sidW ); + return ERROR_OUTOFMEMORY; + } + r = MsiEnumComponentsExW( user_sidW, ctx, index, guidW, installed_ctx, sidW, sid_len ); + if (r == ERROR_SUCCESS) + { + if (guid) WideCharToMultiByte( CP_ACP, 0, guidW, GUID_SIZE, guid, GUID_SIZE, NULL, NULL ); + if (sid) WideCharToMultiByte( CP_ACP, 0, sidW, *sid_len + 1, sid, *sid_len + 1, NULL, NULL ); + } + msi_free( user_sidW ); + msi_free( sidW ); + return r; +} + +static UINT fetch_machine_component( DWORD ctx, DWORD index, DWORD *idx, WCHAR guid[39], + MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len ) +{ + static const WCHAR componentsW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','s','t','a','l','l','e','r','\\','U','s','e','r','D','a','t','a','\\', + 'S','-','1','-','5','-','1','8','\\','C','o','m','p','o','n','e','n','t','s',0}; + UINT r = ERROR_SUCCESS; + WCHAR component[GUID_SIZE]; + DWORD i = 0, len_component; + REGSAM access = KEY_ENUMERATE_SUB_KEYS | KEY_WOW64_64KEY; + HKEY key_components; + + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, componentsW, 0, access, &key_components )) + return ERROR_NO_MORE_ITEMS; + + len_component = sizeof(component)/sizeof(component[0]); + while (!RegEnumKeyExW( key_components, i, component, &len_component, NULL, NULL, NULL, NULL )) + { + if (*idx == index) goto found; + (*idx)++; + len_component = sizeof(component)/sizeof(component[0]); + i++; + } + RegCloseKey( key_components ); + return ERROR_NO_MORE_ITEMS; + +found: + if (sid_len) + { + if (*sid_len < 1) + { + *sid_len = 1; + r = ERROR_MORE_DATA; + } + else if (sid) + { + *sid_len = 0; + sid[0] = 0; + } + } + if (guid) unsquash_guid( component, guid ); + if (installed_ctx) *installed_ctx = MSIINSTALLCONTEXT_MACHINE; + RegCloseKey( key_components ); + return r; +} + +static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index, DWORD *idx, + WCHAR guid[39], MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, + LPDWORD sid_len ) +{ + static const WCHAR userdataW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','s','t','a','l','l','e','r','\\','U','s','e','r','D','a','t','a',0}; + static const WCHAR componentsW[] = {'\\','C','o','m','p','o','n','e','n','t','s',0}; + UINT r = ERROR_SUCCESS; + WCHAR path[MAX_PATH], component[GUID_SIZE], user[128]; + DWORD i = 0, j = 0, len_component, len_user; + REGSAM access = KEY_ENUMERATE_SUB_KEYS | KEY_WOW64_64KEY; + HKEY key_users, key_components; + + if (ctx == MSIINSTALLCONTEXT_USERMANAGED) /* FIXME: were to find these? */ + return ERROR_NO_MORE_ITEMS; + + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, userdataW, 0, access, &key_users )) + return ERROR_NO_MORE_ITEMS; + + len_user = sizeof(user)/sizeof(user[0]); + while (!RegEnumKeyExW( key_users, i, user, &len_user, NULL, NULL, NULL, NULL )) + { + if ((strcmpW( usersid, szAllSid ) && strcmpW( usersid, user )) || + !strcmpW( szLocalSid, user )) + { + i++; + len_user = sizeof(user)/sizeof(user[0]); + continue; + } + strcpyW( path, user ); + strcatW( path, componentsW ); + if (RegOpenKeyExW( key_users, path, 0, access, &key_components )) + { + i++; + len_user = sizeof(user)/sizeof(user[0]); + continue; + } + len_component = sizeof(component)/sizeof(component[0]); + while (!RegEnumKeyExW( key_components, j, component, &len_component, NULL, NULL, NULL, NULL )) + { + if (*idx == index) goto found; + (*idx)++; + len_component = sizeof(component)/sizeof(component[0]); + j++; + } + RegCloseKey( key_components ); + len_user = sizeof(user)/sizeof(user[0]); + i++; + } + RegCloseKey( key_users ); + return ERROR_NO_MORE_ITEMS; + +found: + if (sid_len) + { + if (*sid_len < len_user + 1) + { + *sid_len = len_user + 1; + r = ERROR_MORE_DATA; + } + else if (sid) + { + *sid_len = len_user; + strcpyW( sid, user ); + } + } + if (guid) unsquash_guid( component, guid ); + if (installed_ctx) *installed_ctx = ctx; + RegCloseKey( key_components ); + RegCloseKey( key_users ); + return r; +} + +static UINT enum_components( const WCHAR *usersid, DWORD ctx, DWORD index, DWORD *idx, WCHAR guid[39], + MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len ) +{ + UINT r = ERROR_NO_MORE_ITEMS; + WCHAR *user = NULL; + + if (!usersid) + { + usersid = user = get_user_sid(); + if (!user) return ERROR_FUNCTION_FAILED; + } + if (ctx & MSIINSTALLCONTEXT_USERMANAGED) + { + r = fetch_user_component( usersid, MSIINSTALLCONTEXT_USERMANAGED, index, idx, guid, + installed_ctx, sid, sid_len ); + if (r != ERROR_NO_MORE_ITEMS) goto done; + } + if (ctx & MSIINSTALLCONTEXT_USERUNMANAGED) + { + r = fetch_user_component( usersid, MSIINSTALLCONTEXT_USERUNMANAGED, index, idx, guid, + installed_ctx, sid, sid_len ); + if (r != ERROR_NO_MORE_ITEMS) goto done; + } + if (ctx & MSIINSTALLCONTEXT_MACHINE) + { + r = fetch_machine_component( MSIINSTALLCONTEXT_MACHINE, index, idx, guid, installed_ctx, + sid, sid_len ); + if (r != ERROR_NO_MORE_ITEMS) goto done; + } + +done: + LocalFree( user ); + return r; +} + +UINT WINAPI MsiEnumComponentsExW( LPCWSTR user_sid, DWORD ctx, DWORD index, WCHAR guid[39], + MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len ) +{ + UINT r; + DWORD idx = 0; + static DWORD last_index; + + TRACE("%s, %u, %u, %p, %p, %p, %p\n", debugstr_w(user_sid), ctx, index, guid, installed_ctx, + sid, sid_len); + + if ((sid && !sid_len) || !ctx || (user_sid && ctx == MSIINSTALLCONTEXT_MACHINE)) + return ERROR_INVALID_PARAMETER; + + if (index && index - last_index != 1) + return ERROR_INVALID_PARAMETER; + + if (!index) last_index = 0; + + r = enum_components( user_sid, ctx, index, &idx, guid, installed_ctx, sid, sid_len ); + if (r == ERROR_SUCCESS) + last_index = index; + else + last_index = 0; + + return r; +} + UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct) { DWORD r; diff --git a/include/msi.h b/include/msi.h index 1afc89e..68b89d0 100644 --- a/include/msi.h +++ b/include/msi.h @@ -453,6 +453,12 @@ UINT WINAPI MsiEnumComponentsA(DWORD, LPSTR); UINT WINAPI MsiEnumComponentsW(DWORD, LPWSTR); #define MsiEnumComponents WINELIB_NAME_AW(MsiEnumComponents) +UINT WINAPI MsiEnumComponentsExA(LPCSTR, DWORD, DWORD, CHAR[39], + MSIINSTALLCONTEXT *, LPSTR, LPDWORD); +UINT WINAPI MsiEnumComponentsExW(LPCWSTR, DWORD, DWORD, WCHAR[39], + MSIINSTALLCONTEXT *, LPWSTR, LPDWORD); +#define MsiEnumComponentsEx WINELIB_NAME_AW(MsiEnumComponentsEx) + UINT WINAPI MsiEnumClientsA(LPCSTR, DWORD, LPSTR); UINT WINAPI MsiEnumClientsW(LPCWSTR, DWORD, LPWSTR); #define MsiEnumClients WINELIB_NAME_AW(MsiEnumClients)

1 0

Henri Verbeet : ddraw: Explicitly check for the IDirectDrawColorControl interface in ddraw_surface7_QueryInterface ().
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 8481625fa4db17dc29f69dc8f4ec2e82550b13d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8481625fa4db17dc29f69dc8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:01 2012 +0200 ddraw: Explicitly check for the IDirectDrawColorControl interface in ddraw_surface7_QueryInterface(). --- dlls/ddraw/surface.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 202eb4d..0109449 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -191,6 +191,13 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, return S_OK; } + if (IsEqualGUID(riid, &IID_IDirectDrawColorControl)) + { + WARN("Color control not implemented.\n"); + *obj = NULL; + return E_NOINTERFACE; + } + if (IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D) || IsEqualGUID(riid, &IID_IDirect3DHALDevice) || IsEqualGUID(riid, &IID_IDirect3DRGBDevice))

1 0

Vincent Povirk : gdiplus: Add tests for preset blend accessors.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: aed62dbff11f40aa6bf41af50deb103bb458e9d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aed62dbff11f40aa6bf41af50… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 31 12:38:29 2012 -0500 gdiplus: Add tests for preset blend accessors. --- dlls/gdiplus/tests/brush.c | 141 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 2 files changed, 143 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 89dcac6..6321011 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -993,6 +993,146 @@ static void test_pathgradientcenterpoint(void) expect(Ok, status); } +void test_pathgradientpresetblend(void) +{ + static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; + GpStatus status; + GpPathGradient *grad; + INT count; + int i; + const REAL positions[5] = {0.0f, 0.2f, 0.5f, 0.8f, 1.0f}; + const REAL two_positions[2] = {0.0f, 1.0f}; + const ARGB colors[5] = {0xff0000ff, 0xff00ff00, 0xff00ffff, 0xffff0000, 0xffffffff}; + REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + ARGB res_colors[6] = {0xdeadbeef, 0, 0, 0, 0}; + + status = GdipCreatePathGradient(path_points+1, 2, WrapModeClamp, &grad); + expect(Ok, status); + + status = GdipGetPathGradientPresetBlendCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlendCount(grad, NULL); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlendCount(grad, &count); + expect(Ok, status); + expect(0, count); + + status = GdipGetPathGradientPresetBlend(NULL, res_colors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, NULL, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, NULL, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, -1); + expect(OutOfMemory, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 2); + expect(GenericError, status); + + status = GdipSetPathGradientPresetBlend(NULL, colors, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientPresetBlend(grad, NULL, positions, 5); + expect(InvalidParameter, status); + + if (0) + { + /* crashes on windows xp */ + status = GdipSetPathGradientPresetBlend(grad, colors, NULL, 5); + expect(InvalidParameter, status); + } + + status = GdipSetPathGradientPresetBlend(grad, colors, positions, 0); + expect(InvalidParameter, status); + + status = GdipSetPathGradientPresetBlend(grad, colors, positions, -1); + expect(InvalidParameter, status); + + status = GdipSetPathGradientPresetBlend(grad, colors, positions, 1); + expect(InvalidParameter, status); + + /* leave off the 0.0 position */ + status = GdipSetPathGradientPresetBlend(grad, &colors[1], &positions[1], 4); + expect(InvalidParameter, status); + + /* leave off the 1.0 position */ + status = GdipSetPathGradientPresetBlend(grad, colors, positions, 4); + expect(InvalidParameter, status); + + status = GdipSetPathGradientPresetBlend(grad, colors, positions, 5); + expect(Ok, status); + + status = GdipGetPathGradientPresetBlendCount(grad, &count); + expect(Ok, status); + expect(5, count); + + if (0) + { + /* Native GdipGetPathGradientPresetBlend seems to copy starting from + * the end of each array and do no bounds checking. This is so braindead + * I'm not going to copy it. */ + + res_colors[0] = 0xdeadbeef; + res_positions[0] = 0.3; + + status = GdipGetPathGradientPresetBlend(grad, &res_colors[1], &res_positions[1], 4); + expect(Ok, status); + + expect(0xdeadbeef, res_colors[0]); + expectf(0.3, res_positions[0]); + + for (i=1; i<5; i++) + { + expect(colors[i], res_colors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 6); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expect(colors[i], res_colors[i+1]); + expectf(positions[i], res_positions[i+1]); + } + } + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 5); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expect(colors[i], res_colors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, -1); + expect(OutOfMemory, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipSetPathGradientPresetBlend(grad, colors, two_positions, 2); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)grad); + expect(Ok, status); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1019,6 +1159,7 @@ START_TEST(brush) test_gradientsurroundcolorcount(); test_pathgradientpath(); test_pathgradientcenterpoint(); + test_pathgradientpresetblend(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 9a8c5ff..f4ecec6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -555,6 +555,8 @@ GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient*,GpPoint*); GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*); GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient*,BOOL*); GpStatus WINGDIPAPI GdipGetPathGradientPath(GpPathGradient*,GpPath*); +GpStatus WINGDIPAPI GdipGetPathGradientPresetBlend(GpPathGradient*,ARGB*,REAL*,INT); +GpStatus WINGDIPAPI GdipGetPathGradientPresetBlendCount(GpPathGradient*,INT*); GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*); GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient*, GDIPCONST ARGB*,GDIPCONST REAL*,INT);

1 0