August 2008 - Wine-commits - list.winehq.org

Adam Petaccia : gdiplus: Implement GdipCreateRegionRectI.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: cf3d4928bd51028ecd633a45f0250c76420d78e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3d4928bd51028ecd633a45f… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 13:56:41 2008 -0400 gdiplus: Implement GdipCreateRegionRectI. --- dlls/gdiplus/region.c | 15 +++++++++++---- dlls/gdiplus/tests/region.c | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 64ac9a5..fb658fd 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -358,12 +358,19 @@ GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *rect, return Ok; } -GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *rect, GpRegion **region) +GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *rect, + GpRegion **region) { - FIXME("(%p, %p): stub\n", rect, region); + GpRectF rectf; - *region = NULL; - return NotImplemented; + TRACE("%p, %p\n", rect, region); + + rectf.X = (REAL)rect->X; + rectf.Y = (REAL)rect->Y; + rectf.Width = (REAL)rect->Width; + rectf.Height = (REAL)rect->Height; + + return GdipCreateRegionRect(&rectf, region); } GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 17a4ba4..738c86d 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -115,8 +115,6 @@ todo_wine rect.Y = 20; rect.Width = 100; rect.Height = 200; -todo_wine -{ status = GdipCreateRegionRectI(&rect, &region); ok(status == Ok, "status %08x\n", status); status = GdipGetRegionDataSize(region, &needed); @@ -127,11 +125,8 @@ todo_wine expect(36, needed); expect_dword(buf, 28); trace("buf[1] = %08x\n", buf[1]); -} expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); -todo_wine -{ expect_dword(buf + 4, RGNDATA_RECT); expect_float(buf + 5, 10.0); expect_float(buf + 6, 20.0); @@ -142,6 +137,8 @@ todo_wine rect.Y = 30; rect.Width = 10; rect.Height = 20; +todo_wine +{ status = GdipCombineRegionRectI(region, &rect, CombineModeIntersect); ok(status == Ok, "status %08x\n", status); rect.X = 100; @@ -150,6 +147,7 @@ todo_wine rect.Height = 50; status = GdipCombineRegionRectI(region, &rect, CombineModeXor); ok(status == Ok, "status %08x\n", status); +} rect.X = 200; rect.Y = 100; @@ -161,6 +159,8 @@ todo_wine rect.Y = 10; rect.Width = 40; rect.Height = 66; +todo_wine +{ status = GdipCombineRegionRectI(region2, &rect, CombineModeUnion); ok(status == Ok, "status %08x\n", status); @@ -172,18 +172,21 @@ todo_wine rect.Width = 22; rect.Height = 55; status = GdipCombineRegionRectI(region, &rect, CombineModeExclude); -todo_wine ok(status == Ok, "status %08x\n", status); +} status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); +todo_wine expect(156, needed); status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); +todo_wine +{ expect(156, needed); expect_dword(buf, 148); - trace("buf[1] = %08x\n", buf[1]); } + trace("buf[1] = %08x\n", buf[1]); expect_magic((DWORD*)(buf + 2)); todo_wine { @@ -223,12 +226,12 @@ todo_wine expect_float(buf + 36, 500.0); expect_float(buf + 37, 22.0); expect_float(buf + 38, 55.0); +} status = GdipDeleteRegion(region2); ok(status == Ok, "status %08x\n", status); status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); -} /* Try some paths */

1 0

