May 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : msvcp90: Add an msvcp-specific size_t to avoid casts in traces.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: cfad9c3d54f6f299cde85df9dbb0bbc34a673bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfad9c3d54f6f299cde85df9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 14:56:18 2011 +0200 msvcp90: Add an msvcp-specific size_t to avoid casts in traces. --- dlls/msvcp90/ios.c | 18 ++-- dlls/msvcp90/memory.c | 26 +++--- dlls/msvcp90/msvcp90.h | 19 ++-- dlls/msvcp90/msvcp90_main.c | 2 +- dlls/msvcp90/string.c | 244 +++++++++++++++++++++---------------------- 5 files changed, 153 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfad9c3d54f6f299cde85…

1 0

Huw Davies : gdi32/tests: Make the 32 bpp brush tests sensitive to a nibble swap in the 4 bpp case.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 68d07efabc71c35e91a77c234953df7657206067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d07efabc71c35e91a77c234… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 13:02:31 2011 +0100 gdi32/tests: Make the 32 bpp brush tests sensitive to a nibble swap in the 4 bpp case. --- dlls/gdi32/tests/dib.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 915aec6..6300398 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", - "a8b59f25984b066fc6b91cae6bf983a78028ba7f", - "3d95adb85b9673a932ac847a4b5451fa59885f74", + "ef654fedcb494dae79559f4db8b691ae2d522a3f", + "a694872f38e66a7ff471440c3e6a9310ef78328a", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -451,6 +451,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh memset(brush_bits, 0, 16 * 16 * sizeof(DWORD)); brush_bits[2] = 0xff; brush_bits[6] = 0xff; + brush_bits[14] = 0xff; brush_bits[65] = 0xff; brush_bits[69] = 0xff;

1 0

