wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Piotr Caban : msvcp90: Added _Mutex class implementation.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: d74b339e1729bfdd9e4bed5a5632e95dc011386b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74b339e1729bfdd9e4bed5a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 27 14:35:53 2011 +0200 msvcp90: Added _Mutex class implementation. --- dlls/msvcp100/msvcp100.spec | 32 +++++++------- dlls/msvcp71/msvcp71.spec | 16 ++++---- dlls/msvcp80/msvcp80.spec | 32 +++++++------- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/misc.c | 92 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 32 +++++++------- 6 files changed, 149 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d74b339e1729bfdd9e4be…

1 0

Piotr Caban : msvcp90: Added basic_ios<char> class stub.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 0dbb0f1ee8ec6a7fcaad1b121e19631927dac735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbb0f1ee8ec6a7fcaad1b121… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 27 14:35:40 2011 +0200 msvcp90: Added basic_ios<char> class stub. --- dlls/msvcp100/msvcp100.spec | 74 +++++++------- dlls/msvcp70/msvcp70.spec | 74 +++++++------- dlls/msvcp71/msvcp71.spec | 74 +++++++------- dlls/msvcp80/msvcp80.spec | 74 +++++++------- dlls/msvcp90/ios.c | 224 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcp90/msvcp90.spec | 74 +++++++------- 7 files changed, 410 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dbb0f1ee8ec6a7fcaad1…

1 0

Piotr Caban : msvcp90/tests: Don' t check if msvcp90 functions exists in string tests.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 28d5eb082754321f3242ca5925f378b679e02d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d5eb082754321f3242ca592… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 27 14:35:28 2011 +0200 msvcp90/tests: Don't check if msvcp90 functions exists in string tests. --- dlls/msvcp90/tests/string.c | 175 +++++++++++++++---------------------------- 1 files changed, 60 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28d5eb082754321f3242c…

1 0