Adam Petaccia : gdiplus: Implement GdipCloneRegion.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 40456271d3c61a622c67e183ffadb0e6cb29cfa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40456271d3c61a622c67e183f… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 13:56:45 2008 -0400 gdiplus: Implement GdipCloneRegion. --- dlls/gdiplus/region.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index fb658fd..26b166e 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -162,15 +162,78 @@ static inline void delete_element(region_element* element) } } +static inline GpStatus clone_element(const region_element* element, + region_element** element2) +{ + GpStatus stat; + + *element2 = GdipAlloc(sizeof(region_element)); + if (!*element2) + return OutOfMemory; + + (*element2)->type = element->type; + + switch (element->type) + { + case RegionDataRect: + (*element2)->elementdata.rect = element->elementdata.rect; + break; + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + break; + case RegionDataPath: + (*element2)->elementdata.pathdata.pathheader = element->elementdata.pathdata.pathheader; + stat = GdipClonePath(element->elementdata.pathdata.path, + &(*element2)->elementdata.pathdata.path); + if (stat != Ok) goto clone_out; + break; + default: + stat = clone_element(element->elementdata.combine.left, + &(*element2)->elementdata.combine.left); + if (stat != Ok) goto clone_out; + stat = clone_element(element->elementdata.combine.right, + &(*element2)->elementdata.combine.right); + if (stat != Ok) goto clone_out; + break; + } + + return Ok; + +clone_out: + delete_element(*element2); + *element2 = NULL; + return stat; +} + /***************************************************************************** * GdipCloneRegion [GDIPLUS.@] + * + * Creates a deep copy of the region + * + * PARAMS + * region [I] source region + * clone [O] resulting clone + * + * RETURNS + * SUCCESS: Ok + * FAILURE: InvalidParameter or OutOfMemory */ GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *region, GpRegion **clone) { - FIXME("(%p %p): stub\n", region, clone); + region_element *element; - *clone = NULL; - return NotImplemented; + TRACE("%p %p\n", region, clone); + + if (!(region && clone)) + return InvalidParameter; + + *clone = GdipAlloc(sizeof(GpRegion)); + if (!*clone) + return OutOfMemory; + element = &(*clone)->node; + + (*clone)->header = region->header; + return clone_element(&region->node, &element); } GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, CombineMode mode)

1 0

James Hawkins : advpack: Skip the TranslateInfEx tests in win9x.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 0dcdbcd3cc087d82d140c3fcf054a701517c3b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dcdbcd3cc087d82d140c3fcf… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 4 17:52:01 2008 -0500 advpack: Skip the TranslateInfEx tests in win9x. --- dlls/advpack/tests/advpack.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index eeb35c6..58038f7 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -325,6 +325,13 @@ static void translateinfstringex_test(void) char buffer[MAX_PATH]; DWORD size = MAX_PATH; + hr = pOpenINFEngine(inf_file, NULL, 0, &hinf, NULL); + if (hr == E_UNEXPECTED) + { + skip("Skipping tests on win9x because of brokenness\n"); + return; + } + create_inf_file(); /* need to see if there are any flags */

1 0