Huw Davies : gdi32: Add support for 16 bpp dibs.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 18a96edf6932f42abca5e327a043ead088c6c8fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a96edf6932f42abca5e327a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 13:10:29 2011 +0100 gdi32: Add support for 16 bpp dibs. --- dlls/gdi32/dibdrv/dc.c | 13 ++++++ dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/primitives.c | 92 +++++++++++++++++++++++++++++++++++++++- dlls/gdi32/tests/dib.c | 32 ++++++++++++++ 4 files changed, 138 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 6cc1d33..98463b7 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -66,6 +66,7 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) { static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; + static const DWORD bit_fields_555[3] = {0x7c00, 0x03e0, 0x001f}; dib->bit_count = bi->biBitCount; dib->width = bi->biWidth; @@ -100,6 +101,18 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD dib->funcs = &funcs_32; break; + case 16: + if(bi->biCompression == BI_RGB) + bit_fields = bit_fields_555; + + init_bit_fields(dib, bit_fields); + + if(dib->red_mask == 0x7c00 && dib->green_mask == 0x03e0 && dib->blue_mask == 0x001f) + dib->funcs = &funcs_555; + else + dib->funcs = &funcs_16; + break; + default: TRACE("bpp %d not supported, will forward to graphics driver.\n", dib->bit_count); return FALSE; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index ccf9f9a..0b5dba3 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -46,6 +46,8 @@ typedef struct primitive_funcs extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_32 DECLSPEC_HIDDEN; +extern const primitive_funcs funcs_555 DECLSPEC_HIDDEN; +extern const primitive_funcs funcs_16 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 6dec478..c1d1597 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -26,11 +26,21 @@ static inline DWORD *get_pixel_ptr_32(const dib_info *dib, int x, int y) return (DWORD *)((BYTE*)dib->bits + y * dib->stride + x * 4); } +static inline WORD *get_pixel_ptr_16(const dib_info *dib, int x, int y) +{ + return (WORD *)((BYTE*)dib->bits + y * dib->stride + x * 2); +} + static inline void do_rop_32(DWORD *ptr, DWORD and, DWORD xor) { *ptr = (*ptr & and) ^ xor; } +static inline void do_rop_16(WORD *ptr, WORD and, WORD xor) +{ + *ptr = (*ptr & and) ^ xor; +} + static void solid_rects_32(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) { DWORD *ptr, *start; @@ -38,13 +48,27 @@ static void solid_rects_32(const dib_info *dib, int num, const RECT *rc, DWORD a for(i = 0; i < num; i++, rc++) { - start = ptr = get_pixel_ptr_32(dib, rc->left, rc->top); + start = get_pixel_ptr_32(dib, rc->left, rc->top); for(y = rc->top; y < rc->bottom; y++, start += dib->stride / 4) for(x = rc->left, ptr = start; x < rc->right; x++) do_rop_32(ptr++, and, xor); } } +static void solid_rects_16(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) +{ + WORD *ptr, *start; + int x, y, i; + + for(i = 0; i < num; i++, rc++) + { + start = get_pixel_ptr_16(dib, rc->left, rc->top); + for(y = rc->top; y < rc->bottom; y++, start += dib->stride / 2) + for(x = rc->left, ptr = start; x < rc->right; x++) + do_rop_16(ptr++, and, xor); + } +} + static void solid_rects_null(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) { return; @@ -120,6 +144,52 @@ static void pattern_rects_32(const dib_info *dib, int num, const RECT *rc, const } } +static void pattern_rects_16(const dib_info *dib, int num, const RECT *rc, const POINT *origin, + const dib_info *brush, void *and_bits, void *xor_bits) +{ + WORD *ptr, *start, *start_and, *and_ptr, *start_xor, *xor_ptr; + int x, y, i; + POINT offset; + + for(i = 0; i < num; i++, rc++) + { + offset = calc_brush_offset(rc, brush, origin); + + start = get_pixel_ptr_16(dib, rc->left, rc->top); + start_and = (WORD*)and_bits + offset.y * brush->stride / 2; + start_xor = (WORD*)xor_bits + offset.y * brush->stride / 2; + + for(y = rc->top; y < rc->bottom; y++, start += dib->stride / 2) + { + and_ptr = start_and + offset.x; + xor_ptr = start_xor + offset.x; + + for(x = rc->left, ptr = start; x < rc->right; x++) + { + do_rop_16(ptr++, *and_ptr++, *xor_ptr++); + if(and_ptr == start_and + brush->width) + { + and_ptr = start_and; + xor_ptr = start_xor; + } + } + + offset.y++; + if(offset.y == brush->height) + { + start_and = and_bits; + start_xor = xor_bits; + offset.y = 0; + } + else + { + start_and += brush->stride / 2; + start_xor += brush->stride / 2; + } + } + } +} + static void pattern_rects_null(const dib_info *dib, int num, const RECT *rc, const POINT *origin, const dib_info *brush, void *and_bits, void *xor_bits) { @@ -156,6 +226,12 @@ static DWORD colorref_to_pixel_masks(const dib_info *dib, COLORREF colour) put_field(b, dib->blue_shift, dib->blue_len); } +static DWORD colorref_to_pixel_555(const dib_info *dib, COLORREF color) +{ + return ( ((color >> 19) & 0x1f) | ((color >> 6) & 0x03e0) | ((color << 7) & 0x7c00) ); +} + + static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) { return 0; @@ -175,6 +251,20 @@ const primitive_funcs funcs_32 = colorref_to_pixel_masks }; +const primitive_funcs funcs_555 = +{ + solid_rects_16, + pattern_rects_16, + colorref_to_pixel_555 +}; + +const primitive_funcs funcs_16 = +{ + solid_rects_16, + pattern_rects_16, + colorref_to_pixel_masks +}; + const primitive_funcs funcs_null = { solid_rects_null, diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 6300398..e2fd0ef 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -99,6 +99,31 @@ static const char *sha1_graphics_a8r8g8b8[] = NULL }; +static const char *sha1_graphics_r5g5b5[] = +{ + "2a2ab8b3c019e70b788ade028b0e9e53ffc529ae", + "847005cf7371f511bcc837251cde07b1796f6113", + "a8f75743a930843ec14d516cd048b6e0468e5d89", + "d094f51ce9b9daa9c1d9594ea88be2a2db651459", + "cf3928e240c9149788e1635b115a4e5baea0dd8f", + "a9034a905daa91757b4f63345c0e40638cd53ca8", + "15ee915d989e49bb9bab5b834d8f355bd067cd8f", + "99474fecf11df7b7035c35be6b8b697be9889418", + "cbc2898717f97ebb07c0c7cc04abde936dc5b584", + "29c896b591fdf4ddd23e5c0da1818c37e4686d94", + "4b5b275d33c1ebfe5bdc61df2ad125e865b800fa", + "92df731fa1f89550d9d4f7ea36c13f2e57c4b02a", + "420e39ff3bdd04c4b6cc2c98e99cb7993c7a0de5", + "1fabf0fdd046857b1974e31c1c1764fa9d1a762f", + "449092689226a1172b6086ba1181d6b6d6499f26", + "5c636ffadec10fbe440b552fe6436f3dbc607dcf", + "4aac89fc18c128eddb69eea658272af53138a1cb", + "3a50ce21b3563a604b4fc9f247a30f5a981f1ba6", + "d7d97e28ed316f6596c737eb83baa5948d86b673", + "ecc2991277d7314f55b00e0f284ae3703aeef81e", + NULL +}; + static inline DWORD get_stride(BITMAPINFO *bmi) { return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; @@ -623,6 +648,7 @@ static void test_simple_graphics(void) /* r5g5b5 */ + trace("555\n"); bmi->bmiHeader.biBitCount = 16; bmi->bmiHeader.biCompression = BI_RGB; @@ -635,6 +661,12 @@ static void test_simple_graphics(void) todo_wine ok(ds.dsBmih.biCompression == BI_BITFIELDS, "got %x\n", ds.dsBmih.biCompression); + orig_bm = SelectObject(mem_dc, dib); + + sha1 = sha1_graphics_r5g5b5; + draw_graphics(mem_dc, bmi, bits, &sha1); + + SelectObject(mem_dc, orig_bm); DeleteObject(dib); DeleteDC(mem_dc);

1 0

Huw Davies : gdi32: Add conversion routines to the primitive functions.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 0a9eae97d27976e72874e2672ec8c3ab5be84b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9eae97d27976e72874e2672… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 13:41:32 2011 +0100 gdi32: Add conversion routines to the primitive functions. --- dlls/gdi32/dibdrv/dc.c | 51 ++------ dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 12 +-- dlls/gdi32/dibdrv/primitives.c | 307 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 315 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a9eae97d27976e72874e…

1 0

Huw Davies : gdi32/tests: Add tests for 16 bpp brushes.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: ede526196e486ca097cb6867a2fcc98b8e9faa66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede526196e486ca097cb6867a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 13:48:26 2011 +0100 gdi32/tests: Add tests for 16 bpp brushes. --- dlls/gdi32/tests/dib.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index e2fd0ef..5c341d5 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", + "d7398de15b2837a58a62a701ca1b3384625afec4", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -118,6 +119,7 @@ static const char *sha1_graphics_r5g5b5[] = "449092689226a1172b6086ba1181d6b6d6499f26", "5c636ffadec10fbe440b552fe6436f3dbc607dcf", "4aac89fc18c128eddb69eea658272af53138a1cb", + "9d21bcfdeaf1ca5d47eb823bdefc24d7a95f4f56", "3a50ce21b3563a604b4fc9f247a30f5a981f1ba6", "d7d97e28ed316f6596c737eb83baa5948d86b673", "ecc2991277d7314f55b00e0f284ae3703aeef81e", @@ -286,10 +288,11 @@ static const RECT rectangles[] = {140, 20, 143, 30}, /* width == 3 */ {200, 20, 210, 21}, /* height == 1 */ {200, 30, 210, 32}, /* height == 2 */ - {200, 40, 210, 43} /* height == 3 */ + {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_32 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 32, 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 void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { @@ -525,6 +528,36 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "bottom-up dib brush patblt"); memset(bits, 0xcc, dib_size); + /* 555 dib pattern brush */ + + brush_bi->bmiHeader = dib_brush_header_555; + brush_bits = (BYTE*)brush_bi + sizeof(BITMAPINFOHEADER); + memset(brush_bits, 0, 16 * 16 * sizeof(WORD)); + brush_bits[0] = brush_bits[1] = 0xff; + brush_bits[32] = brush_bits[34] = 0x7c; + + 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 555 dib brush patblt"); + memset(bits, 0xcc, dib_size); + + SelectObject(hdc, orig_brush); + DeleteObject(dib_brush); + SetBrushOrgEx(hdc, 0, 0, NULL); /* Rectangle */

