wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Vincent Povirk : gdiplus: Prefer to not use gdi32 for gradient and texture brushes.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 4edff21ea2570a709ce237271f66fb7c45984403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4edff21ea2570a709ce237271… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 14:51:02 2011 -0600 gdiplus: Prefer to not use gdi32 for gradient and texture brushes. --- dlls/gdiplus/graphics.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8f4e9d0..29dea0a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -578,6 +578,21 @@ static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT } } +static INT brush_can_fill_path(GpBrush *brush) +{ + switch (brush->bt) + { + case BrushTypeSolidColor: + case BrushTypeHatchFill: + return 1; + case BrushTypeLinearGradient: + case BrushTypeTextureFill: + /* Gdi32 isn't much help with these, so we should use brush_fill_pixels instead. */ + default: + return 0; + } +} + static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) { switch (brush->bt) @@ -3745,7 +3760,7 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, HRGN hrgn; RECT rc; - if(!graphics->hdc) + if(!graphics->hdc || !brush_can_fill_path(brush)) return NotImplemented; status = GdipGetRegionHRgn(region, graphics, &hrgn);

1 0

Vincent Povirk : gdiplus: Implement software rendering of texture brushes.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 8a036abc5cdfc443a34d5f57195a4b0f941f062f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a036abc5cdfc443a34d5f571… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 14:42:19 2011 -0600 gdiplus: Implement software rendering of texture brushes. --- dlls/gdiplus/brush.c | 1 + dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 110 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 6cc78e8..88958a7 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1022,6 +1022,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) GdipDeleteMatrix(((GpTexture*)brush)->transform); GdipDisposeImage(((GpTexture*)brush)->image); GdipDisposeImageAttributes(((GpTexture*)brush)->imageattributes); + GdipFree(((GpTexture*)brush)->bitmap_bits); break; default: break; diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 4575875..c0b10e7 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -216,6 +216,7 @@ struct GpTexture{ GpMatrix *transform; GpImage *image; GpImageAttributes *imageattributes; + BYTE *bitmap_bits; /* image bits converted to ARGB and run through imageattributes */ }; struct GpPath{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a5a040b..8f4e9d0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -750,6 +750,7 @@ static INT brush_can_fill_pixels(GpBrush *brush) case BrushTypeSolidColor: case BrushTypeHatchFill: case BrushTypeLinearGradient: + case BrushTypeTextureFill: return 1; default: return 0; @@ -856,6 +857,115 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, return stat; } + case BrushTypeTextureFill: + { + GpTexture *fill = (GpTexture*)brush; + GpPointF draw_points[3]; + GpStatus stat; + GpMatrix *world_to_texture; + int x, y; + GpBitmap *bitmap; + int src_stride; + GpRect src_area; + + if (fill->image->type != ImageTypeBitmap) + { + FIXME("metafile texture brushes not implemented\n"); + return NotImplemented; + } + + bitmap = (GpBitmap*)fill->image; + src_stride = sizeof(ARGB) * bitmap->width; + + src_area.X = src_area.Y = 0; + src_area.Width = bitmap->width; + src_area.Height = bitmap->height; + + draw_points[0].X = fill_area->X; + draw_points[0].Y = fill_area->Y; + draw_points[1].X = fill_area->X+1; + draw_points[1].Y = fill_area->Y; + draw_points[2].X = fill_area->X; + draw_points[2].Y = fill_area->Y+1; + + /* Transform the points to the co-ordinate space of the bitmap. */ + stat = GdipTransformPoints(graphics, CoordinateSpaceWorld, + CoordinateSpaceDevice, draw_points, 3); + + if (stat == Ok) + { + stat = GdipCloneMatrix(fill->transform, &world_to_texture); + } + + if (stat == Ok) + { + stat = GdipInvertMatrix(world_to_texture); + + if (stat == Ok) + stat = GdipTransformMatrixPoints(world_to_texture, draw_points, 3); + + GdipDeleteMatrix(world_to_texture); + } + + if (stat == Ok && !fill->bitmap_bits) + { + BitmapData lockeddata; + + fill->bitmap_bits = GdipAlloc(sizeof(ARGB) * bitmap->width * bitmap->height); + if (!fill->bitmap_bits) + stat = OutOfMemory; + + if (stat == Ok) + { + lockeddata.Width = bitmap->width; + lockeddata.Height = bitmap->height; + lockeddata.Stride = src_stride; + lockeddata.PixelFormat = PixelFormat32bppARGB; + lockeddata.Scan0 = fill->bitmap_bits; + + stat = GdipBitmapLockBits(bitmap, &src_area, ImageLockModeRead|ImageLockModeUserInputBuf, + PixelFormat32bppARGB, &lockeddata); + } + + if (stat == Ok) + stat = GdipBitmapUnlockBits(bitmap, &lockeddata); + + if (stat == Ok) + apply_image_attributes(fill->imageattributes, fill->bitmap_bits, + bitmap->width, bitmap->height, + src_stride, ColorAdjustTypeBitmap); + + if (stat != Ok) + { + GdipFree(fill->bitmap_bits); + fill->bitmap_bits = NULL; + } + } + + if (stat == Ok) + { + REAL x_dx = draw_points[1].X - draw_points[0].X; + REAL x_dy = draw_points[1].Y - draw_points[0].Y; + REAL y_dx = draw_points[2].X - draw_points[0].X; + REAL y_dy = draw_points[2].Y - draw_points[0].Y; + + for (y=0; y<fill_area->Height; y++) + { + for (x=0; x<fill_area->Width; x++) + { + GpPointF point; + point.X = draw_points[0].X + x * x_dx + y * y_dx; + point.Y = draw_points[0].Y + y * x_dy + y * y_dy; + + argb_pixels[x + y*cdwStride] = resample_bitmap_pixel( + &src_area, fill->bitmap_bits, bitmap->width, bitmap->height, + &point, fill->imageattributes, graphics->interpolation); + } + } + } + + return stat; + } default: return NotImplemented; }