Juan Lang : crypt32: Use CryptSIPRetrieveSubjectGuid to determine how to read a message object from a file , rather than assuming the source file is always a PE executable.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 10f23fa7f5a8319de556817f106f7bd227a8d42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f23fa7f5a8319de556817f1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 4 22:04:10 2008 -0700 crypt32: Use CryptSIPRetrieveSubjectGuid to determine how to read a message object from a file, rather than assuming the source file is always a PE executable. --- dlls/crypt32/Makefile.in | 1 - dlls/crypt32/object.c | 62 +++++++++++++++++++++++++++++++++------------ 2 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index 441efc4..16fbd5e 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -6,7 +6,6 @@ VPATH = @srcdir@ MODULE = crypt32.dll IMPORTLIB = crypt32 IMPORTS = user32 advapi32 kernel32 ntdll -DELAYIMPORTS = imagehlp C_SRCS = \ base64.c \ diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 3eb8988..05a6c5f 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -21,7 +21,7 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" -#include "imagehlp.h" +#include "mssip.h" #include "crypt32_private.h" #include "wine/debug.h" @@ -400,8 +400,11 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, HCERTSTORE *phCertStore, HCRYPTMSG *phMsg) { HANDLE file; + GUID subject; BOOL ret = FALSE; + TRACE("%s\n", debugstr_w((LPCWSTR)pvObject)); + if (dwObjectType != CERT_QUERY_OBJECT_FILE) { FIXME("don't know what to do for type %d embedded signed messages\n", @@ -413,28 +416,53 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) { - DWORD len = 0; - - ret = ImageGetCertificateData(file, 0, NULL, &len); - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + ret = CryptSIPRetrieveSubjectGuid((LPCWSTR)pvObject, file, &subject); + if (ret) { - WIN_CERTIFICATE *winCert = HeapAlloc(GetProcessHeap(), 0, len); + SIP_DISPATCH_INFO sip; - if (winCert) + memset(&sip, 0, sizeof(sip)); + sip.cbSize = sizeof(sip); + ret = CryptSIPLoad(&subject, 0, &sip); + if (ret) { - ret = ImageGetCertificateData(file, 0, winCert, &len); + SIP_SUBJECTINFO subjectInfo; + CERT_BLOB blob; + DWORD encodingType; + + memset(&subjectInfo, 0, sizeof(subjectInfo)); + subjectInfo.cbSize = sizeof(subjectInfo); + subjectInfo.pgSubjectType = &subject; + subjectInfo.hFile = file; + subjectInfo.pwsFileName = (LPCWSTR)pvObject; + ret = sip.pfGet(&subjectInfo, &encodingType, 0, &blob.cbData, + NULL); if (ret) { - CERT_BLOB blob = { winCert->dwLength, - winCert->bCertificate }; - - ret = CRYPT_QueryMessageObject(CERT_QUERY_OBJECT_BLOB, - &blob, CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED, - pdwMsgAndCertEncodingType, NULL, phCertStore, phMsg); - if (ret && pdwContentType) - *pdwContentType = CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED; + blob.pbData = CryptMemAlloc(blob.cbData); + if (blob.pbData) + { + ret = sip.pfGet(&subjectInfo, &encodingType, 0, + &blob.cbData, blob.pbData); + if (ret) + { + ret = CRYPT_QueryMessageObject( + CERT_QUERY_OBJECT_BLOB, &blob, + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED, + pdwMsgAndCertEncodingType, NULL, phCertStore, + phMsg); + if (ret && pdwContentType) + *pdwContentType = + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED; + } + CryptMemFree(blob.pbData); + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } } - HeapFree(GetProcessHeap(), 0, winCert); } } CloseHandle(file);

1 0

