April 2015 - Wine-devel - list.winehq.org

Re: [PATCH 3/4] d3drm/tests: Split tests between different versions, initially adding frame QueryInterface tests
by Stefan Dösinger 02 Apr '15

02 Apr '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, There are a few more issues: Am 2015-04-02 um 18:36 schrieb Aaryaman Vasishta: > + * Copyright 2012 Andr� Hentschel > + * Copyright 2011-2014 Henri Verbeet for CodeWeavers The encoding is still messed up. Is there any code you have taken from the other file? test_qi() is from dlls/ddraw/tests/ddraw*.c, so you should keep Henri's line. Taking along all the Copyright lines if you take something from an existing file is a safe choice though. Also, you should still fix your editor settings anyways. You can add your own name there if you want. (Fwiw, I don't know why we're maintaining these lines at all. The last thing I heard was that they don't have any legal meaning anyway. Also, git keep track of authorship pretty well.) > +#define CHECK_REFCOUNT(obj,rc) \ > + { \ > + int rc_new = rc; \ > + int count = get_refcount((IUnknown *)obj); \ > + ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ > + } Do you need this? You're using this in one place as far as I can see, you can also just use the get_refcount() and ok() calls directly. > +static int get_refcount(IUnknown *object) > +{ > + IUnknown_AddRef(object); > + return IUnknown_Release(object); > +} Refcounts are ULONG. > + hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame3 interface (hr = %x)\n", hr); The string is a bit misleading, I think something like "Failed to create frame" is better. Not a big issue though. The same applies to d3drm2.c and d3drm3.c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVHaNRAAoJEN0/YqbEcdMwZsAP/RvHLPjullG+tQC+JOZvzGDg nm2CZanwOzmC8ZEvWpXKxhCUjTIVUu0XB7yV33BgPywgRKBUUXkqEuGN+Z/wk7Lm rqNuPx17nPHL7aKjw9DxU3QP75t7RbFxU6N3Wz3Veoi+ox4xwxwmrIxRMkFNtxhv tPREjNp9yQVO79ZlLzI1VzeMVnTHKgVn/L+s68nADUkcBFrQaH6SBhB232utwbtp DdkwYOWCK0xGweaLAkt33X2Qhp+qbdtQjIoK/UZvq190owrW2tC2ORnIFhB/7zDR +FrpGzwGuTnhVocrLYCtVtB1RW5t0QealNjhlwv9HI03NSi/J7MmcwGOIE3TIatm TCCDvp034+EMThEvTDODATbYyihbgihG/jjiaQwznu+A66N9lOvhKRCbiasTjTym X06ti98dmpq9BwMd+8sRVe+U1zi9nRmGqvrcncmxUyZ1QoFdrDWFEpRog1jJvaho 8zO9NIzwsG839bqRyZIyZ0DvteaGXD7o907Nkr7aDt4jMjUmuj0ij+nrDvif9kTJ 5WOppUgN7JN4HhWNo4y5i3jei8X2TDDI9z76Juiv1DM0cbWbr2UTHSvFRysPiqGT vCg+boC2pZd94vQKnMYbyAg+06KDneZwiNYBVQpirY3Bua7PY7TwxkBgXQfh2sNv B2fjxmZVRMB3dWylqJmg =wYMH -----END PGP SIGNATURE-----

2 1

Re: [PATCH] undefined symbols compiling for macosx >10.8
by Ken Thomases 02 Apr '15

02 Apr '15

That symbol is in the 10.8 SDK. We build against that SDK all the time. It works fine. Here's the documentation for that function: <https://developer.apple.com/library/mac/documentation/Security/Reference/se…>. Notice that under Availability it says, "Available in OS X v10.8 and later." Here is the declaration from Security.framework/Headers/SecureTransport.h: ---------- OSStatus SSLGetProtocolVersionMax (SSLContextRef context, SSLProtocol *maxVersion) __OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_5_0); ---------- Notice the __MAC_10_8 identifier in the __OSX_AVAILABLE_STARTING() decorator. You need to fix your build environment and/or your build commands. Whatever problem you're encountering while trying to build is specific to your system. -Ken On Apr 2, 2015, at 11:58 AM, Sergey Isakov <isakov-sl(a)bk.ru> wrote: > Your proposition that SDK10.8 contains the symbol is wrong > —— > #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 > +#ifdef SSLGetProtocolVersionMax > if(SSLGetProtocolVersionMax != NULL) { > ---- > > On 01 апр. 2015 г., at 21:36, Ken Thomases <ken(a)codeweavers.com> wrote: > >> If you were having problems building Wine without this patch, then you have a system configuration problem. Or you're configuring Wine incorrectly. >> >> -Ken >> >> On Apr 1, 2015, at 11:52 AM, Sergey Isakov <isakov-sl(a)bk.ru> wrote: >> >>> Sorry but I committed the patch make me compilation be possible. >>> >>> On 01 апр. 2015 г., at 18:34, Ken Thomases <ken(a)codeweavers.com> wrote: >>> >>>> Hi, >>>> >>>> This patch makes no sense. Wine builds just fine for OS X versions greater than 10.8. Indeed, as near as I know, it still builds just fine for 10.5 and up (the Mac driver requires 10.6 or later, but on 10.5 it just will be skipped; it won't break anything). >>>> >>>> On Apr 1, 2015, at 6:48 AM, Sergey Isakov <isakov-sl(a)bk.ru> wrote: >>>> >>>>> Undefined symbols for architecture i386: >>>>> "_kCGDisplayShowDuplicateLowResolutionModes", referenced from: >>>>> -[WineApplicationController modeMatchingMode:forDisplay:] in cocoa_app.o >>>>> ld: symbol(s) not found for architecture i386 >>>> >>>> If you're getting this error, you're not building against a 10.8+ SDK properly. The compiler is seeing the headers for a 10.8+ SDK but the linker is seeing libraries and frameworks from some pre-10.8 SDK. >>>> >>>> >>>>> Instead of checking for NULL we should check #ifdef >>>> >>>> No. The things being tested are not macros in any version of the SDK. Your #ifdef checks will never pass. You have effectively done "#if 0". >>>> >>>> Finally, changes to separate DLLs (secur32 and winemac.drv, in this case) should be in separate patches unless they are inter-dependent. >>>> >>>> -Ken >>>> >>> >> >

1 0

Re: [PATCH] vbscript: Fixed Hex(try 3)
by Marvin 02 Apr '15

02 Apr '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=12612 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [1/4] windowscodecs: Add test for PNG gAMA metadata.
by Vincent Povirk 02 Apr '15

02 Apr '15

I forgot to NULL-terminate a string, please ignore. On Wed, Apr 1, 2015 at 5:24 PM, Vincent Povirk <madewokherd(a)gmail.com> wrote: >

1 0

Re: [PATCH] findstr: Added test for findstr. (try 2)
by Kaipeng Zeng 02 Apr '15

02 Apr '15

Excuse me,can anyone have a look at this patch? I appreciate for any comment. Thanks！ 2015-03-24 13:55 GMT+08:00 Kaipeng Zeng <kaipeng94(a)gmail.com>: > Thanks Stefan! > > Superseded patch 110143 . > ChangeLog: > - Exclude change to configure > - Return exit code of findstr in runcmd() >

2 1

Re: [1/3] server: Implement job limit flags (try 2)
by Nikolay Sivov 02 Apr '15

02 Apr '15

On 02.04.2015 10:38, Andrew Cook wrote: > Changes in try 2: > - Removed the goto in SetInformationJobObject, ExtendedLimit will need its own > wineserver call eventually anyway I don't think you'll need a separate server call for extended info case. All fields should be enabled with flags, so you don't have to invent special values to ignore some limits. > + switch (class) > + { > + > + case JobObjectExtendedLimitInformation: > + if (len != sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION)) > + return STATUS_INVALID_PARAMETER; > + > + basic_limit = &(((JOBOBJECT_EXTENDED_LIMIT_INFORMATION *)info)->BasicLimitInformation); > + if (basic_limit->LimitFlags & ~JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS) > + return STATUS_INVALID_PARAMETER; > + > + SERVER_START_REQ( job_set_limits ) > + { > + req->handle = wine_server_obj_handle( handle ); > + req->limit_flags = basic_limit->LimitFlags; > + status = wine_server_call( req ); > + } > + SERVER_END_REQ; > + break; This still looks strange, if you need only flags you can use switch() to prepare this flags value depending on info class, and handle invalid arguments same way you do know, no need to duplicate server calling block. Actually since extended info contains basic info you only need a switch() to test for invalid arguments, and you can cast unconditionally to JOBOBJECT_BASIC_LIMIT_INFORMATION* to get flags.

1 0

Re: [1/3] server: Implement job limit flags
by Alexandre Julliard 02 Apr '15

02 Apr '15

Andrew Cook <ariscop(a)gmail.com> writes: > + switch (class) > + { > + > + case JobObjectExtendedLimitInformation: > + if (len != sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION)) > + return STATUS_INVALID_PARAMETER; > + > + basic_limit = &(((JOBOBJECT_EXTENDED_LIMIT_INFORMATION *)info)->BasicLimitInformation); > + if (basic_limit->LimitFlags & ~JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS) > + return STATUS_INVALID_PARAMETER; > + > + goto set_basic_limits; > + > + case JobObjectBasicLimitInformation: > + if (len != sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION)) > + return STATUS_INVALID_PARAMETER; > + > + basic_limit = info; > + if (basic_limit->LimitFlags & ~JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS) > + return STATUS_INVALID_PARAMETER; > + > + set_basic_limits: > + SERVER_START_REQ( set_job_limits ) > + { > + req->handle = wine_server_obj_handle( handle ); > + req->limit_flags = basic_limit->LimitFlags; > + status = wine_server_call( req ); > + } > + SERVER_END_REQ; > + break; A goto target in the middle of a switch statement is not very nice, please try to find a better way. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msctf: Always return FALSE in DllCanUnloadNow
by Sebastian Lackner 02 Apr '15