Piotr Caban : msvcp90/tests: Don' t check if msvcp90 functions exists in misc tests.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 8a96e66f7b8ba393125871b586483ece9f45fe46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a96e66f7b8ba393125871b58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 27 14:35:18 2011 +0200 msvcp90/tests: Don't check if msvcp90 functions exists in misc tests. --- dlls/msvcp90/tests/misc.c | 87 +++++++++++++++++--------------------------- 1 files changed, 34 insertions(+), 53 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index d052225..7e2fe1a 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -162,6 +162,8 @@ static void* do_call_func3(void *func, void *_this, #endif /* __i386__ */ +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { HMODULE msvcr = LoadLibraryA("msvcr90.dll"); @@ -180,39 +182,39 @@ static BOOL init(void) p_set_invalid_parameter_handler(test_invalid_parameter_handler); if(sizeof(void*) == 8) { /* 64-bit initialization */ - p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@D@std@@SAXAEADAEBD@Z"); - p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z"); - p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@G@std@@SAXAEAGAEBG@Z"); - - p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@D@std@@SA_NAEBD0@Z"); - p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@_W@std@@SA_NAEB_W0@Z"); - p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@G@std@@SA_NAEBG0@Z"); - - p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z"); - - p_char_address = (void*)GetProcAddress(msvcp, "?address@?$allocator@D@std@@QEBAPEADAEAD@Z"); - p_char_ctor = (void*)GetProcAddress(msvcp, "??0?$allocator@D@std@@QEAA@XZ"); - p_char_deallocate = (void*)GetProcAddress(msvcp, "?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z"); - p_char_allocate = (void*)GetProcAddress(msvcp, "?allocate@?$allocator@D@std@@QEAAPEAD_K@Z"); - p_char_construct = (void*)GetProcAddress(msvcp, "?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z"); - p_char_max_size = (void*)GetProcAddress(msvcp, "?max_size@?$allocator@D@std@@QEBA_KXZ"); + SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAEADAEBD@Z"); + SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z"); + SET(p_short_assign, "?assign@?$char_traits@G@std@@SAXAEAGAEBG@Z"); + + SET(p_char_eq, "?eq@?$char_traits@D@std@@SA_NAEBD0@Z"); + SET(p_wchar_eq, "?eq@?$char_traits@_W@std@@SA_NAEB_W0@Z"); + SET(p_short_eq, "?eq@?$char_traits@G@std@@SA_NAEBG0@Z"); + + SET(p_Copy_s, "?_Copy_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z"); + + SET(p_char_address, "?address@?$allocator@D@std@@QEBAPEADAEAD@Z"); + SET(p_char_ctor, "??0?$allocator@D@std@@QEAA@XZ"); + SET(p_char_deallocate, "?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z"); + SET(p_char_allocate, "?allocate@?$allocator@D@std@@QEAAPEAD_K@Z"); + SET(p_char_construct, "?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z"); + SET(p_char_max_size, "?max_size@?$allocator@D@std@@QEBA_KXZ"); } else { - p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); - p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); - p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@G@std@@SAXAAGABG@Z"); - - p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@D@std@@SA_NABD0@Z"); - p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@_W@std@@SA_NAB_W0@Z"); - p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@G@std@@SA_NABG0@Z"); - - p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@Z"); - - p_char_address = (void*)GetProcAddress(msvcp, "?address@?$allocator@D@std@@QBEPADAAD@Z"); - p_char_ctor = (void*)GetProcAddress(msvcp, "??0?$allocator@D@std@@QAE@XZ"); - p_char_deallocate = (void*)GetProcAddress(msvcp, "?deallocate@?$allocator@D@std@@QAEXPADI@Z"); - p_char_allocate = (void*)GetProcAddress(msvcp, "?allocate@?$allocator@D@std@@QAEPADI@Z"); - p_char_construct = (void*)GetProcAddress(msvcp, "?construct@?$allocator@D@std@@QAEXPADABD@Z"); - p_char_max_size = (void*)GetProcAddress(msvcp, "?max_size@?$allocator@D@std@@QBEIXZ"); + SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); + SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); + SET(p_short_assign, "?assign@?$char_traits@G@std@@SAXAAGABG@Z"); + + SET(p_char_eq, "?eq@?$char_traits@D@std@@SA_NABD0@Z"); + SET(p_wchar_eq, "?eq@?$char_traits@_W@std@@SA_NAB_W0@Z"); + SET(p_short_eq, "?eq@?$char_traits@G@std@@SA_NABG0@Z"); + + SET(p_Copy_s, "?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@Z"); + + SET(p_char_address, "?address@?$allocator@D@std@@QBEPADAAD@Z"); + SET(p_char_ctor, "??0?$allocator@D@std@@QAE@XZ"); + SET(p_char_deallocate, "?deallocate@?$allocator@D@std@@QAEXPADI@Z"); + SET(p_char_allocate, "?allocate@?$allocator@D@std@@QAEPADI@Z"); + SET(p_char_construct, "?construct@?$allocator@D@std@@QAEXPADABD@Z"); + SET(p_char_max_size, "?max_size@?$allocator@D@std@@QBEIXZ"); } return TRUE; @@ -223,11 +225,6 @@ static void test_assign(void) const char in[] = "abc"; char out[4]; - if(!p_char_assign || !p_wchar_assign || !p_short_assign) { - win_skip("assign tests skipped\n"); - return; - } - out[1] = '#'; p_char_assign(out, in); ok(out[0] == in[0], "out[0] = %c\n", out[0]); @@ -254,11 +251,6 @@ static void test_equal(void) static const char in4[] = "b"; BYTE ret; - if(!p_char_eq || !p_wchar_eq || !p_short_eq) { - win_skip("equal tests skipped\n"); - return; - } - ret = p_char_eq(in1, in2); ok(ret == TRUE, "ret = %d\n", (int)ret); ret = p_char_eq(in1, in3); @@ -286,11 +278,6 @@ static void test_Copy_s(void) static const char src[] = "abcd"; char dest[32], *ret; - if(!p_Copy_s) { - win_skip("Copy_s tests skipped\n"); - return; - } - dest[4] = '#'; dest[5] = '\0'; ret = p_Copy_s(dest, 4, src, 4); @@ -335,12 +322,6 @@ static void test_allocator_char(void) char val; unsigned int size; - if(!p_char_address || !p_char_ctor || !p_char_deallocate || !p_char_allocate - || !p_char_construct || !p_char_max_size) { - win_skip("allocator<char> class not available\n"); - return; - } - allocator = call_func1(p_char_ctor, allocator); ok(allocator == (void*)0xdeadbeef, "allocator = %p\n", allocator);

1 0

Piotr Caban : msvcp90: Added ios_base class stub.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 031ae07edc15ffa9ae6011f771aa279457bd614d URL: http://source.winehq.org/git/wine.git/?a=commit;h=031ae07edc15ffa9ae6011f77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 27 14:34:27 2011 +0200 msvcp90: Added ios_base class stub. --- dlls/msvcp100/msvcp100.spec | 164 +++++++------- dlls/msvcp70/msvcp70.spec | 164 +++++++------- dlls/msvcp71/msvcp71.spec | 164 +++++++------- dlls/msvcp80/msvcp80.spec | 182 +++++++------- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/exception.c | 18 -- dlls/msvcp90/ios.c | 560 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 33 +++- dlls/msvcp90/msvcp90.spec | 182 +++++++------- dlls/msvcp90/string.c | 46 ++-- 10 files changed, 1044 insertions(+), 470 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=031ae07edc15ffa9ae601…

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

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

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

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

Rico Schüller : d3dx9: Start effect state parsing.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 93ff2c319ec85603eb870df9f186b6db2caa7d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ff2c319ec85603eb870df9f… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 27 11:39:57 2011 +0200 d3dx9: Start effect state parsing. --- dlls/d3dx9_36/effect.c | 358 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 357 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93ff2c319ec85603eb870…

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011