wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Bruno Jesus : ws2_32/tests: Avoid usage of inet_ntoa since its return is static.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 9f6ce27ede1f7cc544608be504ad04ec533cd45e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6ce27ede1f7cc544608be50… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Mar 31 17:16:06 2012 -0300 ws2_32/tests: Avoid usage of inet_ntoa since its return is static. --- dlls/ws2_32/tests/sock.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f4cc909..cc045ea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4504,7 +4504,7 @@ static void test_AcceptEx(void) struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ int got, conn1, i; DWORD bytesReturned, connect_time; - char buffer[1024]; + char buffer[1024], ipbuffer[32]; OVERLAPPED overlapped; int iret, localSize = sizeof(struct sockaddr_in), remoteSize = localSize; BOOL bret; @@ -4720,15 +4720,17 @@ static void test_AcceptEx(void) pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, (struct sockaddr **)&readBindAddress, &localSize, (struct sockaddr **)&readRemoteAddress, &remoteSize); + strcpy( ipbuffer, inet_ntoa(readBindAddress->sin_addr)); ok( readBindAddress->sin_addr.s_addr == bindAddress.sin_addr.s_addr, "Local socket address is different %s != %s\n", - inet_ntoa(readBindAddress->sin_addr), inet_ntoa(bindAddress.sin_addr)); + ipbuffer, inet_ntoa(bindAddress.sin_addr)); ok( readBindAddress->sin_port == bindAddress.sin_port, "Local socket port is different: %d != %d\n", readBindAddress->sin_port, bindAddress.sin_port); + strcpy( ipbuffer, inet_ntoa(readRemoteAddress->sin_addr)); ok( readRemoteAddress->sin_addr.s_addr == peerAddress.sin_addr.s_addr, "Remote socket address is different %s != %s\n", - inet_ntoa(readRemoteAddress->sin_addr), inet_ntoa(peerAddress.sin_addr)); + ipbuffer, inet_ntoa(peerAddress.sin_addr)); ok( readRemoteAddress->sin_port == peerAddress.sin_port, "Remote socket port is different: %d != %d\n", readRemoteAddress->sin_port, peerAddress.sin_port);

1 0

Carlo Bramini : include: Add PERCEIVED types and flags.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 52c9dcb6a22a326edde8a0ac482086cc448c6b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c9dcb6a22a326edde8a0ac4… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Mar 31 15:29:54 2012 +0200 include: Add PERCEIVED types and flags. --- include/shtypes.idl | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/include/shtypes.idl b/include/shtypes.idl index d8d7bad..a8ee131 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -135,3 +135,28 @@ cpp_quote("#define REFFOLDERTYPEID const FOLDERTYPEID &") cpp_quote("#else") cpp_quote("#define REFFOLDERTYPEID const FOLDERTYPEID * __MIDL_CONST") cpp_quote("#endif") + +typedef [v1_enum] enum tagPERCEIVED { + PERCEIVED_TYPE_CUSTOM = -3, + PERCEIVED_TYPE_UNSPECIFIED = -2, + PERCEIVED_TYPE_FOLDER = -1, + PERCEIVED_TYPE_UNKNOWN = 0, + PERCEIVED_TYPE_TEXT = 1, + PERCEIVED_TYPE_IMAGE = 2, + PERCEIVED_TYPE_AUDIO = 3, + PERCEIVED_TYPE_VIDEO = 4, + PERCEIVED_TYPE_COMPRESSED = 5, + PERCEIVED_TYPE_DOCUMENT = 6, + PERCEIVED_TYPE_SYSTEM = 7, + PERCEIVED_TYPE_APPLICATION = 8, + PERCEIVED_TYPE_GAMEMEDIA = 9, + PERCEIVED_TYPE_CONTACTS = 10 +} PERCEIVED; + +cpp_quote("#define PERCEIVEDFLAG_UNDEFINED 0x0000") +cpp_quote("#define PERCEIVEDFLAG_SOFTCODED 0x0001") +cpp_quote("#define PERCEIVEDFLAG_HARDCODED 0x0002") +cpp_quote("#define PERCEIVEDFLAG_NATIVESUPPORT 0x0004") +cpp_quote("#define PERCEIVEDFLAG_GDIPLUS 0x0010") +cpp_quote("#define PERCEIVEDFLAG_WMSDK 0x0020") +cpp_quote("#define PERCEIVEDFLAG_ZIPFOLDER 0x0040")

1 0

Vincent Povirk : gdiplus: Forbid creating path gradients with fewer than 2 points.
by Alexandre Julliard 02 Apr '12

02 Apr '12

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

