wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Marko Nikolic : comctl32/tests: Use unsigned constants to remove sign comparison warning.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: 8c13dcc2e9f20165a27244d212ea4a8933449d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c13dcc2e9f20165a27244d21… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Tue May 31 23:38:46 2011 +0200 comctl32/tests: Use unsigned constants to remove sign comparison warning. --- dlls/comctl32/tests/treeview.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5fd26a0..324473d 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -634,7 +634,7 @@ static void test_get_set_bkcolor(void) /* If the value is -1, the control is using the system color for the background color. */ crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); - ok(crColor == -1, "Default background color reported as 0x%.8x\n", crColor); + ok(crColor == ~0u, "Default background color reported as 0x%.8x\n", crColor); /* Test for black background */ SendMessage( hTree, TVM_SETBKCOLOR, 0, RGB(0,0,0) ); @@ -873,7 +873,7 @@ static void test_get_set_textcolor(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); crColor = (COLORREF)SendMessage( hTree, TVM_GETTEXTCOLOR, 0, 0 ); - ok(crColor == -1, "Default text color reported as 0x%.8x\n", crColor); + ok(crColor == ~0u, "Default text color reported as 0x%.8x\n", crColor); /* Test for black text */ SendMessage( hTree, TVM_SETTEXTCOLOR, 0, RGB(0,0,0) ); @@ -1453,7 +1453,7 @@ static void test_WM_PAINT(void) hTree = create_treeview_control(0); clr = SendMessageA(hTree, TVM_SETBKCOLOR, 0, RGB(255, 0, 0)); - ok(clr == -1, "got %d, expected -1\n", clr); + ok(clr == ~0u, "got %d, expected -1\n", clr); hdc = GetDC(hMainWnd);

1 0