1 0

André Hentschel : ws2_32/tests: Add test for SIOCATMARK.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 979f872fc7c2cbce3d46e4fdb597a72396462f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=979f872fc7c2cbce3d46e4fdb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 26 23:50:32 2011 +0200 ws2_32/tests: Add test for SIOCATMARK. --- dlls/ws2_32/tests/sock.c | 154 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 150 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ac0a7d0..d1ac3c4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -30,7 +30,6 @@ #include "wine/test.h" #define MAX_CLIENTS 4 /* Max number of clients */ -#define NUM_TESTS 4 /* Number of tests performed */ #define FIRST_CHAR 'A' /* First character in transferred pattern */ #define BIND_SLEEP 10 /* seconds to wait between attempts to bind() */ #define BIND_TRIES 6 /* Number of bind() attempts */ @@ -252,6 +251,16 @@ static void read_zero_bytes ( SOCKET s ) ok ( n <= 0, "garbage data received: %d bytes\n", n ); } +static int do_oob_send ( SOCKET s, char *buf, int buflen, int sendlen ) +{ + char* last = buf + buflen, *p; + int n = 1; + for ( p = buf; n > 0 && p < last; p += n ) + n = send ( s, p, min ( sendlen, last - p ), MSG_OOB ); + wsa_ok ( n, 0 <=, "do_oob_send (%x): error %d\n" ); + return p - buf; +} + static int do_synchronous_send ( SOCKET s, char *buf, int buflen, int sendlen ) { char* last = buf + buflen, *p; @@ -455,6 +464,76 @@ static VOID WINAPI simple_server ( server_params *par ) } /* + * oob_server: A very basic server receiving out-of-band data. + */ +static VOID WINAPI oob_server ( server_params *par ) +{ + test_params *gen = par->general; + server_memory *mem; + u_long atmark; + int pos, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, tmp, + id = GetCurrentThreadId(); + + trace ( "oob_server (%x) starting\n", id ); + + set_so_opentype ( FALSE ); /* non-overlapped */ + server_start ( par ); + mem = TlsGetValue ( tls ); + + wsa_ok ( set_blocking ( mem->s, TRUE ), 0 ==, "oob_server (%x): failed to set blocking mode: %d\n"); + wsa_ok ( listen ( mem->s, SOMAXCONN ), 0 ==, "oob_server (%x): listen failed: %d\n"); + + trace ( "oob_server (%x) ready\n", id ); + SetEvent ( server_ready ); /* notify clients */ + + trace ( "oob_server (%x): waiting for client\n", id ); + + /* accept a single connection */ + tmp = sizeof ( mem->sock[0].peer ); + mem->sock[0].s = accept ( mem->s, (struct sockaddr*) &mem->sock[0].peer, &tmp ); + wsa_ok ( mem->sock[0].s, INVALID_SOCKET !=, "oob_server (%x): accept failed: %d\n" ); + + ok ( mem->sock[0].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ), + "oob_server (%x): strange peer address\n", id ); + + /* check atmark state */ + ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); + todo_wine ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); + + /* Receive normal data and check atmark state */ + n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + ok ( n_recvd == n_expected, + "simple_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); + pos = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "simple_server (%x): test pattern error: %d\n", id, pos); + + ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); + todo_wine ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); + + /* Receive a part of the out-of-band data and check atmark state */ + n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, 8, par->buflen ); + ok ( n_recvd == 8, + "oob_server (%x): received less data than expected: %d of %d\n", id, n_recvd, 8 ); + n_expected -= 8; + + ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); + ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); + + /* Receive the rest of the out-of-band data and check atmark state */ + n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + + ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); + ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); + + /* cleanup */ + wsa_ok ( closesocket ( mem->sock[0].s ), 0 ==, "oob_server (%x): closesocket error: %d\n" ); + mem->sock[0].s = INVALID_SOCKET; + + trace ( "oob_server (%x) exiting\n", id ); + server_stop (); +} + +/* * select_server: A non-blocking server. */ static VOID WINAPI select_server ( server_params *par ) @@ -637,6 +716,52 @@ static VOID WINAPI simple_client ( client_params *par ) } /* + * oob_client: A very basic client sending out-of-band data. + */ +static VOID WINAPI oob_client ( client_params *par ) +{ + test_params *gen = par->general; + client_memory *mem; + int n_sent, n_expected = gen->n_chunks * gen->chunk_size, id; + + id = GetCurrentThreadId(); + trace ( "oob_client (%x): starting\n", id ); + /* wait here because we want to call set_so_opentype before creating a socket */ + WaitForSingleObject ( server_ready, INFINITE ); + trace ( "oob_client (%x): server ready\n", id ); + + check_so_opentype (); + set_so_opentype ( FALSE ); /* non-overlapped */ + client_start ( par ); + mem = TlsGetValue ( tls ); + + /* Connect */ + wsa_ok ( connect ( mem->s, (struct sockaddr*) &mem->addr, sizeof ( mem->addr ) ), + 0 ==, "oob_client (%x): connect error: %d\n" ); + ok ( set_blocking ( mem->s, TRUE ) == 0, + "oob_client (%x): failed to set blocking mode\n", id ); + trace ( "oob_client (%x) connected\n", id ); + + /* send data to server */ + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + ok ( n_sent == n_expected, + "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); + + /* send out-of-band data to server */ + n_sent = do_oob_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + ok ( n_sent == n_expected, + "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); + + /* shutdown send direction */ + wsa_ok ( shutdown ( mem->s, SD_SEND ), 0 ==, "simple_client (%x): shutdown failed: %d\n" ); + + /* cleanup */ + read_zero_bytes ( mem->s ); + trace ( "oob_client (%x) exiting\n", id ); + client_stop (); +} + +/* * simple_mixed_client: mixing send and recvfrom */ static VOID WINAPI simple_mixed_client ( client_params *par ) @@ -1268,7 +1393,7 @@ cleanup: SERVERIP, \ SERVERPORT -static test_setup tests [NUM_TESTS] = +static test_setup tests [] = { /* Test 0: synchronous client and server */ { @@ -1333,7 +1458,28 @@ static test_setup tests [NUM_TESTS] = 128 } }, - /* Test 3: synchronous mixed client and server */ + /* Test 3: OOB client, OOB server */ + { + { + STD_STREAM_SOCKET, + 128, + 16, + 1 + }, + oob_server, + { + NULL, + 0, + 128 + }, + oob_client, + { + NULL, + 0, + 128 + } + }, + /* Test 4: synchronous mixed client and server */ { { STD_STREAM_SOCKET, @@ -4682,7 +4828,7 @@ START_TEST( sock ) test_ip_pktinfo(); test_extendedSocketOptions(); - for (i = 0; i < NUM_TESTS; i++) + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { trace ( " **** STARTING TEST %d ****\n", i ); do_test ( &tests[i] );

