wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Vincent Povirk : gdiplus: Always treat out of range string sizes as INT_MAX .
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 435762024f4b6cf4aa348b21bfc9477b16abd216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=435762024f4b6cf4aa348b21b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 16:32:18 2010 -0500 gdiplus: Always treat out of range string sizes as INT_MAX. --- dlls/gdiplus/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 879646a..68e422e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3544,8 +3544,8 @@ static GpStatus gdip_format_string(GpGraphics *graphics, nwidth = roundr(rect->Width); nheight = roundr(rect->Height); - if (nwidth == 0 || rect->Width >= INT_MAX) nwidth = INT_MAX; - if (nheight == 0 || rect->Height >= INT_MAX) nheight = INT_MAX; + if (rect->Width >= INT_MAX || rect->Width < 0.5) nwidth = INT_MAX; + if (rect->Height >= INT_MAX || rect->Width < 0.5) nheight = INT_MAX; for(i = 0, j = 0; i < length; i++){ /* FIXME: This makes the indexes passed to callback inaccurate. */

1 0

Vincent Povirk : gdiplus: Implement GdipIsStyleAvailable.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: b7c9adcd064606b60e5c14ae3e384ce4a2714801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c9adcd064606b60e5c14ae3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 15:36:02 2010 -0500 gdiplus: Implement GdipIsStyleAvailable. --- dlls/gdiplus/font.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 3a29771..f198863 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -760,15 +760,41 @@ GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, return Ok; } +static INT CALLBACK font_has_style_proc(const LOGFONTW *elf, + const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) +{ + INT fontstyle=0; + + if (!ntm) return 1; + + if (ntm->tmWeight >= FW_BOLD) fontstyle |= FontStyleBold; + if (ntm->tmItalic) fontstyle |= FontStyleItalic; + if (ntm->tmUnderlined) fontstyle |= FontStyleUnderline; + if (ntm->tmStruckOut) fontstyle |= FontStyleStrikeout; + + return (INT)lParam != fontstyle; +} + GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, INT style, BOOL* IsStyleAvailable) { - FIXME("%p %d %p stub!\n", family, style, IsStyleAvailable); + HDC hdc; + + TRACE("%p %d %p\n", family, style, IsStyleAvailable); if (!(family && IsStyleAvailable)) return InvalidParameter; - return NotImplemented; + *IsStyleAvailable = FALSE; + + hdc = GetDC(0); + + if(!EnumFontFamiliesW(hdc, family->FamilyName, font_has_style_proc, (LPARAM)style)) + *IsStyleAvailable = TRUE; + + ReleaseDC(0, hdc); + + return Ok; } /*****************************************************************************

1 0

Vincent Povirk : gdiplus: Implement GdipGetImageThumbnail.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 7dfc674437a113ea2f515dfbc03270c0be42e41b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfc674437a113ea2f515dfbc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 13:29:53 2010 -0500 gdiplus: Implement GdipGetImageThumbnail. --- dlls/gdiplus/image.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/image.c | 10 +++++----- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0eaaf2e..8b55115 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3515,9 +3515,46 @@ GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage *image, UINT width, UINT heigh GpImage **ret_image, GetThumbnailImageAbort cb, VOID * cb_data) { - FIXME("(%p %u %u %p %p %p) stub\n", + GpStatus stat; + GpGraphics *graphics; + UINT srcwidth, srcheight; + + TRACE("(%p %u %u %p %p %p)\n", image, width, height, ret_image, cb, cb_data); - return NotImplemented; + + if (!image || !ret_image) + return InvalidParameter; + + if (!width) width = 120; + if (!height) height = 120; + + GdipGetImageWidth(image, &srcwidth); + GdipGetImageHeight(image, &srcheight); + + stat = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppARGB, + NULL, (GpBitmap**)ret_image); + + if (stat == Ok) + { + stat = GdipGetImageGraphicsContext(*ret_image, &graphics); + + if (stat == Ok) + { + stat = GdipDrawImageRectRectI(graphics, image, + 0, 0, width, height, 0, 0, srcwidth, srcheight, UnitPixel, + NULL, NULL, NULL); + + GdipDeleteGraphics(graphics); + } + + if (stat != Ok) + { + GdipDisposeImage(*ret_image); + *ret_image = NULL; + } + } + + return stat; } /***************************************************************************** diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 8abb40c..0e33049 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1219,16 +1219,16 @@ static void test_getthumbnail(void) UINT width, height; stat = GdipGetImageThumbnail(NULL, 0, 0, &bitmap2, NULL, NULL); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipCreateBitmapFromScan0(128, 128, 0, PixelFormat32bppRGB, NULL, (GpBitmap**)&bitmap1); expect(Ok, stat); stat = GdipGetImageThumbnail(bitmap1, 0, 0, NULL, NULL, NULL); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipGetImageThumbnail(bitmap1, 0, 0, &bitmap2, NULL, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) { @@ -1250,7 +1250,7 @@ static void test_getthumbnail(void) expect(Ok, stat); stat = GdipGetImageThumbnail(bitmap1, 32, 32, &bitmap2, NULL, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) { @@ -1266,7 +1266,7 @@ static void test_getthumbnail(void) } stat = GdipGetImageThumbnail(bitmap1, 0, 0, &bitmap2, NULL, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) {

1 0

Vincent Povirk : gdiplus: Add test for GdipGetImageThumbnail.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 635fe30eacded85fed671a6e4b8a65666fb44849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=635fe30eacded85fed671a6e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 13:16:33 2010 -0500 gdiplus: Add test for GdipGetImageThumbnail. --- dlls/gdiplus/tests/image.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a981bbf..8abb40c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1212,6 +1212,78 @@ static void test_createhbitmap(void) expect(Ok, stat); } +static void test_getthumbnail(void) +{ + GpStatus stat; + GpImage *bitmap1, *bitmap2; + UINT width, height; + + stat = GdipGetImageThumbnail(NULL, 0, 0, &bitmap2, NULL, NULL); + todo_wine expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromScan0(128, 128, 0, PixelFormat32bppRGB, NULL, (GpBitmap**)&bitmap1); + expect(Ok, stat); + + stat = GdipGetImageThumbnail(bitmap1, 0, 0, NULL, NULL, NULL); + todo_wine expect(InvalidParameter, stat); + + stat = GdipGetImageThumbnail(bitmap1, 0, 0, &bitmap2, NULL, NULL); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageWidth(bitmap2, &width); + expect(Ok, stat); + expect(120, width); + + stat = GdipGetImageHeight(bitmap2, &height); + expect(Ok, stat); + expect(120, height); + + GdipDisposeImage(bitmap2); + } + + GdipDisposeImage(bitmap1); + + + stat = GdipCreateBitmapFromScan0(64, 128, 0, PixelFormat32bppRGB, NULL, (GpBitmap**)&bitmap1); + expect(Ok, stat); + + stat = GdipGetImageThumbnail(bitmap1, 32, 32, &bitmap2, NULL, NULL); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageWidth(bitmap2, &width); + expect(Ok, stat); + expect(32, width); + + stat = GdipGetImageHeight(bitmap2, &height); + expect(Ok, stat); + expect(32, height); + + GdipDisposeImage(bitmap2); + } + + stat = GdipGetImageThumbnail(bitmap1, 0, 0, &bitmap2, NULL, NULL); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageWidth(bitmap2, &width); + expect(Ok, stat); + expect(120, width); + + stat = GdipGetImageHeight(bitmap2, &height); + expect(Ok, stat); + expect(120, height); + + GdipDisposeImage(bitmap2); + } + + GdipDisposeImage(bitmap1); +} + static void test_getsetpixel(void) { GpStatus stat; @@ -2099,6 +2171,7 @@ START_TEST(image) test_createfromwmf(); test_resolution(); test_createhbitmap(); + test_getthumbnail(); test_getsetpixel(); test_palette(); test_colormatrix();

1 0

Vincent Povirk : gdiplus: Implement GdipSetImageAttributesWrapMode.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 0ae0c0c09e8a1309c74027092d00ac24ea58cdb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae0c0c09e8a1309c74027092… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 12:53:07 2010 -0500 gdiplus: Implement GdipSetImageAttributesWrapMode. --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 11 ++++++++++- dlls/gdiplus/imageattributes.c | 13 +++++++------ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2313cd5..eafed7c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -296,6 +296,8 @@ struct color_remap_table{ struct GpImageAttributes{ WrapMode wrap; + ARGB outside_color; + BOOL clamp; struct color_key colorkeys[ColorAdjustTypeCount]; struct color_matrix colormatrices[ColorAdjustTypeCount]; struct color_remap_table colorremaptables[ColorAdjustTypeCount]; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 790e0fb..879646a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2049,6 +2049,16 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image stride = sizeof(ARGB) * (dst_area.right - dst_area.left); + if (imageAttributes && + (imageAttributes->wrap != WrapModeClamp || + imageAttributes->outside_color != 0x00000000 || + imageAttributes->clamp)) + { + static int fixme; + if (!fixme++) + FIXME("Image wrap mode not implemented\n"); + } + for (x=dst_area.left; x<dst_area.right; x++) { for (y=dst_area.top; y<dst_area.bottom; y++) @@ -2069,7 +2079,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (src_x < src_area.left || src_x >= src_area.right || src_y < src_area.top || src_y >= src_area.bottom) - /* FIXME: Use wrapmode */ *src_color = 0; else GdipBitmapGetPixel(bitmap, src_x, src_y, src_color); diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 1a7118d..c157af3 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -53,6 +53,8 @@ GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr) *imageattr = GdipAlloc(sizeof(GpImageAttributes)); if(!*imageattr) return OutOfMemory; + (*imageattr)->wrap = WrapModeClamp; + TRACE("<-- %p\n", *imageattr); return Ok; @@ -120,17 +122,16 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes *imageat GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr, WrapMode wrap, ARGB argb, BOOL clamp) { - static int calls; - TRACE("(%p,%u,%08x,%i)\n", imageAttr, wrap, argb, clamp); - if(!imageAttr) + if(!imageAttr || wrap > WrapModeClamp) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + imageAttr->wrap = wrap; + imageAttr->outside_color = argb; + imageAttr->clamp = clamp; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes *imageAttr,

1 0

Vincent Povirk : gdiplus: Implement bitmap color keying.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 15ebd84daf6d12afff78344a008d291420eb9450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ebd84daf6d12afff78344a0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 12:26:02 2010 -0500 gdiplus: Implement bitmap color keying. --- dlls/gdiplus/graphics.c | 33 ++++++++++++++++++-- dlls/gdiplus/tests/image.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index eb24008..790e0fb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2083,9 +2083,36 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (imageAttributes->colorkeys[ColorAdjustTypeBitmap].enabled || imageAttributes->colorkeys[ColorAdjustTypeDefault].enabled) { - static int fixme; - if (!fixme++) - FIXME("Color keying not implemented\n"); + const struct color_key *key; + BYTE min_blue, min_green, min_red; + BYTE max_blue, max_green, max_red; + + if (imageAttributes->colorkeys[ColorAdjustTypeBitmap].enabled) + key = &imageAttributes->colorkeys[ColorAdjustTypeBitmap]; + else + key = &imageAttributes->colorkeys[ColorAdjustTypeDefault]; + + min_blue = key->low&0xff; + min_green = (key->low>>8)&0xff; + min_red = (key->low>>16)&0xff; + + max_blue = key->high&0xff; + max_green = (key->high>>8)&0xff; + max_red = (key->high>>16)&0xff; + + for (x=dst_area.left; x<dst_area.right; x++) + for (y=dst_area.top; y<dst_area.bottom; y++) + { + ARGB *src_color; + BYTE blue, green, red; + src_color = (ARGB*)(data + stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); + blue = *src_color&0xff; + green = (*src_color>>8)&0xff; + red = (*src_color>>16)&0xff; + if (blue >= min_blue && green >= min_green && red >= min_red && + blue <= max_blue && green <= max_green && red <= max_red) + *src_color = 0x00000000; + } } if (imageAttributes->colorremaptables[ColorAdjustTypeBitmap].enabled || diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 09ba8f0..a981bbf 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1999,6 +1999,76 @@ static void test_remaptable(void) GdipFree(map); } +static void test_colorkey(void) +{ + GpStatus stat; + GpImageAttributes *imageattr; + GpBitmap *bitmap1, *bitmap2; + GpGraphics *graphics; + ARGB color; + + stat = GdipSetImageAttributesColorKeys(NULL, ColorAdjustTypeDefault, TRUE, 0xff405060, 0xff708090); + expect(InvalidParameter, stat); + + stat = GdipCreateImageAttributes(&imageattr); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorKeys(imageattr, ColorAdjustTypeCount, TRUE, 0xff405060, 0xff708090); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorKeys(imageattr, ColorAdjustTypeAny, TRUE, 0xff405060, 0xff708090); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorKeys(imageattr, ColorAdjustTypeDefault, TRUE, 0xff405060, 0xff708090); + expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(2, 2, 0, PixelFormat32bppARGB, NULL, &bitmap1); + expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(2, 2, 0, PixelFormat32bppARGB, NULL, &bitmap2); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0x20405060); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 0, 1, 0x40506070); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 1, 0, 0x60708090); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 1, 1, 0xffffffff); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap2, &graphics); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,2,2, 0,0,2,2, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0x00000000, color, 1), "Expected ffff00ff, got %.8x\n", color); + + stat = GdipBitmapGetPixel(bitmap2, 0, 1, &color); + expect(Ok, stat); + ok(color_match(0x00000000, color, 1), "Expected ffff00ff, got %.8x\n", color); + + stat = GdipBitmapGetPixel(bitmap2, 1, 0, &color); + expect(Ok, stat); + ok(color_match(0x00000000, color, 1), "Expected ffff00ff, got %.8x\n", color); + + stat = GdipBitmapGetPixel(bitmap2, 1, 1, &color); + expect(Ok, stat); + ok(color_match(0xffffffff, color, 1), "Expected ffff00ff, got %.8x\n", color); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap1); + GdipDisposeImage((GpImage*)bitmap2); + GdipDisposeImageAttributes(imageattr); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2036,6 +2106,7 @@ START_TEST(image) test_multiframegif(); test_rotateflip(); test_remaptable(); + test_colorkey(); GdiplusShutdown(gdiplusToken); }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.44
by Jeremy Newman 10 May '10