André Hentschel : winedbg: Increase buffer for function names.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: 3ea13c9c49fa738b97b9614884d8cfaea357932b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea13c9c49fa738b97b961488… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 31 20:17:34 2011 +0200 winedbg: Increase buffer for function names. --- programs/winedbg/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 51cf207..bc59eed 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -833,7 +833,7 @@ void info_win32_exception(void) break; case EXCEPTION_WINE_STUB: { - char dll[32], name[64]; + char dll[32], name[256]; memory_get_string(dbg_curr_process, (void*)rec->ExceptionInformation[0], TRUE, FALSE, dll, sizeof(dll));

1 0

Huw Davies : gdi32: Fix an error in the blue channel of the 32 -> 16 bpp conversion and update the tests to catch this.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: ea361367ed87a18704e8d36646e73692f3a1c69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea361367ed87a18704e8d3664… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 09:41:43 2011 +0100 gdi32: Fix an error in the blue channel of the 32 -> 16 bpp conversion and update the tests to catch this. --- dlls/gdi32/dibdrv/primitives.c | 2 +- dlls/gdi32/tests/dib.c | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 4711a65..411cddd 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -1038,7 +1038,7 @@ static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r src_val = *src_pixel++; *dst_pixel++ = ((src_val >> 9) & 0x7c00) | ((src_val >> 6) & 0x03e0) | - ((src_val >> 3) & 0x001e); + ((src_val >> 3) & 0x001f); } dst_start += dst->stride / 2; src_start += src->stride / 4; diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index c750a46..60791ca 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -91,8 +91,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "6c530622a025d872a642e8f950867884d7b136cb", "7c07d91b8f68fb31821701b3dcb96de018bf0c66", "b2261353decda2712b83538ab434a49ce21f3172", - "ef654fedcb494dae79559f4db8b691ae2d522a3f", - "a694872f38e66a7ff471440c3e6a9310ef78328a", + "35f731c0f6356b8f30651bb3cbe0d922c49deba5", + "9b9874c1c1d92afa554137e191d34ea33acc322f", "c311dd74325e8cebfc8529a6d24a6fa4ecb7137e", "d7398de15b2837a58a62a701ca1b3384625afec4", "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", @@ -120,8 +120,8 @@ static const char *sha1_graphics_a8b8g8r8[] = "bf57a6a37fb107d29ed3d45695919887abcb7902", "3db0f8bcca3d94920aa57be6321202b8c3c08822", "1f1fc165a4dae7ba118ddccb58a279bfe3876b0a", - "66da15b6780a4ca3b3d2eb1d1dba4e30f7b74964", - "42fefefe4435570fa8038ec759140c66c76570e9", + "8e09abb108e137c99527ab4c9bd07d95b9254bbb", + "b0178632775d29bec2b16de7b9b8287115c40d0f", "ca7e859647b9498b53fdd92543ad8aea98ff46f3", "3369889a67d6c79a24ee15f7d14374f9995215e4", "473a1fd07df800c87a5d3286b642ace10c61c6af", @@ -149,8 +149,8 @@ static const char *sha1_graphics_24[] = "0fa8cf332a56bb6d7e14e85861fdd60f51d70501", "593d694cdcc8349b3bfc8257041dbcb27e61da45", "1036b91d93e31cd1d4740d0c8642e115e5a38188", - "3469776cc7d8f6fd3bce17a39eec0b4092294e49", - "1cb7f3fcf42c9ca47a0689195ced239a09d3c308", + "1898073cdb35ca4d2b21bba933ac16a0b4297317", + "5068bff794553cf5a3145ae407c9a2984357844c", "413a7989969c229dee4ab1798362f32f96cf0a10", "0bb222e540b82720d4971e4a2fc626899af03e03", "adc20832d8c43f1cf372d8392535492013cd2306", @@ -178,8 +178,8 @@ static const char *sha1_graphics_r5g5b5[] = "420e39ff3bdd04c4b6cc2c98e99cb7993c7a0de5", "1fabf0fdd046857b1974e31c1c1764fa9d1a762f", "449092689226a1172b6086ba1181d6b6d6499f26", - "5c636ffadec10fbe440b552fe6436f3dbc607dcf", - "4aac89fc18c128eddb69eea658272af53138a1cb", + "1a92a60f190d33ef06d9decb56fd3fdd33f3af03", + "e61f5978c2e28c0c6d8f5eefe0f840c975586efc", "897d16f4d6a6ddad685d23ed7828d4f676539b75", "9d21bcfdeaf1ca5d47eb823bdefc24d7a95f4f56", "6daaf945a955928c5c124c880522ca4634fb2343", @@ -207,8 +207,8 @@ static const char *sha1_graphics_r4g4b4[] = "115a6bd382410a4a1d3c1fa71d8bf02536863e38", "65c6d1228e3b6d63d42647f14217bc1658b70d9a", "25fcb75aa687aac35b8f72640889fe92413e00c5", - "dbc8d66b419880108793db91c05766c0c6efd86d", - "6092ccbab6b6e073c6ac8244d122f2cfc453aa38", + "3bddf9d53e89560b083302b146cd33791b13d941", + "a81504498c7a7bb46340ce74476a42f70f2730b1", "e61a4f2657a444d8c49f84fb944f9f847667bf2b", "32b6e0aa79b7e96cd0ab2da167f6463c011023a8", "1d283aa4d2b2114f7809fe59357d590c7c779aa7", @@ -236,8 +236,8 @@ static const char *sha1_graphics_8[] = "5ba8f99ca034666effa556748c49a0f5a015125f", "b67ba2f55659c75ac72c1112494461bb3086e1a4", "73e2859ce849f756f954718ce3c90f02e31712b6", - "196d832d283bf642d2e481e5452ca175f7902761", - "9552f48b88982633a44001227abb847dae4d06b0", + "b1dff0f5dd233b44ee568878c5d3f8ae1d80c6d9", + "1f27dc1a1316fb7a4a78fe40fcd4bdae3aaad218", "6e375e1485a1e45ac6ab10af49645d5fb2e76dff", "cfc67c325c7cdf96d90af9b3cceb8d0504cbb3b0", "7262364067e03c7fa498af1d59d228d6c63b460e", @@ -265,8 +265,8 @@ static const char *sha1_graphics_4[] = "665bbbc749a5ffeedc0d62aef0661a5ce845b017", "1f26a01730f67d40ea711a50d9d801bac15a642e", "3b53d24178cfacba53103a44dfd5d072b15a6781", - "fa0d5f2d9419d8310fe4af7a290d13c5026c77de", - "5070ecae5085209508f7450d5f21c69737a178e9", + "c52cfd57f26037723d37192722fc3a217f280c9e", + "e34da6500cf2e424d980714d92737cf6c31a7bda", "d17f4358ae529f920960ed89e535902ee13b0033", "0f44e12ecd1ea7e39433890443626d4fc35204a4", "eb38683e812fd13dca971ba8f4cfd2b6820d3524", @@ -636,6 +636,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh brush_bits[14] = 0xff; brush_bits[65] = 0xff; brush_bits[69] = 0xff; + brush_bits[72] = 0xff; dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS);