02 Apr '15

On 02.04.2015 03:34, Alistair Leslie-Hughes wrote: > Hi, > Fixes https://bugs.winehq.org/show_bug.cgi?id=31579 > > Changelog: > msctf: Always return FALSE in DllCanUnloadNow > > > Best Regards > Alistair Leslie-Hughes > > > I doubt that the patch has any real disadvantage, but wouldn't it be better to fix the refcounting instead of just removing this feature? Qian Hong even attached a suggested patch on the bugreport.

3 2

Re: comctl32/tests: Fix couple of metrics tests that fail on some systems (try 3)
by Marvin 02 Apr '15

02 Apr '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=12601 Your paranoid android. === wvistau64 (32 bit listview) === listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w2008s64 (32 bit listview) === listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w7u (32 bit listview) === listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w2008s64 (64 bit listview) === listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000

2 1

Re: [PATCH (try2)] gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect
by Vincent Povirk 02 Apr '15

02 Apr '15

I think we also need resample_bitmap_pixel to be set up to handle PARGB. Nearest neighbor interpolation should work OK as is, but bilinear interpolation uses blend_colors which only works correctly for ARGB. (The implementation of blend_colors that we had before 9c579023f0750539bdf7815f8545c4620540387a should actually be correct for PARGB.) On Wed, Apr 1, 2015 at 11:38 AM, Andrew Eikum <aeikum(a)codeweavers.com> wrote: > Not all of the operations we perform in the DrawImage family need to > be post-multiplied. We can avoid doing a pre-to-post-multiplied alpha > conversion by detecting whether we need post-multiplied ahead of time. > Avoiding this conversion saves considerable time, about 3/1000s in my > particular test case. > > --- > > try2: Fix return value from color_over_fgpremult > > dlls/gdiplus/gdiplus_private.h | 20 +++++++++++++ > dlls/gdiplus/graphics.c | 66 ++++++++++++++++++++++++++++-------------- > 2 files changed, 65 insertions(+), 21 deletions(-) > > diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h > index 065f5ed..57b3de3 100644 > --- a/dlls/gdiplus/gdiplus_private.h > +++ b/dlls/gdiplus/gdiplus_private.h > @@ -121,6 +121,26 @@ static inline ARGB color_over(ARGB bg, ARGB fg) > return (a<<24)|(r<<16)|(g<<8)|b; > } > > +/* fg is premult, bg and return value are not */ > +static inline ARGB color_over_fgpremult(ARGB bg, ARGB fg) > +{ > + BYTE b, g, r, a; > + BYTE bg_alpha, fg_alpha; > + > + fg_alpha = (fg>>24)&0xff; > + > + if (fg_alpha == 0) return bg; > + > + bg_alpha = (((bg>>24)&0xff) * (0xff-fg_alpha)) / 0xff; > + > + a = bg_alpha + fg_alpha; > + b = ((bg&0xff)*bg_alpha + (fg&0xff)*0xff)/a; > + g = (((bg>>8)&0xff)*bg_alpha + ((fg>>8)&0xff)*0xff)/a; > + r = (((bg>>16)&0xff)*bg_alpha + ((fg>>16)&0xff)*0xff)/a; > + > + return (a<<24)|(r<<16)|(g<<8)|b; > +} > + > extern const char *debugstr_rectf(const RectF* rc) DECLSPEC_HIDDEN; > > extern const char *debugstr_pointf(const PointF* pt) DECLSPEC_HIDDEN; > diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c > index 580390f..89c108e 100644 > --- a/dlls/gdiplus/graphics.c > +++ b/dlls/gdiplus/graphics.c > @@ -354,9 +354,9 @@ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) > return GdipGetRegionHRgn(graphics->clip, NULL, hrgn); > } > > -/* Draw non-premultiplied ARGB data to the given graphics object */ > +/* Draw ARGB data to the given graphics object */ > static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, > - const BYTE *src, INT src_width, INT src_height, INT src_stride) > + const BYTE *src, INT src_width, INT src_height, INT src_stride, const PixelFormat fmt) > { > GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; > INT x, y; > @@ -372,7 +372,10 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ > continue; > > GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); > - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); > + if (fmt & PixelFormatPAlpha) > + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over_fgpremult(dst_color, src_color)); > + else > + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); > } > } > > @@ -380,7 +383,7 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ > } > > static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, > - const BYTE *src, INT src_width, INT src_height, INT src_stride) > + const BYTE *src, INT src_width, INT src_height, INT src_stride, PixelFormat fmt) > { > HDC hdc; > HBITMAP hbitmap; > @@ -404,7 +407,8 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ > hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, > (void**)&temp_bits, NULL, 0); > > - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) > + if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE || > + fmt & PixelFormatPAlpha) > memcpy(temp_bits, src, src_width * src_height * 4); > else > convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, > @@ -420,7 +424,7 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ > } > > static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst_y, > - const BYTE *src, INT src_width, INT src_height, INT src_stride, HRGN hregion) > + const BYTE *src, INT src_width, INT src_height, INT src_stride, HRGN hregion, PixelFormat fmt) > { > GpStatus stat=Ok; > > @@ -470,7 +474,7 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst > stat = alpha_blend_bmp_pixels(graphics, rects[i].left, rects[i].top, > &src[(rects[i].left - dst_x) * 4 + (rects[i].top - dst_y) * src_stride], > rects[i].right - rects[i].left, rects[i].bottom - rects[i].top, > - src_stride); > + src_stride, fmt); > } > > GdipFree(rgndata); > @@ -503,7 +507,7 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst > ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); > > stat = alpha_blend_hdc_pixels(graphics, dst_x, dst_y, src, src_width, > - src_height, src_stride); > + src_height, src_stride, fmt); > > RestoreDC(graphics->hdc, save); > > @@ -514,9 +518,9 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst > } > > static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, > - const BYTE *src, INT src_width, INT src_height, INT src_stride) > + const BYTE *src, INT src_width, INT src_height, INT src_stride, PixelFormat fmt) > { > - return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL); > + return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL, fmt); > } > > static ARGB blend_colors(ARGB start, ARGB end, REAL position) > @@ -656,8 +660,9 @@ static BOOL color_is_gray(ARGB color) > return (r == g) && (g == b); > } > > -static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, > - UINT width, UINT height, INT stride, ColorAdjustType type) > +/* returns preferred pixel format for the applied attributes */ > +static PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, > + UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) > { > UINT x, y; > INT i; > @@ -669,6 +674,9 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d > BYTE min_blue, min_green, min_red; > BYTE max_blue, max_green, max_red; > > + if (!data || fmt != PixelFormat32bppARGB) > + return PixelFormat32bppARGB; > + > if (attributes->colorkeys[type].enabled) > key = &attributes->colorkeys[type]; > else > @@ -702,6 +710,9 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d > { > const struct color_remap_table *table; > > + if (!data || fmt != PixelFormat32bppARGB) > + return PixelFormat32bppARGB; > + > if (attributes->colorremaptables[type].enabled) > table = &attributes->colorremaptables[type]; > else > @@ -731,6 +742,9 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d > int gray_matrix[5][5]; > BOOL identity; > > + if (!data || fmt != PixelFormat32bppARGB) > + return PixelFormat32bppARGB; > + > if (attributes->colormatrices[type].enabled) > colormatrices = &attributes->colormatrices[type]; > else > @@ -769,6 +783,9 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d > { > REAL gamma; > > + if (!data || fmt != PixelFormat32bppARGB) > + return PixelFormat32bppARGB; > + > if (attributes->gamma_enabled[type]) > gamma = attributes->gamma[type]; > else > @@ -793,6 +810,8 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d > *src_color = (*src_color & 0xff000000) | (red << 16) | (green << 8) | blue; > } > } > + > + return fmt; > } > > /* Given a bitmap and its source rectangle, find the smallest rectangle in the > @@ -1237,7 +1256,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, > if (stat == Ok) > apply_image_attributes(fill->imageattributes, fill->bitmap_bits, > bitmap->width, bitmap->height, > - src_stride, ColorAdjustTypeBitmap); > + src_stride, ColorAdjustTypeBitmap, lockeddata.PixelFormat); > > if (stat != Ok) > { > @@ -2990,15 +3009,18 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image > return OutOfMemory; > src_stride = sizeof(ARGB) * src_area.Width; > > - /* Read the bits we need from the source bitmap into an ARGB buffer. */ > + /* Read the bits we need from the source bitmap into a compatible buffer. */ > lockeddata.Width = src_area.Width; > lockeddata.Height = src_area.Height; > lockeddata.Stride = src_stride; > - lockeddata.PixelFormat = PixelFormat32bppARGB; > lockeddata.Scan0 = src_data; > + if (bitmap->format == PixelFormat32bppPARGB) > + lockeddata.PixelFormat = apply_image_attributes(imageAttributes, NULL, 0, 0, 0, ColorAdjustTypeBitmap, bitmap->format); > + else > + lockeddata.PixelFormat = PixelFormat32bppARGB; > > stat = GdipBitmapLockBits(bitmap, &src_area, ImageLockModeRead|ImageLockModeUserInputBuf, > - PixelFormat32bppARGB, &lockeddata); > + lockeddata.PixelFormat, &lockeddata); > > if (stat == Ok) > stat = GdipBitmapUnlockBits(bitmap, &lockeddata); > @@ -3011,7 +3033,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image > > apply_image_attributes(imageAttributes, src_data, > src_area.Width, src_area.Height, > - src_stride, ColorAdjustTypeBitmap); > + src_stride, ColorAdjustTypeBitmap, lockeddata.PixelFormat); > > if (do_resampling) > { > @@ -3059,7 +3081,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image > } > > stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, > - dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride); > + dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride, > + lockeddata.PixelFormat); > > GdipFree(src_data); > > @@ -4009,7 +4032,8 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, > if (stat == Ok) > stat = alpha_blend_pixels_hrgn(graphics, gp_bound_rect.X, > gp_bound_rect.Y, (BYTE*)pixel_data, gp_bound_rect.Width, > - gp_bound_rect.Height, gp_bound_rect.Width * 4, hregion); > + gp_bound_rect.Height, gp_bound_rect.Width * 4, hregion, > + PixelFormat32bppARGB); > > GdipFree(pixel_data); > } > @@ -5811,7 +5835,7 @@ GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) > /* Write the changed pixels to the real target. */ > alpha_blend_pixels(graphics, 0, 0, graphics->temp_bits, > graphics->temp_hbitmap_width, graphics->temp_hbitmap_height, > - graphics->temp_hbitmap_width * 4); > + graphics->temp_hbitmap_width * 4, PixelFormat32bppARGB); > > /* Clean up. */ > DeleteDC(graphics->temp_hdc); > @@ -6366,7 +6390,7 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI > > /* draw the result */ > stat = alpha_blend_pixels(graphics, min_x, min_y, pixel_data, pixel_area.Width, > - pixel_area.Height, pixel_data_stride); > + pixel_area.Height, pixel_data_stride, PixelFormat32bppARGB); > > GdipFree(pixel_data); > > -- > 2.3.5 > > >

1 1