Nikolay Sivov : gdiplus: Implemented GdipReversePath with tests.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 5887e661b7a3ead57e3eb7dd31b0068a9c3c8cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5887e661b7a3ead57e3eb7dd3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Aug 4 21:45:05 2008 +0400 gdiplus: Implemented GdipReversePath with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 54 +++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/graphicspath.c | 44 ++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 100 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 18e7eeb..add7b0e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -484,7 +484,7 @@ @ stub GdipResetTextureTransform @ stub GdipResetWorldTransform @ stdcall GdipRestoreGraphics(ptr long) -@ stub GdipReversePath +@ stdcall GdipReversePath(ptr) @ stub GdipRotateLineTransform @ stdcall GdipRotateMatrix(ptr long long) @ stub GdipRotatePathGradientTransform diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 136afe7..c5925b6 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -927,6 +927,60 @@ GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count) return Ok; } +GpStatus WINGDIPAPI GdipReversePath(GpPath* path) +{ + INT i, count; + INT start = 0; /* position in reversed path */ + GpPathData revpath; + + if(!path) + return InvalidParameter; + + count = path->pathdata.Count; + + if(count == 0) return Ok; + + revpath.Points = GdipAlloc(sizeof(GpPointF)*count); + revpath.Types = GdipAlloc(sizeof(BYTE)*count); + revpath.Count = count; + if(!revpath.Points || !revpath.Types){ + GdipFree(revpath.Points); + GdipFree(revpath.Types); + return OutOfMemory; + } + + for(i = 0; i < count; i++){ + + /* find next start point */ + if(path->pathdata.Types[count-i-1] == PathPointTypeStart){ + INT j; + for(j = start; j <= i; j++){ + revpath.Points[j] = path->pathdata.Points[count-j-1]; + revpath.Types[j] = path->pathdata.Types[count-j-1]; + } + /* mark start point */ + revpath.Types[start] = PathPointTypeStart; + /* set 'figure' endpoint type */ + if(i-start > 1){ + revpath.Types[i] = path->pathdata.Types[count-start-1] & ~PathPointTypePathTypeMask; + revpath.Types[i] |= revpath.Types[i-1]; + } + else + revpath.Types[i] = path->pathdata.Types[start]; + + start = i+1; + } + } + + memcpy(path->pathdata.Points, revpath.Points, sizeof(GpPointF)*count); + memcpy(path->pathdata.Types, revpath.Types, sizeof(BYTE)*count); + + GdipFree(revpath.Points); + GdipFree(revpath.Types); + + return Ok; +} + GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPointI(GpPath* path, INT x, INT y, GpPen *pen, GpGraphics *graphics, BOOL *result) { diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index eb7e2de..97e92fa 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -813,6 +813,49 @@ static void test_addclosedcurve(void) GdipDeletePath(path); } +static path_test_t reverse_path[] = { + {0.0, 20.0, PathPointTypeStart, 0, 0}, /*0*/ + {25.0, 25.0, PathPointTypeLine, 0, 0}, /*1*/ + {0.0, 30.0, PathPointTypeLine, 0, 0}, /*2*/ + {15.0, 35.0, PathPointTypeStart, 0, 0}, /*3*/ + {0.0, 40.0, PathPointTypeLine, 0, 0}, /*4*/ + {5.0, 45.0, PathPointTypeLine, 0, 0}, /*5*/ + {0.0, 50.0, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 0} /*6*/ + }; + +static void test_reverse(void) +{ + GpStatus status; + GpPath *path; + GpPointF pts[7]; + INT i; + + for(i = 0; i < 7; i++){ + pts[i].X = i * 5.0 * (REAL)(i % 2); + pts[i].Y = 50.0 - i * 5.0; + } + + GdipCreatePath(FillModeAlternate, &path); + + /* NULL argument */ + status = GdipReversePath(NULL); + expect(InvalidParameter, status); + + /* empty path */ + status = GdipReversePath(path); + expect(Ok, status); + + GdipAddPathLine2(path, pts, 4); + GdipClosePathFigure(path); + GdipAddPathLine2(path, &(pts[4]), 3); + + status = GdipReversePath(path); + expect(Ok, status); + ok_path(path, reverse_path, sizeof(reverse_path)/sizeof(path_test_t), FALSE); + + GdipDeletePath(path); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -838,6 +881,7 @@ START_TEST(graphicspath) test_lastpoint(); test_addcurve(); test_addclosedcurve(); + test_reverse(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index dc938ac..4203e16 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -291,6 +291,7 @@ GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPointI(GpPath*,INT,INT,GpPen*, GpStatus WINGDIPAPI GdipIsVisiblePathPoint(GpPath*,REAL,REAL,GpGraphics*,BOOL*); GpStatus WINGDIPAPI GdipIsVisiblePathPointI(GpPath*,INT,INT,GpGraphics*,BOOL*); GpStatus WINGDIPAPI GdipResetPath(GpPath*); +GpStatus WINGDIPAPI GdipReversePath(GpPath*); GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath*,GpFillMode); GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*);

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathPie/ GdipAddPathPieI with test.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: aa0df2300e833a7037577036f6b4c3ba6dc1df66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa0df2300e833a7037577036f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Aug 4 21:45:16 2008 +0400 gdiplus: Implemented GdipAddPathPie/GdipAddPathPieI with test. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphicspath.c | 51 +++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/graphicspath.c | 27 +++++++++++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index add7b0e..57f9734 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -21,8 +21,8 @@ @ stdcall GdipAddPathLine(ptr long long long long) @ stdcall GdipAddPathLineI(ptr long long long long) @ stdcall GdipAddPathPath(ptr ptr long) -@ stub GdipAddPathPie -@ stub GdipAddPathPieI +@ stdcall GdipAddPathPie(ptr long long long long long long) +@ stdcall GdipAddPathPieI(ptr long long long long long long) @ stdcall GdipAddPathPolygon(ptr ptr long) @ stdcall GdipAddPathPolygonI(ptr ptr long) @ stdcall GdipAddPathRectangle(ptr long long long long) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index c5925b6..51407c7 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -546,6 +546,57 @@ GpStatus WINGDIPAPI GdipAddPathPath(GpPath *path, GDIPCONST GpPath* addingPath, return Ok; } +GpStatus WINGDIPAPI GdipAddPathPie(GpPath *path, REAL x, REAL y, REAL width, REAL height, + REAL startAngle, REAL sweepAngle) +{ + GpPointF *ptf; + GpStatus status; + INT i, count; + + if(!path) + return InvalidParameter; + + count = arc2polybezier(NULL, x, y, width, height, startAngle, sweepAngle); + + if(count == 0) + return Ok; + + ptf = GdipAlloc(sizeof(GpPointF)*count); + if(!ptf) + return OutOfMemory; + + arc2polybezier(ptf, x, y, width, height, startAngle, sweepAngle); + + status = GdipAddPathLine(path, (width - x)/2, (height - y)/2, ptf[0].X, ptf[0].Y); + if(status != Ok){ + GdipFree(ptf); + return status; + } + /* one spline is already added as a line endpoint */ + if(!lengthen_path(path, count - 1)){ + GdipFree(ptf); + return OutOfMemory; + } + + memcpy(&(path->pathdata.Points[path->pathdata.Count]), &(ptf[1]),sizeof(GpPointF)*(count-1)); + for(i = 0; i < count-1; i++) + path->pathdata.Types[path->pathdata.Count+i] = PathPointTypeBezier; + + path->pathdata.Count += count-1; + + GdipClosePathFigure(path); + + GdipFree(ptf); + + return status; +} + +GpStatus WINGDIPAPI GdipAddPathPieI(GpPath *path, INT x, INT y, INT width, INT height, + REAL startAngle, REAL sweepAngle) +{ + return GdipAddPathPieI(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); +} + GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath *path, GDIPCONST GpPointF *points, INT count) { INT old_count; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 97e92fa..d08b20b 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -856,6 +856,32 @@ static void test_reverse(void) GdipDeletePath(path); } +static path_test_t addpie_path[] = { + {50.0, 25.0, PathPointTypeStart, 0, 0}, /*0*/ + {97.2, 33.3, PathPointTypeLine, 0, 0}, /*1*/ + {91.8, 40.9, PathPointTypeBezier,0, 0}, /*2*/ + {79.4, 46.8, PathPointTypeBezier,0, 0}, /*3*/ + {63.9, 49.0, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0} /*4*/ + }; + +static void test_addpie(void) +{ + GpStatus status; + GpPath *path; + + GdipCreatePath(FillModeAlternate, &path); + + /* NULL argument */ + status = GdipAddPathPie(NULL, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + expect(InvalidParameter, status); + + status = GdipAddPathPie(path, 0.0, 0.0, 100.0, 50.0, 10.0, 50.0); + expect(Ok, status); + ok_path(path, addpie_path, sizeof(addpie_path)/sizeof(path_test_t), FALSE); + + GdipDeletePath(path); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -882,6 +908,7 @@ START_TEST(graphicspath) test_addcurve(); test_addclosedcurve(); test_reverse(); + test_addpie(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 4203e16..ed88096 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -261,6 +261,8 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); +GpStatus WINGDIPAPI GdipAddPathPie(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipAddPathPieI(GpPath*,INT,INT,INT,INT,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath*,REAL,REAL,REAL,REAL);

1 0

Adam Petaccia : gdiplus: Implement GdipGetRegionData.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: f52c211ac38eafe4369f23e15b1c82f64577d49f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52c211ac38eafe4369f23e15… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 13:56:25 2008 -0400 gdiplus: Implement GdipGetRegionData. --- dlls/gdiplus/region.c | 163 ++++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/region.c | 39 ++++++----- 2 files changed, 182 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f52c211ac38eafe4369f2…

1 0

Reece Dunn : shlwapi: Fixed the string tests on Vista.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: aa584f146a45b631d046154dd0bd060cd77f0415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa584f146a45b631d046154dd… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Mon Aug 4 09:26:06 2008 +0100 shlwapi: Fixed the string tests on Vista. --- dlls/shlwapi/tests/string.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 79a645c..0875221 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -35,6 +35,11 @@ ok(ret == val, "Unexpected value of '" #expr "': " #fmt " instead of " #val "\n", ret); \ } while (0); +#define expect_eq2(expr, val1, val2, type, fmt) do { \ + type ret = expr; \ + ok(ret == val1 || ret == val2, "Unexpected value of '" #expr "': " #fmt " instead of " #val1 " or " #val2 "\n", ret); \ +} while (0); + static BOOL (WINAPI *pIntlStrEqWorkerA)(BOOL,LPCSTR,LPCSTR,int); static BOOL (WINAPI *pIntlStrEqWorkerW)(BOOL,LPCWSTR,LPCWSTR,int); static DWORD (WINAPI *pSHAnsiToAnsi)(LPCSTR,LPSTR,int); @@ -850,7 +855,7 @@ static void test_StrXXX_overflows(void) memset(wbuf, 0xbf, sizeof(wbuf)); strret.uType = STRRET_WSTR; U(strret).pOleStr = StrDupW(wstr1); - expect_eq(pStrRetToBufW(&strret, NULL, wbuf, 10), S_OK, HRESULT, "%x"); + expect_eq2(pStrRetToBufW(&strret, NULL, wbuf, 10), S_OK, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) /* Vista */, HRESULT, "%x"); expect_eq(wbuf[9], 0, WCHAR, "%x"); expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); } @@ -862,7 +867,7 @@ static void test_StrXXX_overflows(void) memset(buf, 0xbf, sizeof(buf)); strret.uType = STRRET_CSTR; StrCpyN(U(strret).cStr, str1, MAX_PATH); - expect_eq(pStrRetToBufA(&strret, NULL, buf, 10), S_OK, HRESULT, "%x"); + expect_eq2(pStrRetToBufA(&strret, NULL, buf, 10), S_OK, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) /* Vista */, HRESULT, "%x"); expect_eq(buf[9], 0, CHAR, "%x"); expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); } @@ -873,7 +878,7 @@ static void test_StrXXX_overflows(void) { memset(buf, 0xbf, sizeof(buf)); ret = pwnsprintfA(buf, 10, "%s", str1); - todo_wine ok(ret == 9, "Unexpected wsnprintfA return %d, expected 9\n", ret); + ok(broken(ret == 9) || ret == -1 /* Vista */, "Unexpected wsnprintfA return %d, expected 9 or -1\n", ret); expect_eq(buf[9], 0, CHAR, "%x"); expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); } @@ -884,7 +889,7 @@ static void test_StrXXX_overflows(void) { memset(wbuf, 0xbf, sizeof(wbuf)); ret = pwnsprintfW(wbuf, 10, fmt, wstr1); - todo_wine ok(ret == 9, "Unexpected wsnprintfW return %d, expected 9\n", ret); + ok(broken(ret == 9) || ret == -1 /* Vista */, "Unexpected wsnprintfW return %d, expected 9 or -1\n", ret); expect_eq(wbuf[9], 0, WCHAR, "%x"); expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); }

1 0

Huw Davies : gdi32: Keep track of the number of unique fonts that are created and return this in the second DWORD of the GdiRealizationInfo structure .
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 29637c14415fc8913eccf7eef145c876421232e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29637c14415fc8913eccf7eef… Author: Huw Davies <daviesh(a)huw-davies-computer.local> Date: Thu Jul 31 16:47:22 2008 +0100 gdi32: Keep track of the number of unique fonts that are created and return this in the second DWORD of the GdiRealizationInfo structure. --- dlls/gdi32/font.c | 22 ++++++---------------- dlls/gdi32/freetype.c | 28 ++++++++++++++++++++++++++-- dlls/gdi32/gdi_private.h | 12 ++++++++++++ 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 013cd2a..1e8cac3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3254,14 +3254,6 @@ BOOL WINAPI FontIsLinked(HDC hdc) return ret; } -typedef struct -{ - DWORD flags; /* 1 for bitmap fonts, 3 for scalable fonts */ - DWORD unknown1; /* keeps incrementing - num of fonts that have been created or selected into a dc ?? */ - DWORD unknown2; /* fixed for a given font - looks like it could be the order of the face in the font list or the order - in which the face was first rendered. */ -} realization_info_t; - /************************************************************* * GdiRealizationInfo (GDI32.@) * @@ -3269,14 +3261,12 @@ typedef struct */ BOOL WINAPI GdiRealizationInfo(HDC hdc, realization_info_t *info) { - UINT otm_size; - FIXME("(%p, %p): stub!\n", hdc, info); + DC *dc = get_dc_ptr(hdc); + BOOL ret = FALSE; - info->flags = 1; - otm_size = GetOutlineTextMetricsW(hdc, 0, NULL); - if(otm_size) info->flags |= 2; /* scalable */ + if (!dc) return FALSE; + if (dc->gdiFont) ret = WineEngRealizationInfo(dc->gdiFont, info); + release_dc_ptr(dc); - info->unknown1 = -1; - info->unknown2 = -1; - return TRUE; + return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a2110ab..bb3c7d3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -335,6 +335,7 @@ struct tagGdiFont { FONTSIGNATURE fs; GdiFont *base_font; VOID *GSUB_Table; + DWORD cache_num; }; typedef struct { @@ -3113,7 +3114,14 @@ static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const FMAT2 *pma return NULL; } - +static void add_to_cache(GdiFont *font) +{ + static DWORD cache_num = 1; + + font->cache_num = cache_num++; + list_add_head(&gdi_font_list, &font->entry); +} + /************************************************************* * create_child_font_list */ @@ -3604,7 +3612,7 @@ found: TRACE("caching: gdiFont=%p hfont=%p\n", ret, hfont); - list_add_head(&gdi_font_list, &ret->entry); + add_to_cache(ret); LeaveCriticalSection( &freetype_cs ); return ret; } @@ -5748,6 +5756,22 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) return TRUE; } +/************************************************************* + * WineEngRealizationInfo + */ +BOOL WineEngRealizationInfo(GdiFont *font, realization_info_t *info) +{ + FIXME("(%p, %p): stub!\n", font, info); + + info->flags = 1; + if(FT_IS_SCALABLE(font->ft_face)) + info->flags |= 2; + + info->cache_num = font->cache_num; + info->unknown2 = -1; + return TRUE; +} + /************************************************************************* * Kerning support for TrueType fonts */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index aa38b95..325c708 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -420,6 +420,17 @@ extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DE extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; /* freetype.c */ + +/* Undocumented structure filled in by GdiRealizationInfo */ +typedef struct +{ + DWORD flags; /* 1 for bitmap fonts, 3 for scalable fonts */ + DWORD cache_num; /* keeps incrementing - num of fonts that have been created allowing for caching?? */ + DWORD unknown2; /* fixed for a given font - looks like it could be the order of the face in the font list or the order + in which the face was first rendered. */ +} realization_info_t; + + extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern GdiFont* WineEngCreateFontInstance(DC*, HFONT) DECLSPEC_HIDDEN; @@ -447,6 +458,7 @@ extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngGetTextMetrics(GdiFont*, LPTEXTMETRICW) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; +extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDEN; extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; /* gdiobj.c */

1 0

Dan Kegel : shell32/tests: Test whether SHGetFileInfo should clear hIcon.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: f0864c55eb9713966e78df5297beb3f436261a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0864c55eb9713966e78df529… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Aug 4 15:19:02 2008 -0700 shell32/tests: Test whether SHGetFileInfo should clear hIcon. --- dlls/shell32/tests/shlfileop.c | 75 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 9b5220a..1cedcfb 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -154,19 +154,45 @@ static void clean_after_shfo_tests(void) static void test_get_file_info(void) { DWORD rc, rc2; - SHFILEINFO shfi, shfi2; + SHFILEINFOA shfi, shfi2; + SHFILEINFOW shfiw; char notepad[MAX_PATH]; + /* Test whether fields of SHFILEINFOA are always cleared */ + memset(&shfi, 0xcf, sizeof(shfi)); + rc=SHGetFileInfoA("", 0, &shfi, sizeof(shfi), 0); + ok(rc, "SHGetFileInfoA('' | 0) should not fail\n"); + todo_wine ok(shfi.hIcon == 0, "SHGetFileInfoA('' | 0) did not clear hIcon\n"); + todo_wine ok(shfi.szDisplayName[0] == 0, "SHGetFileInfoA('' | 0) did not clear szDisplayName[0]\n"); + todo_wine ok(shfi.szTypeName[0] == 0, "SHGetFileInfoA('' | 0) did not clear szTypeName[0]\n"); + ok(shfi.iIcon == 0xcfcfcfcf, "SHGetFileInfoA('' | 0) should not clear iIcon\n"); + ok(shfi.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoA('' | 0) should not clear dwAttributes\n"); + + /* Test whether fields of SHFILEINFOW are always cleared */ + memset(&shfiw, 0xcf, sizeof(shfiw)); + rc=SHGetFileInfoW(NULL, 0, &shfiw, sizeof(shfiw), 0); + todo_wine ok(!rc, "SHGetFileInfoW(NULL | 0) should fail\n"); + ok(shfiw.hIcon == (HANDLE) 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear hIcon\n"); + todo_wine ok(shfiw.szDisplayName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szDisplayName[0]\n"); + todo_wine ok(shfiw.szTypeName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szTypeName[0]\n"); + todo_wine ok(shfiw.iIcon == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear iIcon\n"); + ok(shfiw.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear dwAttributes\n"); + + /* Test some flag combinations that MSDN claims are not allowed, * but which work anyway */ - shfi.dwAttributes=0xdeadbeef; + memset(&shfi, 0xcf, sizeof(shfi)); rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), SHGFI_ATTRIBUTES | SHGFI_USEFILEATTRIBUTES); todo_wine ok(rc, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) failed\n"); if (rc) - ok(shfi.dwAttributes != 0xdeadbeef, "dwFileAttributes is not set\n"); + ok(shfi.dwAttributes != 0xcfcfcfcf, "dwFileAttributes is not set\n"); + todo_wine ok(shfi.hIcon == 0, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) did not clear hIcon\n"); + todo_wine ok(shfi.szDisplayName[0] == 0, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) did not clear szDisplayName[0]\n"); + todo_wine ok(shfi.szTypeName[0] == 0, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) did not clear szTypeName[0]\n"); + ok(shfi.iIcon == 0xcfcfcfcf, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) should not clear iIcon\n"); rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), @@ -230,6 +256,48 @@ static void test_get_file_info(void) } } +static void test_get_file_info_iconlist(void) +{ + /* Test retrieving a handle to the system image list, and + * what that returns for hIcon + */ + HRESULT hr; + HIMAGELIST hSysImageList; + LPITEMIDLIST pidList; + SHFILEINFOA shInfoa; + SHFILEINFOW shInfow; + + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidList); + if (!SUCCEEDED(hr)) { + skip("can't get desktop pidl\n"); + return; + } + + memset(&shInfoa, 0xcf, sizeof(shInfoa)); + hSysImageList = (HIMAGELIST) SHGetFileInfoA((const char *)pidList, 0, + &shInfoa, sizeof(shInfoa), + SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_PIDL); + ok(hSysImageList != INVALID_HANDLE_VALUE, "Can't get handle for CSIDL_DESKTOP imagelist\n"); + todo_wine ok(shInfoa.hIcon == 0, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon\n"); + todo_wine ok(shInfoa.szTypeName[0] == 0, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]\n"); + ok(shInfoa.iIcon != 0xcfcfcfcf, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should set iIcon\n"); + ok(shInfoa.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should not change dwAttributes\n"); + CloseHandle(hSysImageList); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hSysImageList = (HIMAGELIST) SHGetFileInfoW((const WCHAR *)pidList, 0, + &shInfow, sizeof(shInfow), + SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_PIDL); + ok(hSysImageList != INVALID_HANDLE_VALUE, "Can't get handle for CSIDL_DESKTOP imagelist\n"); + todo_wine ok(shInfow.hIcon == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon\n"); + ok(shInfow.szTypeName[0] == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]\n"); + ok(shInfow.iIcon != 0xcfcfcfcf, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should set iIcon\n"); + ok(shInfow.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should not change dwAttributes\n"); + CloseHandle(hSysImageList); + + ILFree(pidList); +} + /* puts into the specified buffer file names with current directory. @@ -1447,6 +1515,7 @@ START_TEST(shlfileop) init_shfo_tests(); test_get_file_info(); + test_get_file_info_iconlist(); clean_after_shfo_tests(); init_shfo_tests();

1 0