1 0

Huw Davies : gdi32/tests: Add tests for 24 bpp brushes.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: cc4c2529620a3eaf78440a8ba2e71e55ff44bb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4c2529620a3eaf78440a8ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 09:41:42 2011 +0100 gdi32/tests: Add tests for 24 bpp brushes. --- dlls/gdi32/tests/dib.c | 50 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index e1ef345..c750a46 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -93,6 +93,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "b2261353decda2712b83538ab434a49ce21f3172", "ef654fedcb494dae79559f4db8b691ae2d522a3f", "a694872f38e66a7ff471440c3e6a9310ef78328a", + "c311dd74325e8cebfc8529a6d24a6fa4ecb7137e", "d7398de15b2837a58a62a701ca1b3384625afec4", "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "5246ef357e7317b9d141a3294d300c195da76cb7", @@ -121,6 +122,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "1f1fc165a4dae7ba118ddccb58a279bfe3876b0a", "66da15b6780a4ca3b3d2eb1d1dba4e30f7b74964", "42fefefe4435570fa8038ec759140c66c76570e9", + "ca7e859647b9498b53fdd92543ad8aea98ff46f3", "3369889a67d6c79a24ee15f7d14374f9995215e4", "473a1fd07df800c87a5d3286b642ace10c61c6af", "10cd25a0ed5cd8f978d7d68236f81d949b938e84", @@ -149,6 +151,7 @@ static const char *sha1_graphics_24[] = "1036b91d93e31cd1d4740d0c8642e115e5a38188", "3469776cc7d8f6fd3bce17a39eec0b4092294e49", "1cb7f3fcf42c9ca47a0689195ced239a09d3c308", + "413a7989969c229dee4ab1798362f32f96cf0a10", "0bb222e540b82720d4971e4a2fc626899af03e03", "adc20832d8c43f1cf372d8392535492013cd2306", "45649794dcbcabda487f66f7a80fc1bec79047a1", @@ -177,6 +180,7 @@ static const char *sha1_graphics_r5g5b5[] = "449092689226a1172b6086ba1181d6b6d6499f26", "5c636ffadec10fbe440b552fe6436f3dbc607dcf", "4aac89fc18c128eddb69eea658272af53138a1cb", + "897d16f4d6a6ddad685d23ed7828d4f676539b75", "9d21bcfdeaf1ca5d47eb823bdefc24d7a95f4f56", "6daaf945a955928c5c124c880522ca4634fb2343", "12a288390d16e1efa99d4185301de48a4d433b14", @@ -205,6 +209,7 @@ static const char *sha1_graphics_r4g4b4[] = "25fcb75aa687aac35b8f72640889fe92413e00c5", "dbc8d66b419880108793db91c05766c0c6efd86d", "6092ccbab6b6e073c6ac8244d122f2cfc453aa38", + "e61a4f2657a444d8c49f84fb944f9f847667bf2b", "32b6e0aa79b7e96cd0ab2da167f6463c011023a8", "1d283aa4d2b2114f7809fe59357d590c7c779aa7", "29640e2ddd2d3016da14507c3ce9b2ce32f39bb4", @@ -233,6 +238,7 @@ static const char *sha1_graphics_8[] = "73e2859ce849f756f954718ce3c90f02e31712b6", "196d832d283bf642d2e481e5452ca175f7902761", "9552f48b88982633a44001227abb847dae4d06b0", + "6e375e1485a1e45ac6ab10af49645d5fb2e76dff", "cfc67c325c7cdf96d90af9b3cceb8d0504cbb3b0", "7262364067e03c7fa498af1d59d228d6c63b460e", "5241241a355a667ef0834049adf4218e8b3f16b8", @@ -261,6 +267,7 @@ static const char *sha1_graphics_4[] = "3b53d24178cfacba53103a44dfd5d072b15a6781", "fa0d5f2d9419d8310fe4af7a290d13c5026c77de", "5070ecae5085209508f7450d5f21c69737a178e9", + "d17f4358ae529f920960ed89e535902ee13b0033", "0f44e12ecd1ea7e39433890443626d4fc35204a4", "eb38683e812fd13dca971ba8f4cfd2b6820d3524", "73bbc83f88f1aaa6df0158b63e70bb3165163163", @@ -435,7 +442,8 @@ static const RECT rectangles[] = {200, 40, 210, 43} /* height == 3 */ }; -static const BITMAPINFOHEADER dib_brush_header_32 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 32, BI_RGB, 0, 0, 0, 0, 0}; +static const BITMAPINFOHEADER dib_brush_header_8888 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 32, BI_RGB, 0, 0, 0, 0, 0}; +static const BITMAPINFOHEADER dib_brush_header_24 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 24, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_555 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 16, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_8 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 8, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_4 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 4, BI_RGB, 0, 0, 0, 0, 0}; @@ -618,9 +626,9 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh ExtSelectClipRgn(hdc, NULL, RGN_COPY); - /* DIB pattern brush */ + /* 8888 DIB pattern brush */ - brush_bi->bmiHeader = dib_brush_header_32; + brush_bi->bmiHeader = dib_brush_header_8888; brush_bits = (BYTE*)brush_bi + sizeof(BITMAPINFOHEADER); memset(brush_bits, 0, 16 * 16 * sizeof(DWORD)); brush_bits[2] = 0xff; @@ -645,13 +653,13 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash(bmi, bits, sha1, "top-down dib brush patblt"); + compare_hash(bmi, bits, sha1, "top-down 8888 dib brush patblt"); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); DeleteObject(dib_brush); - /* Bottom-up DIB pattern brush */ + /* 8888 bottom-up DIB pattern brush */ brush_bi->bmiHeader.biHeight = -brush_bi->bmiHeader.biHeight; @@ -675,9 +683,39 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash(bmi, bits, sha1, "bottom-up dib brush patblt"); + compare_hash(bmi, bits, sha1, "bottom-up 8888 dib brush patblt"); memset(bits, 0xcc, dib_size); + /* 24 bpp dib pattern brush */ + + brush_bi->bmiHeader = dib_brush_header_24; + brush_bits = (BYTE*)brush_bi + sizeof(BITMAPINFOHEADER); + memset(brush_bits, 0, 16 * 16 * 3); + brush_bits[0] = brush_bits[3] = brush_bits[6] = brush_bits[8] = 0xff; + brush_bits[49] = brush_bits[52] = 0xff; + + dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS); + + SelectObject(hdc, dib_brush); + SetBrushOrgEx(hdc, 1, 1, NULL); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + if(!rop_uses_src(rop3[i])) + { + ret = PatBlt(hdc, 10 + i, y, 100, 20, rop3[i]); + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 25; + } + } + compare_hash(bmi, bits, sha1, "top-down 24 bpp brush patblt"); + memset(bits, 0xcc, dib_size); + + SelectObject(hdc, orig_brush); + DeleteObject(dib_brush); + /* 555 dib pattern brush */ brush_bi->bmiHeader = dib_brush_header_555;