10 May '10

Module: website Branch: master Commit: 542aa30cace624123768cf4d3cf8ffb5a8e86cdf URL: http://source.winehq.org/git/website.git/?a=commit;h=542aa30cace624123768cf… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri May 7 20:42:17 2010 +0200 Polish translation for release 1.1.44 --- news/pl/2010050701.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/pl/2010050701.xml b/news/pl/2010050701.xml new file mode 100644 index 0000000..85357b3 --- /dev/null +++ b/news/pl/2010050701.xml @@ -0,0 +1,20 @@ +<news> +<date>Maj 7, 2010</date> +<title>Wydano Wine 1.1.44</title> +<body> + Wydanie rozwojowe Wine 1.1.44 jest już dostępne. + <a href="{$root}/announce/1.1.44">Co nowego</a> w tym wydaniu: +<ul> + <li>Dużo więcej nowych ikonek.</li> + <li>Wsparcie dla 32-bitowych prefiksów w 64-bitowym Wine.</li> + <li>Wiele dodatkowych funkcji msvcr80/90.</li> + <li>Ulepszenia w obsłudze Bidi.</li> + <li>Bardziej kompletne wsparcie dla mmdevapi (odpowiedzialny za dźwięk w Win7).</li> + <li>Ulepszone wsparcie dla łatek MSI.</li> + <li>Kilka poprawek w pulpitowych menu.</li> + <li>Optymalizacje w OLE storage.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.44.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexander Nicolaysen Sørnes : maintainer : Implement checkOutputEditorInput()
by Alexander Nicolaysen Sørnes 09 May '10