1 0

Stefan Dösinger : wined3d: Call context_apply_draw_buffers under the GL lock.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 5b9daccc66fa1847d2816649d7eb77984c6da9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9daccc66fa1847d2816649d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 27 13:43:58 2011 +0200 wined3d: Call context_apply_draw_buffers under the GL lock. --- dlls/wined3d/context.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 98f1f7d..0494252 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1974,26 +1974,21 @@ static struct wined3d_context *FindContext(struct wined3d_device *device, struct return context; } -/* Context activation is done by the caller. */ +/* Context activation and GL locking are done by the caller. */ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask, struct wined3d_surface **rts) { if (!rt_mask) { - ENTER_GL(); glDrawBuffer(GL_NONE); checkGLcall("glDrawBuffer()"); - LEAVE_GL(); } else if (!surface_is_offscreen(rts[0])) { - ENTER_GL(); glDrawBuffer(surface_get_gl_buffer(rts[0])); checkGLcall("glDrawBuffer()"); - LEAVE_GL(); } else { - ENTER_GL(); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2026,7 +2021,6 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt glDrawBuffer(rts[0]->resource.device->offscreenBuffer); checkGLcall("glDrawBuffer()"); } - LEAVE_GL(); } } @@ -2115,6 +2109,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de context->draw_buffer_dirty = TRUE; } + ENTER_GL(); if (context->draw_buffer_dirty) { context_apply_draw_buffers(context, 1, &context->current_rt); @@ -2124,10 +2119,9 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - ENTER_GL(); context_check_fbo_status(context, GL_FRAMEBUFFER); - LEAVE_GL(); } + LEAVE_GL(); SetupForBlit(device, context); } @@ -2196,17 +2190,15 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d rt_mask = 1; } + ENTER_GL(); context_apply_draw_buffers(context, rt_mask, rts); context->draw_buffer_dirty = TRUE; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - ENTER_GL(); context_check_fbo_status(context, GL_FRAMEBUFFER); - LEAVE_GL(); } - ENTER_GL(); if (context->last_was_blit) { device->frag_pipe->enable_extension(TRUE); @@ -2267,6 +2259,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de } } + ENTER_GL(); if (context->draw_buffer_dirty) { const struct wined3d_shader *ps = device->stateBlock->state.pixel_shader; @@ -2279,12 +2272,9 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - ENTER_GL(); context_check_fbo_status(context, GL_FRAMEBUFFER); - LEAVE_GL(); } - ENTER_GL(); if (context->last_was_blit) { device->frag_pipe->enable_extension(TRUE);

1 0

Jacek Caban : mshtml: Added IHTMLScreen::get_availHeight implementation.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: aa93ed5e5b4564c11421d56a54115cb5447bb194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa93ed5e5b4564c11421d56a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 14:36:54 2011 +0200 mshtml: Added IHTMLScreen::get_availHeight implementation. --- dlls/mshtml/htmlscreen.c | 11 +++++++++-- dlls/mshtml/tests/dom.c | 8 ++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index 6661fbc..460347f 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -186,8 +186,15 @@ static HRESULT WINAPI HTMLScreen_get_updateInterval(IHTMLScreen *iface, LONG *p) static HRESULT WINAPI HTMLScreen_get_availHeight(IHTMLScreen *iface, LONG *p) { HTMLScreen *This = impl_from_IHTMLScreen(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + RECT work_area; + + TRACE("(%p)->(%p)\n", This, p); + + if(!SystemParametersInfoW(SPI_GETWORKAREA, 0, &work_area, 0)) + return E_FAIL; + + *p = work_area.bottom-work_area.top; + return S_OK; } static HRESULT WINAPI HTMLScreen_get_availWidth(IHTMLScreen *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9c9c2f8..a11e9a4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3920,6 +3920,7 @@ static void test_screen(IHTMLWindow2 *window) { IHTMLScreen *screen, *screen2; IDispatchEx *dispex; + RECT work_area; LONG l, exl; HDC hdc; HRESULT hres; @@ -3965,6 +3966,13 @@ static void test_screen(IHTMLWindow2 *window) DeleteObject(hdc); + SystemParametersInfoW(SPI_GETWORKAREA, 0, &work_area, 0); + + l = 0xdeadbeef; + hres = IHTMLScreen_get_availHeight(screen, &l); + ok(hres == S_OK, "get_availHeight failed: %08x\n", hres); + ok(l == work_area.bottom-work_area.top, "availHeight = %d, expected %d\n", l, work_area.bottom-work_area.top); + IHTMLScreen_Release(screen); }

1 0

Jacek Caban : mshtml: Added IHTMLScreen::get_availWidth implementation.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: e8fb248886565ad086ebe0e6b2d5952bcd8f7c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8fb248886565ad086ebe0e6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 14:37:06 2011 +0200 mshtml: Added IHTMLScreen::get_availWidth implementation. --- dlls/mshtml/htmlscreen.c | 11 +++++++++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index 460347f..68091a0 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -200,8 +200,15 @@ static HRESULT WINAPI HTMLScreen_get_availHeight(IHTMLScreen *iface, LONG *p) static HRESULT WINAPI HTMLScreen_get_availWidth(IHTMLScreen *iface, LONG *p) { HTMLScreen *This = impl_from_IHTMLScreen(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + RECT work_area; + + TRACE("(%p)->(%p)\n", This, p); + + if(!SystemParametersInfoW(SPI_GETWORKAREA, 0, &work_area, 0)) + return E_FAIL; + + *p = work_area.right-work_area.left; + return S_OK; } static HRESULT WINAPI HTMLScreen_get_fontSmoothingEnabled(IHTMLScreen *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a11e9a4..d7e8dda 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3973,6 +3973,11 @@ static void test_screen(IHTMLWindow2 *window) ok(hres == S_OK, "get_availHeight failed: %08x\n", hres); ok(l == work_area.bottom-work_area.top, "availHeight = %d, expected %d\n", l, work_area.bottom-work_area.top); + l = 0xdeadbeef; + hres = IHTMLScreen_get_availWidth(screen, &l); + ok(hres == S_OK, "get_availWidth failed: %08x\n", hres); + ok(l == work_area.right-work_area.left, "availWidth = %d, expected %d\n", l, work_area.right-work_area.left); + IHTMLScreen_Release(screen); }

1 0

Dylan Smith : d3dxof: COM cleanup in main.c.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 7a1d910566eb35f6f09cd567b0887345f85daa6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1d910566eb35f6f09cd567b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 26 21:20:55 2011 -0400 d3dxof: COM cleanup in main.c. --- dlls/d3dxof/main.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index 8eb1489..3b43ec8 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -64,12 +64,17 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * DirectX File ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -83,13 +88,13 @@ static const struct object_creation_info object_creation[] = static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = &This->IClassFactory_iface; return S_OK; } @@ -99,13 +104,13 @@ static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVO static ULONG WINAPI XFCF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI XFCF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -117,7 +122,7 @@ static ULONG WINAPI XFCF_Release(LPCLASSFACTORY iface) static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -134,7 +139,7 @@ static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -211,12 +216,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &XFCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &XFCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &(factory->IClassFactory_iface); return S_OK; }

1 0