1 0

Vincent Povirk : gdiplus: Don' t use gdi32 to scale or draw from outside bitmaps.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 2302e80cc9083536e56724d77e1f03c101642b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2302e80cc9083536e56724d77… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 11:37:14 2011 -0600 gdiplus: Don't use gdi32 to scale or draw from outside bitmaps. --- dlls/gdiplus/graphics.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 07239e0..a5a040b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2465,10 +2465,18 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else return NotImplemented; + srcx = srcx * dx; + srcy = srcy * dy; + srcwidth = srcwidth * dx; + srcheight = srcheight * dy; + if (imageAttributes || (graphics->image && graphics->image->type == ImageTypeBitmap) || !((GpBitmap*)image)->hbitmap || - ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X) + ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X || + ptf[1].X - ptf[0].X != srcwidth || ptf[2].Y - ptf[0].Y != srcheight || + srcx < 0 || srcy < 0 || + srcx + srcwidth > bitmap->width || srcy + srcheight > bitmap->height) use_software = 1; if (use_software) @@ -2488,11 +2496,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (!imageAttributes) imageAttributes = &defaultImageAttributes; - srcx = srcx * dx; - srcy = srcy * dy; - srcwidth = srcwidth * dx; - srcheight = srcheight * dy; - dst_area.left = dst_area.right = pti[0].x; dst_area.top = dst_area.bottom = pti[0].y; for (i=1; i<4; i++) @@ -2672,12 +2675,12 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image bf.AlphaFormat = AC_SRC_ALPHA; GdiAlphaBlend(graphics->hdc, pti[0].x, pti[0].y, pti[1].x-pti[0].x, pti[2].y-pti[0].y, - hdc, srcx*dx, srcy*dy, srcwidth*dx, srcheight*dy, bf); + hdc, srcx, srcy, srcwidth, srcheight, bf); } else { StretchBlt(graphics->hdc, pti[0].x, pti[0].y, pti[1].x-pti[0].x, pti[2].y-pti[0].y, - hdc, srcx*dx, srcy*dy, srcwidth*dx, srcheight*dy, SRCCOPY); + hdc, srcx, srcy, srcwidth, srcheight, SRCCOPY); } if (temp_hdc)

