July 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : gdiplus: Add some tests for GdipBitmapLockBits/ GdipBitmapUnlockBits.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 85d3d760d7472db4d8486ee62e6cb8af767c8dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d3d760d7472db4d8486ee62… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 14:58:47 2012 +0900 gdiplus: Add some tests for GdipBitmapLockBits/GdipBitmapUnlockBits. --- dlls/gdiplus/tests/image.c | 221 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 221 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85d3d760d7472db4d8486…

1 0

Dmitry Timoshkov : gdiplus: Use public ColorPalette structure to store image palette.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: a46c1f780a971ab3a2355451a2e09cf4770d4d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46c1f780a971ab3a2355451a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 14:59:43 2012 +0900 gdiplus: Use public ColorPalette structure to store image palette. --- dlls/gdiplus/gdiplus_private.h | 5 +-- dlls/gdiplus/graphics.c | 8 +-- dlls/gdiplus/image.c | 97 ++++++++++++++++++++-------------------- dlls/gdiplus/metafile.c | 5 +-- 4 files changed, 53 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a46c1f780a971ab3a2355…

1 0

Dmitry Timoshkov : gdiplus: Pass complete palette info to convert_pixels().
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 87f8e560c2fac142075fd17f1dd452eda68243cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f8e560c2fac142075fd17f1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 15:00:21 2012 +0900 gdiplus: Pass complete palette info to convert_pixels(). --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/image.c | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index b7c808d..03942c0 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -120,7 +120,7 @@ extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, extern GpStatus convert_pixels(INT width, INT height, INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, - INT src_stride, const BYTE *src_bits, PixelFormat src_format, ARGB *src_palette) DECLSPEC_HIDDEN; + INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *palette) DECLSPEC_HIDDEN; struct GpPen{ UINT style; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 577824e..59dd77b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3274,7 +3274,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image convert_pixels(bitmap->width, bitmap->height, bitmap->width*4, temp_bits, dst_format, bitmap->stride, bitmap->bits, bitmap->format, - bitmap->image.palette ? bitmap->image.palette->Entries : NULL); + bitmap->image.palette); } else { diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 464de94..f9781ef 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -501,7 +501,8 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, GpStatus convert_pixels(INT width, INT height, INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, - INT src_stride, const BYTE *src_bits, PixelFormat src_format, ARGB *src_palette) + INT src_stride, const BYTE *src_bits, PixelFormat src_format, + ColorPalette *palette) { INT x, y; @@ -518,9 +519,10 @@ GpStatus convert_pixels(INT width, INT height, for (x=0; x<width; x++) \ for (y=0; y<height; y++) { \ BYTE index; \ - BYTE *color; \ + ARGB argb; \ + BYTE *color = (BYTE *)&argb; \ getpixel_function(&index, src_bits+src_stride*y, x); \ - color = (BYTE*)(&src_palette[index]); \ + argb = (palette && index < palette->Count) ? palette->Entries[index] : 0; \ setpixel_function(color[2], color[1], color[0], color[3], dst_bits+dst_stride*y, x); \ } \ return Ok; \ @@ -1012,7 +1014,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, lockeddata->Stride, lockeddata->Scan0, format, bitmap->stride, bitmap->bits + bitmap->stride * act_rect.Y + PIXELFORMATBPP(bitmap->format) * act_rect.X / 8, - bitmap->format, bitmap->image.palette ? bitmap->image.palette->Entries : NULL); + bitmap->format, bitmap->image.palette); if (stat != Ok) {

1 0

Dmitry Timoshkov : gdiplus: Pass palette instead of bitmap to setpixel helpers.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: d9f4df06196bc28ae4938ee8e1ac179d057be6e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f4df06196bc28ae4938ee8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 15:01:16 2012 +0900 gdiplus: Pass palette instead of bitmap to setpixel helpers. --- dlls/gdiplus/image.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f9781ef..d14fca0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -297,11 +297,14 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, return Ok; } -static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, GpBitmap* bitmap) { +static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, ColorPalette *palette) +{ BYTE index = 0; int best_distance = 0x7fff; int distance; int i; + + if (!palette) return 0; /* This algorithm scans entire palette, computes difference from desired color (all color components have equal weight) and returns the index of color with least difference. @@ -311,8 +314,8 @@ static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, GpBitmap* b tables and thus may actually be slower if this method is called only few times per every image. */ - for(i=0;i<bitmap->image.palette->Count;i++) { - ARGB color=bitmap->image.palette->Entries[i]; + for(i=0;i<palette->Count;i++) { + ARGB color=palette->Entries[i]; distance=abs(b-(color & 0xff)) + abs(g-(color>>8 & 0xff)) + abs(r-(color>>16 & 0xff)) + abs(a-(color>>24 & 0xff)); if (distance<best_distance) { best_distance=distance; @@ -323,25 +326,25 @@ static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, GpBitmap* b } static inline void setpixel_8bppIndexed(BYTE r, BYTE g, BYTE b, BYTE a, - BYTE *row, UINT x, GpBitmap* bitmap) + BYTE *row, UINT x, ColorPalette *palette) { - BYTE index = get_palette_index(r,g,b,a,bitmap); + BYTE index = get_palette_index(r,g,b,a,palette); row[x]=index; } static inline void setpixel_1bppIndexed(BYTE r, BYTE g, BYTE b, BYTE a, - BYTE *row, UINT x, GpBitmap* bitmap) + BYTE *row, UINT x, ColorPalette *palette) { - row[x/8] = (row[x/8] & ~(1<<(7-x%8))) | (get_palette_index(r,g,b,a,bitmap)<<(7-x%8)); + row[x/8] = (row[x/8] & ~(1<<(7-x%8))) | (get_palette_index(r,g,b,a,palette)<<(7-x%8)); } static inline void setpixel_4bppIndexed(BYTE r, BYTE g, BYTE b, BYTE a, - BYTE *row, UINT x, GpBitmap* bitmap) + BYTE *row, UINT x, ColorPalette *palette) { if (x & 1) - row[x/2] = (row[x/2] & 0xf0) | get_palette_index(r,g,b,a,bitmap); + row[x/2] = (row[x/2] & 0xf0) | get_palette_index(r,g,b,a,palette); else - row[x/2] = (row[x/2] & 0x0f) | get_palette_index(r,g,b,a,bitmap)<<4; + row[x/2] = (row[x/2] & 0x0f) | get_palette_index(r,g,b,a,palette)<<4; } static inline void setpixel_16bppGrayScale(BYTE r, BYTE g, BYTE b, BYTE a, @@ -483,13 +486,13 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, setpixel_64bppPARGB(r,g,b,a,row,x); break; case PixelFormat8bppIndexed: - setpixel_8bppIndexed(r,g,b,a,row,x,bitmap); + setpixel_8bppIndexed(r,g,b,a,row,x,bitmap->image.palette); break; case PixelFormat4bppIndexed: - setpixel_4bppIndexed(r,g,b,a,row,x,bitmap); + setpixel_4bppIndexed(r,g,b,a,row,x,bitmap->image.palette); break; case PixelFormat1bppIndexed: - setpixel_1bppIndexed(r,g,b,a,row,x,bitmap); + setpixel_1bppIndexed(r,g,b,a,row,x,bitmap->image.palette); break; default: FIXME("not implemented for format 0x%x\n", bitmap->format);

1 0

Dmitry Timoshkov : gdiplus: Add support for converting RGB formats to 8bpp indexed.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 2ed1aaa930654e3e4bbbbf13992cf6abbded6780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed1aaa930654e3e4bbbbf139… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 15:01:51 2012 +0900 gdiplus: Add support for converting RGB formats to 8bpp indexed. --- dlls/gdiplus/image.c | 32 ++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 4 ++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d14fca0..2e3c164 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -541,6 +541,16 @@ GpStatus convert_pixels(INT width, INT height, return Ok; \ } while (0); +#define convert_rgb_to_indexed(getpixel_function, setpixel_function) do { \ + for (x=0; x<width; x++) \ + for (y=0; y<height; y++) { \ + BYTE r, g, b, a; \ + getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ + setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, palette); \ + } \ + return Ok; \ +} while (0); + switch (src_format) { case PixelFormat1bppIndexed: @@ -627,6 +637,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat16bppGrayScale: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_16bppGrayScale, setpixel_8bppIndexed); case PixelFormat16bppRGB555: convert_rgb_to_rgb(getpixel_16bppGrayScale, setpixel_16bppRGB555); case PixelFormat16bppRGB565: @@ -652,6 +664,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat16bppRGB555: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_16bppRGB555, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_rgb_to_rgb(getpixel_16bppRGB555, setpixel_16bppGrayScale); case PixelFormat16bppRGB565: @@ -677,6 +691,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat16bppRGB565: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_16bppRGB565, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_rgb_to_rgb(getpixel_16bppRGB565, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -702,6 +718,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat16bppARGB1555: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_16bppARGB1555, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_rgb_to_rgb(getpixel_16bppARGB1555, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -727,6 +745,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat24bppRGB: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_24bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_rgb_to_rgb(getpixel_24bppRGB, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -752,6 +772,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat32bppRGB: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_32bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_rgb_to_rgb(getpixel_32bppRGB, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -777,6 +799,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat32bppARGB: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_32bppARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_rgb_to_rgb(getpixel_32bppARGB, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -801,6 +825,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat32bppPARGB: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_32bppPARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_rgb_to_rgb(getpixel_32bppPARGB, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -826,6 +852,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat48bppRGB: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_48bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_rgb_to_rgb(getpixel_48bppRGB, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -851,6 +879,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat64bppARGB: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_64bppARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_rgb_to_rgb(getpixel_64bppARGB, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -876,6 +906,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat64bppPARGB: switch (dst_format) { + case PixelFormat8bppIndexed: + convert_rgb_to_indexed(getpixel_64bppPARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_rgb_to_rgb(getpixel_64bppPARGB, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 482dfd9..da17b5d 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3388,7 +3388,6 @@ static void test_bitmapbits(void) 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77 }; -#if 0 /* FIXME: these tests crash gdiplus in Wine */ static const BYTE pixels_8[16] = { 0x01,0,0x01,0,0x01,0,0x01,0, @@ -3405,6 +3404,7 @@ static void test_bitmapbits(void) 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77 }; +#if 0 /* FIXME: these tests crash gdiplus in Wine */ static const BYTE pixels_1_77[64] = { 0xaa,0x77,0x77,0x77,0x77,0x77,0x77,0x77, @@ -3438,7 +3438,6 @@ static void test_bitmapbits(void) { PixelFormat24bppRGB, 24, ImageLockModeRead|ImageLockModeUserInputBuf, 32, 64, pixels_24_77, pixels_24 }, { PixelFormat24bppRGB, 24, ImageLockModeWrite|ImageLockModeUserInputBuf, 32, 64, pixels_77, pixels_00 }, { PixelFormat24bppRGB, 24, ImageLockModeUserInputBuf, 32, 64, pixels_77, pixels_24 }, -#if 0 /* FIXME: these tests crash gdiplus in Wine */ /* 8 */ { PixelFormat8bppIndexed, 8, 0, 8, 16, pixels_8, pixels_24 }, { PixelFormat8bppIndexed, 8, ImageLockModeRead, 8, 16, pixels_8, pixels_24 }, @@ -3447,6 +3446,7 @@ static void test_bitmapbits(void) { PixelFormat8bppIndexed, 8, ImageLockModeRead|ImageLockModeUserInputBuf, 32, 64, pixels_8_77, pixels_24 }, { PixelFormat8bppIndexed, 8, ImageLockModeWrite|ImageLockModeUserInputBuf, 32, 64, pixels_77, pixels_00 }, { PixelFormat8bppIndexed, 8, ImageLockModeUserInputBuf, 32, 64, pixels_77, pixels_24 }, +#if 0 /* FIXME: these tests crash gdiplus in Wine */ /* 15 */ { PixelFormat1bppIndexed, 1, 0, 4, 8, pixels_1, pixels_24 }, { PixelFormat1bppIndexed, 1, ImageLockModeRead, 4, 8, pixels_1, pixels_24 },

1 0

Dmitry Timoshkov : gdiplus: Add support for converting RGB formats to 1bpp indexed.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: d104741a3c7a0893762e2dfe2e67cbbe9c4a3647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d104741a3c7a0893762e2dfe2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 15:02:31 2012 +0900 gdiplus: Add support for converting RGB formats to 1bpp indexed. --- dlls/gdiplus/image.c | 22 ++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 4 ---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2e3c164..bfa0156 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -637,6 +637,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat16bppGrayScale: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_16bppGrayScale, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppGrayScale, setpixel_8bppIndexed); case PixelFormat16bppRGB555: @@ -664,6 +666,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat16bppRGB555: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_16bppRGB555, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppRGB555, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -691,6 +695,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat16bppRGB565: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_16bppRGB565, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppRGB565, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -718,6 +724,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat16bppARGB1555: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_16bppARGB1555, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppARGB1555, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -745,6 +753,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat24bppRGB: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_24bppRGB, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_24bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -772,6 +782,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat32bppRGB: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_32bppRGB, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_32bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -799,6 +811,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat32bppARGB: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_32bppARGB, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_32bppARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -825,6 +839,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat32bppPARGB: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_32bppPARGB, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_32bppPARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -852,6 +868,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat48bppRGB: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_48bppRGB, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_48bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -879,6 +897,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat64bppARGB: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_64bppARGB, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_64bppARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -906,6 +926,8 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat64bppPARGB: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_rgb_to_indexed(getpixel_64bppPARGB, setpixel_1bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_64bppPARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index da17b5d..7f89aec 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3404,7 +3404,6 @@ static void test_bitmapbits(void) 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77 }; -#if 0 /* FIXME: these tests crash gdiplus in Wine */ static const BYTE pixels_1_77[64] = { 0xaa,0x77,0x77,0x77,0x77,0x77,0x77,0x77, @@ -3417,7 +3416,6 @@ static void test_bitmapbits(void) 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77 }; static const BYTE pixels_1[8] = {0xaa,0,0,0,0xaa,0,0,0}; -#endif static const struct test_data { PixelFormat format; @@ -3446,7 +3444,6 @@ static void test_bitmapbits(void) { PixelFormat8bppIndexed, 8, ImageLockModeRead|ImageLockModeUserInputBuf, 32, 64, pixels_8_77, pixels_24 }, { PixelFormat8bppIndexed, 8, ImageLockModeWrite|ImageLockModeUserInputBuf, 32, 64, pixels_77, pixels_00 }, { PixelFormat8bppIndexed, 8, ImageLockModeUserInputBuf, 32, 64, pixels_77, pixels_24 }, -#if 0 /* FIXME: these tests crash gdiplus in Wine */ /* 15 */ { PixelFormat1bppIndexed, 1, 0, 4, 8, pixels_1, pixels_24 }, { PixelFormat1bppIndexed, 1, ImageLockModeRead, 4, 8, pixels_1, pixels_24 }, @@ -3455,7 +3452,6 @@ static void test_bitmapbits(void) { PixelFormat1bppIndexed, 1, ImageLockModeRead|ImageLockModeUserInputBuf, 32, 64, pixels_1_77, pixels_24 }, { PixelFormat1bppIndexed, 1, ImageLockModeWrite|ImageLockModeUserInputBuf, 32, 64, pixels_77, pixels_00 }, { PixelFormat1bppIndexed, 1, ImageLockModeUserInputBuf, 32, 64, pixels_77, pixels_24 }, -#endif }; BYTE buf[64]; GpStatus status;

