February 2009 - Wine-commits

Marcus Meissner : winedbg: Check for buffer being NULL.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 102a3b9892cc4253aee595c915673cf537d15cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=102a3b9892cc4253aee595c91… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 19:53:19 2009 +0100 winedbg: Check for buffer being NULL. --- programs/winedbg/symbol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index c4b09a3..03efac1 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -102,7 +102,7 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG base, */ if (!types_get_info(&type, TI_GET_VALUE, &v) || (v.n1.n2.vt & VT_BYREF)) { - snprintf(buffer, sz, "Couldn't dereference pointer for const value"); + if (buffer) snprintf(buffer, sz, "Couldn't dereference pointer for const value"); return FALSE; } pdw = (DWORD*)lexeme_alloc_size(sizeof(*pdw));

1 0

Marcus Meissner : msacm32: Add missing HeapALloc failure checks (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: f0b685d5045e12ba670ee69fcf032e2fec60b42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b685d5045e12ba670ee69fc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 21:53:36 2009 +0100 msacm32: Add missing HeapALloc failure checks (Coverity). --- dlls/msacm32/internal.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index cf76a57..4100aae 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -289,18 +289,29 @@ PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileNa debugstr_w(pszDriverAlias), debugstr_w(pszFileName), pLocalDriver); padid = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMDRIVERID)); + if (!padid) + return NULL; padid->obj.dwType = WINE_ACMOBJ_DRIVERID; padid->obj.pACMDriverID = padid; padid->pszDriverAlias = NULL; if (pszDriverAlias) { padid->pszDriverAlias = HeapAlloc( MSACM_hHeap, 0, (strlenW(pszDriverAlias)+1) * sizeof(WCHAR) ); + if (!padid->pszDriverAlias) { + HeapFree(MSACM_hHeap, 0, padid); + return NULL; + } strcpyW( padid->pszDriverAlias, pszDriverAlias ); } padid->pszFileName = NULL; if (pszFileName) { padid->pszFileName = HeapAlloc( MSACM_hHeap, 0, (strlenW(pszFileName)+1) * sizeof(WCHAR) ); + if (!padid->pszFileName) { + HeapFree(MSACM_hHeap, 0, padid->pszDriverAlias); + HeapFree(MSACM_hHeap, 0, padid); + return NULL; + } strcpyW( padid->pszFileName, pszFileName ); } padid->pLocalDriver = pLocalDriver;

1 0