1 0

Vincent Povirk : gdiplus: Implement bilinear interpolation.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 8b6dafda459d4a4a69123b9928c3c4fc4afa83a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6dafda459d4a4a69123b992… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 11:03:39 2011 -0600 gdiplus: Implement bilinear interpolation. --- dlls/gdiplus/graphics.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3b7b7ba..07239e0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -538,6 +538,40 @@ static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT if (!fixme++) FIXME("Unimplemented interpolation %i\n", interpolation); /* fall-through */ + case InterpolationModeBilinear: + { + REAL leftxf, topyf; + INT leftx, rightx, topy, bottomy; + ARGB topleft, topright, bottomleft, bottomright; + ARGB top, bottom; + float x_offset; + + leftxf = floorf(point->X); + leftx = (INT)leftxf; + rightx = (INT)ceilf(point->X); + topyf = floorf(point->Y); + topy = (INT)topyf; + bottomy = (INT)ceilf(point->Y); + + if (leftx == rightx && topy == bottomy) + return sample_bitmap_pixel(src_rect, bits, width, height, + leftx, topy, attributes); + + topleft = sample_bitmap_pixel(src_rect, bits, width, height, + leftx, topy, attributes); + topright = sample_bitmap_pixel(src_rect, bits, width, height, + rightx, topy, attributes); + bottomleft = sample_bitmap_pixel(src_rect, bits, width, height, + leftx, bottomy, attributes); + bottomright = sample_bitmap_pixel(src_rect, bits, width, height, + rightx, bottomy, attributes); + + x_offset = point->X - leftxf; + top = blend_colors(topleft, topright, x_offset); + bottom = blend_colors(bottomleft, bottomright, x_offset); + + return blend_colors(top, bottom, point->Y - topyf); + } case InterpolationModeNearestNeighbor: return sample_bitmap_pixel(src_rect, bits, width, height, roundr(point->X), roundr(point->Y), attributes);

1 0

Vincent Povirk : gdiplus: Move bitmap interpolation into a separate function.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 51cf90d8ca14ed15737823f89495fcf605229766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cf90d8ca14ed15737823f89… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 10:40:39 2011 -0600 gdiplus: Move bitmap interpolation into a separate function. --- dlls/gdiplus/graphics.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 89cd6ca..3b7b7ba 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -526,6 +526,24 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi return ((DWORD*)(bits))[(x - src_rect->X) + (y - src_rect->Y) * src_rect->Width]; } +static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT width, + UINT height, GpPointF *point, GDIPCONST GpImageAttributes *attributes, + InterpolationMode interpolation) +{ + static int fixme; + + switch (interpolation) + { + default: + if (!fixme++) + FIXME("Unimplemented interpolation %i\n", interpolation); + /* fall-through */ + case InterpolationModeNearestNeighbor: + return sample_bitmap_pixel(src_rect, bits, width, height, + roundr(point->X), roundr(point->Y), attributes); + } +} + static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) { switch (brush->bt) @@ -2528,19 +2546,15 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image for (y=dst_area.top; y<dst_area.bottom; y++) { GpPointF src_pointf; - INT src_x, src_y; ARGB *dst_color; src_pointf.X = dst_to_src_points[0].X + x * x_dx + y * y_dx; src_pointf.Y = dst_to_src_points[0].Y + x * x_dy + y * y_dy; - src_x = roundr(src_pointf.X); - src_y = roundr(src_pointf.Y); - dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) - *dst_color = sample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, src_x, src_y, imageAttributes); + *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, imageAttributes, interpolation); else *dst_color = 0; }

1 0