1 0

Huw Davies : gdi32: Add support for 24 bpp brushes.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: 146ad997ba8e29c9f3ff0cd0db1489c3a1d65691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=146ad997ba8e29c9f3ff0cd0d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 09:41:41 2011 +0100 gdi32: Add support for 24 bpp brushes. --- dlls/gdi32/dibdrv/primitives.c | 174 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index b7270e9..4711a65 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -626,6 +626,29 @@ static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_ break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + *dst_pixel++ = ((rgb.rgbRed << 16) & 0xff0000) | ((rgb.rgbGreen << 8) & 0x00ff00) | (rgb.rgbBlue & 0x0000ff); + } + dst_start += dst->stride / 4; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; @@ -743,6 +766,31 @@ static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + *dst_pixel++ = put_field(rgb.rgbRed, dst->red_shift, dst->red_len) | + put_field(rgb.rgbGreen, dst->green_shift, dst->green_len) | + put_field(rgb.rgbBlue, dst->blue_shift, dst->blue_len); + } + dst_start += dst->stride / 4; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; @@ -864,6 +912,24 @@ static BOOL convert_to_24(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top); + + if(src->stride > 0 && dst->stride > 0 && src_rect->left == 0 && src_rect->right == src->width) + memcpy(dst->bits, src_start, (src_rect->bottom - src_rect->top) * src->stride); + else + { + for(y = src_rect->top; y < src_rect->bottom; y++) + { + memcpy(dst_start, src_start, (src_rect->right - src_rect->left) * 3); + dst_start += dst->stride; + src_start += src->stride; + } + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; @@ -986,6 +1052,31 @@ static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + *dst_pixel++ = ((rgb.rgbRed << 7) & 0x7c00) | + ((rgb.rgbGreen << 2) & 0x03e0) | + ((rgb.rgbBlue >> 3) & 0x001f); + } + dst_start += dst->stride / 2; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top); @@ -1105,6 +1196,31 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + *dst_pixel++ = put_field(rgb.rgbRed, dst->red_shift, dst->red_len) | + put_field(rgb.rgbGreen, dst->green_shift, dst->green_len) | + put_field(rgb.rgbBlue, dst->blue_shift, dst->blue_len); + } + dst_start += dst->stride / 2; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; @@ -1235,6 +1351,31 @@ static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + *dst_pixel++ = colorref_to_pixel_colortable(dst, ( rgb.rgbRed & 0x0000ff) | + ((rgb.rgbGreen << 8) & 0x00ff00) | + ((rgb.rgbBlue << 16) & 0xff0000)); + } + dst_start += dst->stride; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; @@ -1378,6 +1519,39 @@ static BOOL convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rec break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + dst_val = colorref_to_pixel_colortable(dst, ( rgb.rgbRed & 0x0000ff) | + ((rgb.rgbGreen << 8) & 0x00ff00) | + ((rgb.rgbBlue << 16) & 0xff0000)); + + if((x - src_rect->left) & 1) + { + *dst_pixel = (dst_val & 0x0f) | (*dst_pixel & 0xf0); + dst_pixel++; + } + else + *dst_pixel = (dst_val << 4) & 0xf0; + } + dst_start += dst->stride; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel;