Marcus Meissner : wrc: Free type to avoid leaks (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: fc3b99b90a91f97d706eda08db4931ddc4c31522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc3b99b90a91f97d706eda08d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 22:14:57 2009 +0100 wrc: Free type to avoid leaks (Coverity). --- tools/wrc/readres.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wrc/readres.c b/tools/wrc/readres.c index e3a4db7..f7aaba8 100644 --- a/tools/wrc/readres.c +++ b/tools/wrc/readres.c @@ -292,7 +292,10 @@ static resource_t *read_res32(FILE *fp) usrres = new_user(type, NULL, new_int(memopt)); } else + { + free (type); usrres = NULL; + } rsc = new_resource(res_type, usrres, memopt,

1 0

Marcus Meissner : services: Handle realloc failures better (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 2c7ac13662915858046f2f94fe9fcb9d52c6ff96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c7ac13662915858046f2f94f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 11:44:12 2009 +0100 services: Handle realloc failures better (Coverity). --- programs/services/services.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 003771f..9bed784 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -242,10 +242,12 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) { if (i+1 >= size) { + struct service_entry **slist_new; size *= 2; - services_list = HeapReAlloc(GetProcessHeap(), 0, services_list, size * sizeof(services_list[0])); - if (!services_list) + slist_new = HeapReAlloc(GetProcessHeap(), 0, services_list, size * sizeof(services_list[0])); + if (!slist_new) break; + services_list = slist_new; } services_list[i] = service; service->ref_count++;

1 0

Marcus Meissner : kernel32: Handle username conversion failure (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 5493b77290a91045d9cd0154248da1ab0a67ad90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5493b77290a91045d9cd01542… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 11:50:21 2009 +0100 kernel32: Handle username conversion failure (Coverity). --- dlls/kernel32/process.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 942b97a..56e23b8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -495,6 +495,7 @@ static void set_additional_environment(void) MultiByteToWideChar( CP_UNIXCP, 0, name, -1, user_name, len ); SetEnvironmentVariableW( usernameW, user_name ); } + else WARN( "user name %s not convertible.\n", debugstr_a(name) ); /* set the USERPROFILE and ALLUSERSPROFILE variables */ @@ -522,8 +523,10 @@ static void set_additional_environment(void) strcpyW( value, profile_dir ); p = value + strlenW(value); if (p > value && p[-1] != '\\') *p++ = '\\'; - strcpyW( p, user_name ); - SetEnvironmentVariableW( userprofileW, value ); + if (user_name) { + strcpyW( p, user_name ); + SetEnvironmentVariableW( userprofileW, value ); + } if (all_users_dir) { strcpyW( p, all_users_dir );

1 0

Marcus Meissner : oleaut32: Removed useless NULL ptr check (Coverity).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 4d8fffb24ba65787d001208f4d19afb1b3a30642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8fffb24ba65787d001208f4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 31 13:15:32 2009 +0100 oleaut32: Removed useless NULL ptr check (Coverity). --- dlls/oleaut32/typelib.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 503aaf7..d3168ec 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3952,23 +3952,23 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) } - if(pTITail) { /* could get cFuncs, cVars and cImplTypes from here + /* could get cFuncs, cVars and cImplTypes from here but we've already set those */ #define X(x) TRACE_(typelib)("tt "#x": %x\n",pTITail->res##x); - X(06); - X(16); - X(18); - X(1a); - X(1e); - X(24); - X(26); - X(2a); - X(2c); - X(2e); - X(30); - X(32); - X(34); - } + X(06); + X(16); + X(18); + X(1a); + X(1e); + X(24); + X(26); + X(2a); + X(2c); + X(2e); + X(30); + X(32); + X(34); +#undef X ppTypeInfoImpl = &((*ppTypeInfoImpl)->next); pBlk = (char*)pBlk + pBlkEntry[order].len; }

1 0

Nikolay Sivov : gdiplus: Implemented GdipIsEqualRegion.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 03a02d83dd4dc4f84bcfaebf8457b341fa56c010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a02d83dd4dc4f84bcfaebf8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 30 22:19:22 2009 +0300 gdiplus: Implemented GdipIsEqualRegion. --- dlls/gdiplus/region.c | 31 +++++++++++++- dlls/gdiplus/tests/region.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index e4cc7d8..6b510b6 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1006,12 +1006,39 @@ GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *region, GpGraphics *graphics, BO return Ok; } +/***************************************************************************** + * GdipIsEqualRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *region, GpRegion *region2, GpGraphics *graphics, BOOL *res) { - FIXME("(%p, %p, %p, %p): stub\n", region, region2, graphics, res); + HRGN hrgn1, hrgn2; + GpStatus stat; - return NotImplemented; + TRACE("(%p, %p, %p, %p)\n", region, region2, graphics, res); + + if(!region || !region2 || !graphics || !res) + return InvalidParameter; + + stat = GdipGetRegionHRgn(region, graphics, &hrgn1); + if(stat != Ok) + return stat; + stat = GdipGetRegionHRgn(region2, graphics, &hrgn2); + if(stat != Ok){ + DeleteObject(hrgn1); + return stat; + } + + *res = EqualRgn(hrgn1, hrgn2); + + /* one of GpRegions is infinite */ + if(*res == ERROR) + *res = (!hrgn1 && !hrgn2); + + DeleteObject(hrgn1); + DeleteObject(hrgn2); + + return Ok; } /***************************************************************************** diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 784b1b9..b6b03c5 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -951,6 +951,98 @@ static void test_gethrgn(void) ReleaseDC(0, hdc); } +static void test_isequal(void) +{ + GpRegion *region1, *region2; + GpGraphics *graphics; + GpRectF rectf; + GpStatus status; + HDC hdc = GetDC(0); + BOOL res; + + status = GdipCreateFromHDC(hdc, &graphics); + ok(status == Ok, "status %08x\n", status); + + status = GdipCreateRegion(&region1); + ok(status == Ok, "status %08x\n", status); + status = GdipCreateRegion(&region2); + ok(status == Ok, "status %08x\n", status); + + /* NULL */ + status = GdipIsEqualRegion(NULL, NULL, NULL, NULL); + ok(status == InvalidParameter, "status %08x\n", status); + status = GdipIsEqualRegion(region1, region2, NULL, NULL); + ok(status == InvalidParameter, "status %08x\n", status); + status = GdipIsEqualRegion(region1, region2, graphics, NULL); + ok(status == InvalidParameter, "status %08x\n", status); + status = GdipIsEqualRegion(region1, region2, NULL, &res); + ok(status == InvalidParameter, "status %08x\n", status); + + /* infinite regions */ + res = FALSE; + status = GdipIsEqualRegion(region1, region2, graphics, &res); + ok(status == Ok, "status %08x\n", status); + ok(res, "Expected to be equal.\n"); + /* empty regions */ + status = GdipSetEmpty(region1); + ok(status == Ok, "status %08x\n", status); + status = GdipSetEmpty(region2); + ok(status == Ok, "status %08x\n", status); + res = FALSE; + status = GdipIsEqualRegion(region1, region2, graphics, &res); + ok(status == Ok, "status %08x\n", status); + ok(res, "Expected to be equal.\n"); + /* empty & infinite */ + status = GdipSetInfinite(region1); + ok(status == Ok, "status %08x\n", status); + res = TRUE; + status = GdipIsEqualRegion(region1, region2, graphics, &res); + ok(status == Ok, "status %08x\n", status); + ok(!res, "Expected to be unequal.\n"); + /* rect & (inf/empty) */ + rectf.X = rectf.Y = 0.0; + rectf.Width = rectf.Height = 100.0; + status = GdipCombineRegionRect(region1, &rectf, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + res = TRUE; + status = GdipIsEqualRegion(region1, region2, graphics, &res); + ok(status == Ok, "status %08x\n", status); + ok(!res, "Expected to be unequal.\n"); + status = GdipSetInfinite(region2); + ok(status == Ok, "status %08x\n", status); + res = TRUE; + status = GdipIsEqualRegion(region1, region2, graphics, &res); + ok(status == Ok, "status %08x\n", status); + ok(!res, "Expected to be unequal.\n"); + /* roughly equal rectangles */ + rectf.X = rectf.Y = 0.0; + rectf.Width = rectf.Height = 100.001; + status = GdipCombineRegionRect(region2, &rectf, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + res = FALSE; + status = GdipIsEqualRegion(region1, region2, graphics, &res); + ok(status == Ok, "status %08x\n", status); + ok(res, "Expected to be equal.\n"); + /* equal rectangles */ + rectf.X = rectf.Y = 0.0; + rectf.Width = rectf.Height = 100.0; + status = GdipCombineRegionRect(region2, &rectf, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + res = FALSE; + status = GdipIsEqualRegion(region1, region2, graphics, &res); + ok(status == Ok, "status %08x\n", status); + ok(res, "Expected to be equal.\n"); + + /* cleanup */ + status = GdipDeleteRegion(region1); + ok(status == Ok, "status %08x\n", status); + status = GdipDeleteRegion(region2); + ok(status == Ok, "status %08x\n", status); + status = GdipDeleteGraphics(graphics); + ok(status == Ok, "status %08x\n", status); + ReleaseDC(0, hdc); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -969,6 +1061,7 @@ START_TEST(region) test_combinereplace(); test_fromhrgn(); test_gethrgn(); + test_isequal(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Implemented GdipTranslateRegion.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: c3462b11014f975530f90109269419de2ca4717e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3462b11014f975530f901092… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 30 23:01:14 2009 +0300 gdiplus: Implemented GdipTranslateRegion. --- dlls/gdiplus/region.c | 39 ++++++++++++++++++++- dlls/gdiplus/tests/region.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 6b510b6..0fe6782 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1097,11 +1097,46 @@ GpStatus WINGDIPAPI GdipTransformRegion(GpRegion *region, GpMatrix *matrix) return NotImplemented; } +/* Translates GpRegion elements with specified offsets */ +static void translate_region_element(region_element* element, REAL dx, REAL dy) +{ + INT i; + + switch(element->type) + { + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + return; + case RegionDataRect: + element->elementdata.rect.X += dx; + element->elementdata.rect.Y += dy; + return; + case RegionDataPath: + for(i = 0; i < element->elementdata.pathdata.path->pathdata.Count; i++){ + element->elementdata.pathdata.path->pathdata.Points[i].X += dx; + element->elementdata.pathdata.path->pathdata.Points[i].Y += dy; + } + return; + default: + translate_region_element(element->elementdata.combine.left, dx, dy); + translate_region_element(element->elementdata.combine.right, dx, dy); + return; + } +} + +/***************************************************************************** + * GdipTranslateRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipTranslateRegion(GpRegion *region, REAL dx, REAL dy) { - FIXME("(%p, %f, %f): stub\n", region, dx, dy); + TRACE("(%p, %f, %f)\n", region, dx, dy); - return NotImplemented; + if(!region) + return InvalidParameter; + + translate_region_element(&region->node, dx, dy); + + return Ok; } GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *region, INT dx, INT dy) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index b6b03c5..294fed7 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -1043,6 +1043,83 @@ static void test_isequal(void) ReleaseDC(0, hdc); } +static void test_translate(void) +{ + GpRegion *region, *region2; + GpGraphics *graphics; + GpPath *path; + GpRectF rectf; + GpStatus status; + HDC hdc = GetDC(0); + BOOL res; + + status = GdipCreateFromHDC(hdc, &graphics); + ok(status == Ok, "status %08x\n", status); + + status = GdipCreatePath(FillModeAlternate, &path); + ok(status == Ok, "status %08x\n", status); + + status = GdipCreateRegion(&region); + ok(status == Ok, "status %08x\n", status); + status = GdipCreateRegion(&region2); + ok(status == Ok, "status %08x\n", status); + + /* NULL */ + status = GdipTranslateRegion(NULL, 0.0, 0.0); + ok(status == InvalidParameter, "status %08x\n", status); + + /* infinite */ + status = GdipTranslateRegion(region, 10.0, 10.0); + ok(status == Ok, "status %08x\n", status); + /* empty */ + status = GdipSetEmpty(region); + ok(status == Ok, "status %08x\n", status); + status = GdipTranslateRegion(region, 10.0, 10.0); + ok(status == Ok, "status %08x\n", status); + /* rect */ + rectf.X = 10.0; rectf.Y = 0.0; + rectf.Width = rectf.Height = 100.0; + status = GdipCombineRegionRect(region, &rectf, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + rectf.X = 15.0; rectf.Y = -2.0; + rectf.Width = rectf.Height = 100.0; + status = GdipCombineRegionRect(region2, &rectf, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + status = GdipTranslateRegion(region, 5.0, -2.0); + ok(status == Ok, "status %08x\n", status); + res = FALSE; + status = GdipIsEqualRegion(region, region2, graphics, &res); + ok(status == Ok, "status %08x\n", status); + ok(res, "Expected to be equal.\n"); + /* path */ + status = GdipAddPathEllipse(path, 0.0, 10.0, 100.0, 150.0); + ok(status == Ok, "status %08x\n", status); + status = GdipCombineRegionPath(region, path, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + status = GdipResetPath(path); + ok(status == Ok, "status %08x\n", status); + status = GdipAddPathEllipse(path, 10.0, 21.0, 100.0, 150.0); + ok(status == Ok, "status %08x\n", status); + status = GdipCombineRegionPath(region2, path, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + status = GdipTranslateRegion(region, 10.0, 11.0); + ok(status == Ok, "status %08x\n", status); + res = FALSE; + status = GdipIsEqualRegion(region, region2, graphics, &res); + ok(status == Ok, "status %08x\n", status); + ok(res, "Expected to be equal.\n"); + + status = GdipDeleteRegion(region); + ok(status == Ok, "status %08x\n", status); + status = GdipDeleteRegion(region2); + ok(status == Ok, "status %08x\n", status); + status = GdipDeleteGraphics(graphics); + ok(status == Ok, "status %08x\n", status); + status = GdipDeletePath(path); + ok(status == Ok, "status %08x\n", status); + ReleaseDC(0, hdc); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1062,6 +1139,7 @@ START_TEST(region) test_fromhrgn(); test_gethrgn(); test_isequal(); + test_translate(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Implemented GdipTranslateRegionI.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: cb8f4eb16c27b83de86ed52ac4a88e8005fd71b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8f4eb16c27b83de86ed52ac… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 30 23:03:17 2009 +0300 gdiplus: Implemented GdipTranslateRegionI. --- dlls/gdiplus/region.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 0fe6782..cc3b6cb 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1139,9 +1139,12 @@ GpStatus WINGDIPAPI GdipTranslateRegion(GpRegion *region, REAL dx, REAL dy) return Ok; } +/***************************************************************************** + * GdipTranslateRegionI [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *region, INT dx, INT dy) { - FIXME("(%p, %d, %d): stub\n", region, dx, dy); + TRACE("(%p, %d, %d)\n", region, dx, dy); - return NotImplemented; + return GdipTranslateRegion(region, (REAL)dx, (REAL)dy); }

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetRegionBounds/ GdipGetRegionBoundsI.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: dc3908a351875c5c7ff7ee69684eef56a317d128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3908a351875c5c7ff7ee696… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 30 23:56:01 2009 +0300 gdiplus: Implemented GdipGetRegionBounds/GdipGetRegionBoundsI. --- dlls/gdiplus/region.c | 56 ++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/tests/region.c | 62 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index cc3b6cb..e42c5cd 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -634,18 +634,66 @@ GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) return Ok; } +/***************************************************************************** + * GdipGetRegionBounds [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, GpRectF *rect) { - FIXME("(%p, %p, %p): stub\n", region, graphics, rect); + HRGN hrgn; + RECT r; + GpStatus status; - return NotImplemented; + TRACE("(%p, %p, %p)\n", region, graphics, rect); + + if(!region || !graphics || !rect) + return InvalidParameter; + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + if(status != Ok) + return status; + + /* infinite */ + if(!hrgn){ + rect->X = rect->Y = -(REAL)(1 << 22); + rect->Width = rect->Height = (REAL)(1 << 23); + return Ok; + } + + if(!GetRgnBox(hrgn, &r)){ + DeleteObject(hrgn); + return GenericError; + } + + rect->X = r.left; + rect->Y = r.top; + rect->Width = r.right - r.left; + rect->Height = r.bottom - r.top; + + return Ok; } +/***************************************************************************** + * GdipGetRegionBoundsI [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipGetRegionBoundsI(GpRegion *region, GpGraphics *graphics, GpRect *rect) { - FIXME("(%p, %p, %p): stub\n", region, graphics, rect); + GpRectF rectf; + GpStatus status; - return NotImplemented; + TRACE("(%p, %p, %p)\n", region, graphics, rect); + + if(!rect) + return InvalidParameter; + + status = GdipGetRegionBounds(region, graphics, &rectf); + if(status == Ok){ + rect->X = roundr(rectf.X); + rect->Y = roundr(rectf.X); + rect->Width = roundr(rectf.Width); + rect->Height = roundr(rectf.Height); + } + + return status; } static inline void write_dword(DWORD* location, INT* offset, const DWORD write) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 294fed7..689811c 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -1120,6 +1120,67 @@ static void test_translate(void) ReleaseDC(0, hdc); } +static void test_getbounds(void) +{ + GpRegion *region; + GpGraphics *graphics; + GpStatus status; + GpRectF rectf; + HDC hdc = GetDC(0); + + status = GdipCreateFromHDC(hdc, &graphics); + ok(status == Ok, "status %08x\n", status); + status = GdipCreateRegion(&region); + ok(status == Ok, "status %08x\n", status); + + /* NULL */ + status = GdipGetRegionBounds(NULL, NULL, NULL); + ok(status == InvalidParameter, "status %08x\n", status); + status = GdipGetRegionBounds(region, NULL, NULL); + ok(status == InvalidParameter, "status %08x\n", status); + status = GdipGetRegionBounds(region, graphics, NULL); + ok(status == InvalidParameter, "status %08x\n", status); + /* infinite */ + rectf.X = rectf.Y = 0.0; + rectf.Height = rectf.Width = 100.0; + status = GdipGetRegionBounds(region, graphics, &rectf); + ok(status == Ok, "status %08x\n", status); + ok(rectf.X == -(REAL)(1 << 22), "Expected X = %.2f, got %.2f\n", -(REAL)(1 << 22), rectf.X); + ok(rectf.Y == -(REAL)(1 << 22), "Expected Y = %.2f, got %.2f\n", -(REAL)(1 << 22), rectf.Y); + ok(rectf.Width == (REAL)(1 << 23), "Expected width = %.2f, got %.2f\n", (REAL)(1 << 23), rectf.Width); + ok(rectf.Height == (REAL)(1 << 23), "Expected height = %.2f, got %.2f\n",(REAL)(1 << 23), rectf.Height); + /* empty */ + rectf.X = rectf.Y = 0.0; + rectf.Height = rectf.Width = 100.0; + status = GdipSetEmpty(region); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionBounds(region, graphics, &rectf); + ok(status == Ok, "status %08x\n", status); + ok(rectf.X == 0.0, "Expected X = 0.0, got %.2f\n", rectf.X); + ok(rectf.Y == 0.0, "Expected Y = 0.0, got %.2f\n", rectf.Y); + ok(rectf.Width == 0.0, "Expected width = 0.0, got %.2f\n", rectf.Width); + ok(rectf.Height == 0.0, "Expected height = 0.0, got %.2f\n", rectf.Height); + /* rect */ + rectf.X = 10.0; rectf.Y = 0.0; + rectf.Width = rectf.Height = 100.0; + status = GdipCombineRegionRect(region, &rectf, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + rectf.X = rectf.Y = 0.0; + rectf.Height = rectf.Width = 0.0; + status = GdipGetRegionBounds(region, graphics, &rectf); + ok(status == Ok, "status %08x\n", status); + ok(rectf.X == 10.0, "Expected X = 0.0, got %.2f\n", rectf.X); + ok(rectf.Y == 0.0, "Expected Y = 0.0, got %.2f\n", rectf.Y); + ok(rectf.Width == 100.0, "Expected width = 0.0, got %.2f\n", rectf.Width); + ok(rectf.Height == 100.0, "Expected height = 0.0, got %.2f\n", rectf.Height); + + status = GdipDeleteRegion(region); + ok(status == Ok, "status %08x\n", status); + status = GdipDeleteGraphics(graphics); + ok(status == Ok, "status %08x\n", status); + ReleaseDC(0, hdc); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1140,6 +1201,7 @@ START_TEST(region) test_gethrgn(); test_isequal(); test_translate(); + test_getbounds(); GdiplusShutdown(gdiplusToken); }

1 0