09 May '10

Module: appdb Branch: master Commit: 96bf714e10e2ae8adf22a61dfa9d2b0388fdc067 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=96bf714e10e2ae8adf22a61d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat May 8 22:25:26 2010 +0200 maintainer: Implement checkOutputEditorInput() --- include/maintainer.php | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 881b315..34cef97 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -968,6 +968,19 @@ class maintainer return $this->iMaintainerId; } + public function checkOutputEditorInput($aClean) + { + $shErrors = ''; + + if(!getInput('iAppId', $aClean) && !getInput('iVersionId', $aClean)) + $shErrors .= '<li>No application or version has been selected. This should never happen; please contact <a href="mailto:'.APPDB_OWNER_EMAIL.'">'.APPDB_OWNER_EMAIL.'</a></li>'; + + if(!getInput('sMaintainReason', $aClean)) + $shErrors .= '<li>You need to write a short text about why you should be a maintainer</li>'; + + return $shErrors; + } + function getOutputEditorValues($aClean) { $this->iAppId = $aClean['iAppId'];

1 0

Vincent Povirk : gdiplus: Quiet the GdipImageForceValidation fixme.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: d2a01883fc3350d69bb059b62fd567c6283ddfca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a01883fc3350d69bb059b62… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 12:40:45 2010 -0500 gdiplus: Quiet the GdipImageForceValidation fixme. --- dlls/gdiplus/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bc13ad9..0eaaf2e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3503,7 +3503,7 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR* fileName, HDC h GpStatus WINGDIPAPI GdipImageForceValidation(GpImage *image) { - FIXME("%p\n", image); + TRACE("%p\n", image); return Ok; }

1 0

Vincent Povirk : gdiplus: Implement GdipCreateHICONFromBitmap.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: 2dbc3980efc227d9efafa09442b5c2246c114c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbc3980efc227d9efafa0944… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 12:01:07 2010 -0500 gdiplus: Implement GdipCreateHICONFromBitmap. --- dlls/gdiplus/image.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 56b79e1..bc13ad9 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1804,9 +1804,56 @@ GpStatus WINGDIPAPI GdipCreateCachedBitmap(GpBitmap *bitmap, GpGraphics *graphic GpStatus WINGDIPAPI GdipCreateHICONFromBitmap(GpBitmap *bitmap, HICON *hicon) { - FIXME("(%p, %p)\n", bitmap, hicon); + GpStatus stat; + BitmapData lockeddata; + ULONG andstride, xorstride, bitssize; + LPBYTE andbits, xorbits, androw, xorrow, srcrow; + UINT x, y; - return NotImplemented; + TRACE("(%p, %p)\n", bitmap, hicon); + + if (!bitmap || !hicon) + return InvalidParameter; + + stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, + PixelFormat32bppPARGB, &lockeddata); + if (stat == Ok) + { + andstride = ((lockeddata.Width+31)/32)*4; + xorstride = lockeddata.Width*4; + bitssize = (andstride + xorstride) * lockeddata.Height; + + andbits = GdipAlloc(bitssize); + + if (andbits) + { + xorbits = andbits + andstride * lockeddata.Height; + + for (y=0; y<lockeddata.Height; y++) + { + srcrow = ((LPBYTE)lockeddata.Scan0) + lockeddata.Stride * y; + + androw = andbits + andstride * y; + for (x=0; x<lockeddata.Width; x++) + if (srcrow[3+4*x] >= 128) + androw[x/8] |= 1 << (7-x%8); + + xorrow = xorbits + xorstride * y; + memcpy(xorrow, srcrow, xorstride); + } + + *hicon = CreateIcon(NULL, lockeddata.Width, lockeddata.Height, 1, 32, + andbits, xorbits); + + GdipFree(andbits); + } + else + stat = OutOfMemory; + + GdipBitmapUnlockBits(bitmap, &lockeddata); + } + + return stat; } GpStatus WINGDIPAPI GdipDeleteCachedBitmap(GpCachedBitmap *cachedbmp)

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
96
Older →

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 May 2010