1 0

Daniel Jelinski : comctl32/treeview: Clean up mouse tracking code.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 7e56fd38d831ab9b565677f1a204a7f8b554633a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e56fd38d831ab9b565677f1a… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 19:53:40 2012 +0200 comctl32/treeview: Clean up mouse tracking code. --- dlls/comctl32/treeview.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8c93f8c..9e28ee2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4043,8 +4043,6 @@ TREEVIEW_TrackMouse(const TREEVIEW_INFO *infoPtr, POINT pt) else if (msg.message >= WM_LBUTTONDOWN && msg.message <= WM_RBUTTONDBLCLK) { - if (msg.message == WM_RBUTTONUP) - TREEVIEW_RButtonUp(infoPtr, &pt); break; } @@ -4259,6 +4257,7 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } else { + TREEVIEW_RButtonUp(infoPtr, &ht.pt); SetFocus(infoPtr->hwnd); TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK); }

1 0

Lucas Zawacki : joy.cpl: Tab for force feedback tests.
by Alexandre Julliard 17 Jul '12

17 Jul '12

1 0

Lucas Zawacki : joy.cpl: Added force feedback direction control.
by Alexandre Julliard 17 Jul '12

17 Jul '12

1 0

Nikolay Sivov : msxml3: Use single helper to test for handler presence.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 007ac83fc93d8b9efe4b75d49f86d41263ed8af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=007ac83fc93d8b9efe4b75d49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 09:58:36 2012 +0400 msxml3: Use single helper to test for handler presence. --- dlls/msxml3/saxreader.c | 52 ++++++++++++++++++---------------------------- 1 files changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index bdfdcab..87974bc 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -324,6 +324,12 @@ static inline saxlocator *impl_from_ISAXAttributes( ISAXAttributes *iface ) return CONTAINING_RECORD(iface, saxlocator, ISAXAttributes_iface); } +static inline int saxreader_has_handler(const saxlocator *locator, enum saxhandler_type type) +{ + return (locator->vbInterface && locator->saxreader->saxhandlers[type].vbhandler) || + (!locator->vbInterface && locator->saxreader->saxhandlers[type].handler); +} + /* property names */ static const WCHAR PropertyCharsetW[] = { 'c','h','a','r','s','e','t',0 @@ -394,24 +400,6 @@ static BOOL is_namespaces_enabled(const saxreader *reader) return (reader->version < MSXML4) || (reader->features & Namespaces); } -static inline int has_content_handler(const saxlocator *locator) -{ - return (locator->vbInterface && locator->saxreader->saxhandlers[SAXContentHandler].vbhandler) || - (!locator->vbInterface && locator->saxreader->saxhandlers[SAXContentHandler].handler); -} - -static inline int has_lexical_handler(const saxlocator *locator) -{ - return (locator->vbInterface && locator->saxreader->saxhandlers[SAXLexicalHandler].vbhandler) || - (!locator->vbInterface && locator->saxreader->saxhandlers[SAXLexicalHandler].handler); -} - -static inline int has_error_handler(const saxlocator *locator) -{ - return (locator->vbInterface && locator->saxreader->saxhandlers[SAXErrorHandler].vbhandler) || - (!locator->vbInterface && locator->saxreader->saxhandlers[SAXErrorHandler].handler); -} - static BSTR build_qname(BSTR prefix, BSTR local) { if (prefix && *prefix) @@ -639,7 +627,7 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr) xmlStopParser(This->pParserCtxt); This->ret = hr; - if(has_error_handler(This)) + if (saxreader_has_handler(This, SAXErrorHandler)) { WCHAR msg[1024]; if(!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, @@ -1323,7 +1311,7 @@ static void libxmlStartDocument(void *ctx) This->column++; } - if(has_content_handler(This)) + if (saxreader_has_handler(This, SAXContentHandler)) { if(This->vbInterface) hr = IVBSAXContentHandler_startDocument(handler->vbhandler); @@ -1353,7 +1341,7 @@ static void libxmlEndDocument(void *ctx) if(This->ret != S_OK) return; - if(has_content_handler(This)) + if (saxreader_has_handler(This, SAXContentHandler)) { if(This->vbInterface) hr = IVBSAXContentHandler_endDocument(handler->vbhandler); @@ -1395,7 +1383,7 @@ static void libxmlStartElementNS( { int i; - for (i = 0; i < nb_namespaces && has_content_handler(This); i++) + for (i = 0; i < nb_namespaces && saxreader_has_handler(This, SAXContentHandler); i++) { if (This->vbInterface) hr = IVBSAXContentHandler_startPrefixMapping( @@ -1420,7 +1408,7 @@ static void libxmlStartElementNS( uri = find_element_uri(This, URI); hr = SAXAttributes_populate(This, nb_namespaces, namespaces, nb_attributes, attributes); - if (hr == S_OK && has_content_handler(This)) + if (hr == S_OK && saxreader_has_handler(This, SAXContentHandler)) { BSTR local; @@ -1488,7 +1476,7 @@ static void libxmlEndElementNS( uri = find_element_uri(This, URI); element = pop_element_ns(This); - if (!has_content_handler(This)) + if (!saxreader_has_handler(This, SAXContentHandler)) { This->nb_attributes = 0; free_element_entry(element); @@ -1523,7 +1511,7 @@ static void libxmlEndElementNS( if (is_namespaces_enabled(This->saxreader)) { int i = -1; - while (iterate_endprefix_index(This, element, &i) && has_content_handler(This)) + while (iterate_endprefix_index(This, element, &i) && saxreader_has_handler(This, SAXContentHandler)) { if (This->vbInterface) hr = IVBSAXContentHandler_endPrefixMapping( @@ -1554,7 +1542,7 @@ static void libxmlCharacters( xmlChar *cur, *end; BOOL lastEvent = FALSE; - if(!(has_content_handler(This))) return; + if (!saxreader_has_handler(This, SAXContentHandler)) return; update_position(This, FALSE); cur = (xmlChar*)This->pParserCtxt->input->cur; @@ -1644,7 +1632,7 @@ static void libxmlSetDocumentLocator( struct saxcontenthandler_iface *handler = saxreader_get_contenthandler(This->saxreader); HRESULT hr = S_OK; - if(has_content_handler(This)) + if (saxreader_has_handler(This, SAXContentHandler)) { if(This->vbInterface) hr = IVBSAXContentHandler_putref_documentLocator(handler->vbhandler, @@ -1678,7 +1666,7 @@ static void libxmlComment(void *ctx, const xmlChar *value) for(; p>=This->pParserCtxt->input->base && *p!='\n' && *p!='\r'; p--) This->column++; - if (!has_lexical_handler(This)) return; + if (!saxreader_has_handler(This, SAXLexicalHandler)) return; bValue = pooled_bstr_from_xmlChar(&This->saxreader->pool, value); @@ -1717,7 +1705,7 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) TRACE("fatal error for %p: %s\n", This, debugstr_w(error)); } - if(!has_error_handler(This)) + if (!saxreader_has_handler(This, SAXErrorHandler)) { xmlStopParser(This->pParserCtxt); This->ret = E_FAIL; @@ -1767,7 +1755,7 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) for(; beg>=This->pParserCtxt->input->base && *beg!='\n' && *beg!='\r'; beg--) This->column++; - if (has_lexical_handler(This)) + if (saxreader_has_handler(This, SAXLexicalHandler)) { if (This->vbInterface) hr = IVBSAXLexicalHandler_startCDATA(lexical->vbhandler); @@ -1801,7 +1789,7 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) if(change) *end = '\n'; - if (has_content_handler(This)) + if (saxreader_has_handler(This, SAXContentHandler)) { Chars = pooled_bstr_from_xmlCharN(&This->saxreader->pool, cur, end-cur+1); if (This->vbInterface) @@ -1820,7 +1808,7 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) cur = end; } - if (has_lexical_handler(This)) + if (saxreader_has_handler(This, SAXLexicalHandler)) { if (This->vbInterface) hr = IVBSAXLexicalHandler_endCDATA(lexical->vbhandler);

1 0