Alexandre Julliard : user.exe: Don' t try calling the WH_CALLWNDPROC hook if no hook was set.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 33807ac093070d1572461e8e72783de12da5ed17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33807ac093070d1572461e8e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 11:47:08 2011 +0100 user.exe: Don't try calling the WH_CALLWNDPROC hook if no hook was set. --- dlls/user.exe16/hook.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user.exe16/hook.c b/dlls/user.exe16/hook.c index 105254e..d140e16 100644 --- a/dlls/user.exe16/hook.c +++ b/dlls/user.exe16/hook.c @@ -192,7 +192,7 @@ void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ) CWPSTRUCT16 cwp; struct hook16_queue_info *info = get_hook_info( FALSE ); - if (!info->proc[WH_CALLWNDPROC - WH_MINHOOK]) return; + if (!info || !info->proc[WH_CALLWNDPROC - WH_MINHOOK]) return; cwp.hwnd = hwnd; cwp.message = msg;

1 0

Andrew Eikum : oleaut32: Convert TLBVarDesc to be stored as an array.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 517f5ba596fb450b4f7cabf07568351481ff1ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517f5ba596fb450b4f7cabf07… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Mar 10 15:21:56 2011 -0600 oleaut32: Convert TLBVarDesc to be stored as an array. --- dlls/oleaut32/typelib.c | 321 ++++++++++++++++++++++++----------------------- 1 files changed, 165 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=517f5ba596fb450b4f7ca…

1 0

Andrew Eikum : oleaut32: Convert TLBImplType to be stored as an array.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: f76334fd3e0c13d8ff66a6814ba4ceb9a1313067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76334fd3e0c13d8ff66a6814… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Mar 10 15:21:52 2011 -0600 oleaut32: Convert TLBImplType to be stored as an array. --- dlls/oleaut32/typelib.c | 201 +++++++++++++++++++++++------------------------ 1 files changed, 97 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f76334fd3e0c13d8ff66a…

1 0

Juan Lang : cryptnet/tests: Partially revert commit de6e33f306a3b1b424ad1a9c41e85d3692ef9e4d.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 016795a9bfbd59d1587a6db930bcbd79d9ae34bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=016795a9bfbd59d1587a6db93… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 10 11:22:57 2011 -0800 cryptnet/tests: Partially revert commit de6e33f306a3b1b424ad1a9c41e85d3692ef9e4d. It introduced new (old) test failures on some still-tested Windows versions. --- dlls/cryptnet/tests/cryptnet.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index a7fc9ec..ba6298d 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -365,8 +365,9 @@ static void test_retrieveObjectByUrl(void) SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, NULL, NULL, NULL, NULL); - /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH */ - ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH), + /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG */ + ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || + broken(GetLastError() == CRYPT_E_NO_MATCH)), "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError()); /* only newer versions of cryptnet do the cleanup */ @@ -405,8 +406,9 @@ static void test_retrieveObjectByUrl(void) cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); - /* w2k: success */ - ok(ret, "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", + /* w2k: failure with E_INVALIDARG */ + ok(ret || broken(GetLastError() == E_INVALIDARG), + "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", ret, GetLastError(), GetLastError()); if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) CertFreeCertificateContext(cert); @@ -415,8 +417,9 @@ static void test_retrieveObjectByUrl(void) aux.cbSize = sizeof(aux); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); - /* w2k: success */ - ok(ret, "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", + /* w2k: failure with E_INVALIDARG */ + ok(ret || broken(GetLastError() == E_INVALIDARG), + "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", ret, GetLastError(), GetLastError()); if (!ret) { /* no more tests useful */

1 0

Juan Lang : wininet: Reimplement IsUrlCacheEntryExpired.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 819eb52866e69a3c4f73b9a74817bd046c94fbe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819eb52866e69a3c4f73b9a74… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 10:39:37 2011 -0800 wininet: Reimplement IsUrlCacheEntryExpired. --- dlls/wininet/tests/urlcache.c | 112 +++++++++++++++++++++++++++++++++++++++++ dlls/wininet/urlcache.c | 106 ++++++++++++++++++++++++++------------ 2 files changed, 184 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=819eb52866e69a3c4f73b…

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
85
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 March 2011