1 0

Huw Davies : gdi32/tests: Add tests for 24 bpp dibs.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: ce2c593d64edd9f304501d5b41771a05e3f1c815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2c593d64edd9f304501d5b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 09:41:40 2011 +0100 gdi32/tests: Add tests for 24 bpp dibs. --- dlls/gdi32/tests/dib.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 4322ed8..e1ef345 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -130,6 +130,34 @@ static const char *sha1_graphics_a8b8g8r8[] = NULL }; +static const char *sha1_graphics_24[] = +{ + "e993b15c9bd14fb45a15310450b7083c44e42665", + "edbd7bab3d957fbc85e89612197cf918f5f5af20", + "6a7efb3b6e0b49336df1bd2937ca09a11d976531", + "236eb5ca9da70ec7cc719cd2fd291bab14000257", + "f98023c7cd8c068f2d7a77ce3600004b90ea12d6", + "5c4cb9cea2226fc671bb4a11f8253343ee94bb4b", + "fd4be592483623dbc800fe28210a1f0daa71999b", + "788b8de98c47974fa9f232a6042ae4ca546ddb7d", + "a8772e6c44ba633fb384a7c4b50b435f1406107e", + "883bc8f305c602edca785e21cd00f488583fb13f", + "3bac4e80993f49dc3926e30524115fca9d7a8026", + "91369e35be29059a0665782541db4c8b324c6bb2", + "0fa8cf332a56bb6d7e14e85861fdd60f51d70501", + "593d694cdcc8349b3bfc8257041dbcb27e61da45", + "1036b91d93e31cd1d4740d0c8642e115e5a38188", + "3469776cc7d8f6fd3bce17a39eec0b4092294e49", + "1cb7f3fcf42c9ca47a0689195ced239a09d3c308", + "0bb222e540b82720d4971e4a2fc626899af03e03", + "adc20832d8c43f1cf372d8392535492013cd2306", + "45649794dcbcabda487f66f7a80fc1bec79047a1", + "b4df692ac70a5f9f303270df4641ab014c6cbf46", + "8bc3128ba47891366fd7b02fde7ca19100e64b9f", + "e649e00efe7fea1eb8b17f7867fe089e5270c44b", + NULL +}; + static const char *sha1_graphics_r5g5b5[] = { "2a2ab8b3c019e70b788ade028b0e9e53ffc529ae", @@ -630,7 +658,11 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS); SelectObject(hdc, dib_brush); - SetBrushOrgEx(hdc, 100, 100, NULL); + + /* This used to set the x origin to 100 as well, but + there's a Windows bug for 24 bpp where the brush's x offset + is incorrectly calculated for rops that involve both D and P */ + SetBrushOrgEx(hdc, 4, 100, NULL); for(i = 0, y = 10; i < 256; i++) { @@ -884,6 +916,21 @@ static void test_simple_graphics(void) SelectObject(mem_dc, orig_bm); DeleteObject(dib); + /* 24 */ + trace("24\n"); + bmi->bmiHeader.biBitCount = 24; + bmi->bmiHeader.biCompression = BI_RGB; + + dib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(dib != NULL, "ret NULL\n"); + orig_bm = SelectObject(mem_dc, dib); + + sha1 = sha1_graphics_24; + draw_graphics(mem_dc, bmi, bits, &sha1); + + SelectObject(mem_dc, orig_bm); + DeleteObject(dib); + /* r5g5b5 */ trace("555\n"); bmi->bmiHeader.biBitCount = 16;

1 0

Huw Davies : gdi32: Add support for 24 bpp dibs.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: dc7ff3a45ac384364ab851b62242bfe64b4e7c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7ff3a45ac384364ab851b62… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 09:41:39 2011 +0100 gdi32: Add support for 24 bpp dibs. --- dlls/gdi32/dibdrv/dc.c | 4 + dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 268 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 273 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc7ff3a45ac384364ab85…

1 0

Hans Leidekker : wininet: Consistently use the allocation macros.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: 9acd1ef15ff5eec14bc8edbce315cbe9167c6e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acd1ef15ff5eec14bc8edbce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 1 11:50:53 2011 +0200 wininet: Consistently use the allocation macros. --- dlls/wininet/cookie.c | 48 ++++----- dlls/wininet/dialogs.c | 10 +- dlls/wininet/ftp.c | 92 +++++++++--------- dlls/wininet/http.c | 216 ++++++++++++++++++++---------------------- dlls/wininet/internet.c | 129 ++++++++++++-------------- dlls/wininet/netconnection.c | 6 +- dlls/wininet/urlcache.c | 116 +++++++++++------------ dlls/wininet/utility.c | 8 +- 8 files changed, 291 insertions(+), 334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9acd1ef15ff5eec14bc8e…

1 0

Hans Leidekker : wininet: Don' t change the verb if the server response is HTTP_STATUS_REDIRECT_KEEP_VERB.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: 14d4d1957d599ca4f1ad269a04a3c9f5c14261f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d4d1957d599ca4f1ad269a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 1 11:50:32 2011 +0200 wininet: Don't change the verb if the server response is HTTP_STATUS_REDIRECT_KEEP_VERB. --- dlls/wininet/http.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a8dbd3d..cc9d480 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4734,7 +4734,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, dwStatusCode == HTTP_STATUS_REDIRECT_METHOD) && HTTP_HttpQueryInfoW(request,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL) == ERROR_SUCCESS) { - if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD)) + if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) && + dwStatusCode != HTTP_STATUS_REDIRECT_KEEP_VERB) { HeapFree(GetProcessHeap(), 0, request->verb); request->verb = heap_strdupW(szGET); @@ -4904,7 +4905,8 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ dwBufferSize=sizeof(szNewLocation); if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_LOCATION, szNewLocation, &dwBufferSize, NULL) == ERROR_SUCCESS) { - if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD)) + if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) && + dwCode != HTTP_STATUS_REDIRECT_KEEP_VERB) { HeapFree(GetProcessHeap(), 0, request->verb); request->verb = heap_strdupW(szGET);

1 0

Hans Leidekker : winhttp: Don' t change the verb if the server response is HTTP_STATUS_REDIRECT_KEEP_VERB.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: b7df063fde8628d94dca56ece3f830f75d1fcddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7df063fde8628d94dca56ece… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 1 11:50:11 2011 +0200 winhttp: Don't change the verb if the server response is HTTP_STATUS_REDIRECT_KEEP_VERB. --- dlls/winhttp/request.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8a21ab5..c8eca75 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1544,7 +1544,7 @@ end: return TRUE; } -static BOOL handle_redirect( request_t *request ) +static BOOL handle_redirect( request_t *request, DWORD status ) { BOOL ret = FALSE; DWORD size, len; @@ -1626,9 +1626,11 @@ static BOOL handle_redirect( request_t *request ) if ((index = get_header_index( request, attr_content_type, 0, TRUE )) >= 0) delete_header( request, index ); if ((index = get_header_index( request, attr_content_length, 0, TRUE )) >= 0 ) delete_header( request, index ); - /* redirects are always GET requests */ - heap_free( request->verb ); - request->verb = strdupW( getW ); + if (status != HTTP_STATUS_REDIRECT_KEEP_VERB) + { + heap_free( request->verb ); + request->verb = strdupW( getW ); + } ret = TRUE; end: @@ -1840,7 +1842,7 @@ static BOOL receive_response( request_t *request, BOOL async ) if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS) break; drain_content( request ); - if (!(ret = handle_redirect( request ))) break; + if (!(ret = handle_redirect( request, status ))) break; clear_response_headers( request ); ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */

1 0

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 June 2011