Vincent Povirk : gdiplus: Implement GdipGetPathGradientTransform.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 52bf030b84c502bc67bcf5a082a4fcbf98c7d571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bf030b84c502bc67bcf5a08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 31 12:59:24 2012 -0500 gdiplus: Implement GdipGetPathGradientTransform. --- dlls/gdiplus/brush.c | 29 ++++++++++++++++++++++++----- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 12 ++++++++++++ 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 07d32dc..aa02598 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -78,6 +78,14 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return stat; } + stat = GdipCloneMatrix(src->transform, &dest->transform); + + if(stat != Ok){ + GdipDeletePath(dest->path); + GdipFree(dest); + return stat; + } + /* blending */ count = src->blendcount; dest->blendcount = count; @@ -94,6 +102,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) if(!dest->blendfac || !dest->blendpos || !dest->surroundcolors || (pcount && (!dest->pblendcolor || !dest->pblendpos))){ GdipDeletePath(dest->path); + GdipDeleteMatrix(dest->transform); GdipFree(dest->blendfac); GdipFree(dest->blendpos); GdipFree(dest->surroundcolors); @@ -503,6 +512,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) { GpRectF bounds; + GpStatus stat; if(!path || !grad) return InvalidParameter; @@ -515,10 +525,18 @@ static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) return OutOfMemory; } + stat = GdipCreateMatrix(&(*grad)->transform); + if (stat != Ok) + { + GdipFree(*grad); + return stat; + } + (*grad)->blendfac = GdipAlloc(sizeof(REAL)); (*grad)->blendpos = GdipAlloc(sizeof(REAL)); (*grad)->surroundcolors = GdipAlloc(sizeof(ARGB)); if(!(*grad)->blendfac || !(*grad)->blendpos || !(*grad)->surroundcolors){ + GdipDeleteMatrix((*grad)->transform); GdipFree((*grad)->blendfac); GdipFree((*grad)->blendpos); GdipFree((*grad)->surroundcolors); @@ -890,6 +908,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) { case BrushTypePathGradient: GdipDeletePath(((GpPathGradient*) brush)->path); + GdipDeleteMatrix(((GpPathGradient*) brush)->transform); GdipFree(((GpPathGradient*) brush)->blendfac); GdipFree(((GpPathGradient*) brush)->blendpos); GdipFree(((GpPathGradient*) brush)->surroundcolors); @@ -1641,14 +1660,14 @@ GpStatus WINGDIPAPI GdipSetPathGradientTransform(GpPathGradient *grad, GpStatus WINGDIPAPI GdipGetPathGradientTransform(GpPathGradient *grad, GpMatrix *matrix) { - static int calls; - TRACE("(%p,%p)\n", grad, matrix); - if(!(calls++)) - FIXME("not implemented\n"); + if (!grad || !matrix) + return InvalidParameter; - return NotImplemented; + memcpy(matrix, grad->transform, sizeof(GpMatrix)); + + return Ok; } GpStatus WINGDIPAPI GdipMultiplyPathGradientTransform(GpPathGradient *grad, diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c9853ec..5d5a92c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -201,6 +201,7 @@ struct GpPathGradient{ ARGB* pblendcolor; /* preset blend colors */ REAL* pblendpos; /* preset blend positions */ INT pblendcount; + GpMatrix *transform; }; struct GpLineGradient{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 885d9a7..2c6c4b2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1192,6 +1192,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, INT min_y, max_y, min_x, max_x; INT x, y; ARGB outer_color; + static int transform_fixme_once; if (fill->focus.X != 0.0 || fill->focus.Y != 0.0) { @@ -1221,6 +1222,17 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, FIXME("path gradient preset blend not implemented\n"); } + if (!transform_fixme_once) + { + BOOL is_identity=TRUE; + GdipIsMatrixIdentity(fill->transform, &is_identity); + if (!is_identity) + { + FIXME("path gradient transform not implemented\n"); + transform_fixme_once = 1; + } + } + stat = GdipClonePath(fill->path, &flat_path); if (stat != Ok)

1 0

Vincent Povirk : gdiplus: Add tests for preset blend accessors.
by Alexandre Julliard 02 Apr '12

02 Apr '12

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

Vincent Povirk : gdiplus: Implement path gradient preset blend accessors.
by Alexandre Julliard 02 Apr '12

02 Apr '12

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

Vincent Povirk : gdiplus: Implement GdipGetPathGradientCenterColor.
by Alexandre Julliard 02 Apr '12

02 Apr '12

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

Jacek Caban : jscript: Fixed jsheap_grow implementation.
by Alexandre Julliard 02 Apr '12

02 Apr '12

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

Hans Leidekker : msi/tests: Add tests for MsiEnumComponents and MsiEnumComponentsEx.
by Alexandre Julliard 02 Apr '12

02 Apr '12

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

Hans Leidekker : msi: Reimplement MsiEnumComponents on top of MsiEnumComponentsEx.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 25b7228274902fef682df818f70a5f675952d0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b7228274902fef682df818f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 17:54:30 2012 +0200 msi: Reimplement MsiEnumComponents on top of MsiEnumComponentsEx. --- dlls/msi/registry.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bc67ab2..31e7b4f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1205,7 +1205,9 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid) DWORD r; WCHAR szwGuid[GUID_SIZE]; - TRACE("%d %p\n", index, lpguid); + TRACE("%u, %p\n", index, lpguid); + + if (!lpguid) return ERROR_INVALID_PARAMETER; r = MsiEnumComponentsW(index, szwGuid); if( r == ERROR_SUCCESS ) @@ -1216,23 +1218,11 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid) UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid) { - HKEY hkey; - REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR szKeyName[SQUISH_GUID_SIZE]; - DWORD r; - - TRACE("%d %p\n", index, lpguid); + TRACE("%u, %p\n", index, lpguid); - r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szInstaller_Components, 0, NULL, 0, access, NULL, &hkey, NULL); - if( r != ERROR_SUCCESS ) - return ERROR_NO_MORE_ITEMS; + if (!lpguid) return ERROR_INVALID_PARAMETER; - r = RegEnumKeyW(hkey, index, szKeyName, SQUISH_GUID_SIZE); - if( r == ERROR_SUCCESS ) - unsquash_guid(szKeyName, lpguid); - - RegCloseKey(hkey); - return r; + return MsiEnumComponentsExW( szAllSid, MSIINSTALLCONTEXT_ALL, index, lpguid, NULL, NULL, NULL ); } UINT WINAPI MsiEnumComponentsExA( LPCSTR user_sid, DWORD ctx, DWORD index, CHAR guid[39],

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012