November 2011 - Wine-commits

Henri Verbeet : wined3d: Use proper texcoord masks for GLSL texm3x3spec / texm3x3vspec.
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: ab73f20e38febfd287e585fe59797248fefaae6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab73f20e38febfd287e585fe5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 28 21:30:59 2011 +0100 wined3d: Use proper texcoord masks for GLSL texm3x3spec / texm3x3vspec. --- dlls/wined3d/glsl_shader.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 68e2f8f..b746139 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3425,6 +3425,7 @@ static void shader_glsl_texm3x3spec(const struct wined3d_shader_instruction *ins struct wined3d_shader_tex_mx *tex_mx = ins->ctx->tex_mx; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct glsl_sample_function sample_function; + char coord_mask[6]; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], src_mask, &src1_param); @@ -3436,9 +3437,11 @@ static void shader_glsl_texm3x3spec(const struct wined3d_shader_instruction *ins /* Dependent read, not valid with conditional NP2 */ shader_glsl_get_sample_function(ins->ctx, reg, 0, &sample_function); + shader_glsl_write_mask_to_str(sample_function.coord_mask, coord_mask); /* Sample the texture */ - shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, "tmp0.xyz"); + shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, + NULL, NULL, NULL, "tmp0%s", coord_mask); tex_mx->current_row = 0; } @@ -3453,6 +3456,7 @@ static void shader_glsl_texm3x3vspec(const struct wined3d_shader_instruction *in DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct glsl_sample_function sample_function; struct glsl_src_param src0_param; + char coord_mask[6]; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); @@ -3466,9 +3470,11 @@ static void shader_glsl_texm3x3vspec(const struct wined3d_shader_instruction *in /* Dependent read, not valid with conditional NP2 */ shader_glsl_get_sample_function(ins->ctx, reg, 0, &sample_function); + shader_glsl_write_mask_to_str(sample_function.coord_mask, coord_mask); /* Sample the texture using the calculated coordinates */ - shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, "tmp0.xyz"); + shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, + NULL, NULL, NULL, "tmp0%s", coord_mask); tex_mx->current_row = 0; }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetFloat().
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: db6cf95a24fe13b3ba52231f42d47ef9f16358a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6cf95a24fe13b3ba52231f4… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Nov 24 22:36:22 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetFloat(). --- dlls/d3dx9_36/effect.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3458b45..7f0b78e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -826,7 +826,7 @@ static void free_effect_compiler(struct ID3DXEffectCompilerImpl *compiler) } } -static INT get_int(D3DXPARAMETER_TYPE type, void *data) +static INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) { INT i; @@ -853,7 +853,7 @@ static INT get_int(D3DXPARAMETER_TYPE type, void *data) return i; } -inline static FLOAT get_float(D3DXPARAMETER_TYPE type, void *data) +inline static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) { FLOAT f; @@ -880,7 +880,7 @@ inline static FLOAT get_float(D3DXPARAMETER_TYPE type, void *data) return f; } -static inline BOOL get_bool(void *data) +static inline BOOL get_bool(LPCVOID data) { return (*(DWORD *)data) ? TRUE : FALSE; } @@ -893,6 +893,31 @@ static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) vector->w = param->columns > 3 ? get_float(param->type, (float *)param->data + 3) : 0.0f; } +static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) +{ + TRACE("Changing from type %i to type %i\n", intype, outtype); + + switch (outtype) + { + case D3DXPT_FLOAT: + *(FLOAT *)outdata = get_float(intype, indata); + break; + + case D3DXPT_BOOL: + *(BOOL *)outdata = get_bool(indata); + break; + + case D3DXPT_INT: + *(INT *)outdata = get_int(intype, indata); + break; + + default: + FIXME("Error converting to type %i\n", outtype); + *(INT *)outdata = 0; + break; + } +} + static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) { unsigned int i, k; @@ -1776,10 +1801,19 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetIntArray(ID3DXBaseEffect *iface, D3 static HRESULT WINAPI ID3DXBaseEffectImpl_SetFloat(ID3DXBaseEffect *iface, D3DXHANDLE parameter, FLOAT f) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, f %f stub\n", This, parameter, f); + TRACE("iface %p, parameter %p, f %f\n", This, parameter, f); - return E_NOTIMPL; + if (param && !param->element_count && param->rows == 1 && param->columns == 1) + { + set_number((DWORD *)param->data, param->type, &f, D3DXPT_FLOAT); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloat(ID3DXBaseEffect *iface, D3DXHANDLE parameter, FLOAT *f)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetFloatArray().
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: d3ed67434eb7a0121d295ef04970412be200afb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ed67434eb7a0121d295ef04… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Nov 24 22:36:25 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetFloatArray(). --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7f0b78e..006d2f1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1838,10 +1838,40 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloat(ID3DXBaseEffect *iface, D3DXH static HRESULT WINAPI ID3DXBaseEffectImpl_SetFloatArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST FLOAT *f, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, f %p, count %u stub\n", This, parameter, f, count); + TRACE("iface %p, parameter %p, f %p, count %u\n", This, parameter, f, count); - return E_NOTIMPL; + if (param) + { + UINT i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + { + set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT); + } + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloatArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, FLOAT *f, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetInt().
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 7998195f1c7ba0489bb410cfc7f0c0411b9e68d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7998195f1c7ba0489bb410cfc… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Nov 24 22:36:29 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetInt(). --- dlls/d3dx9_36/effect.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 006d2f1..e808e0b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -28,6 +28,7 @@ /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f +#define INT_FLOAT_MULTI_INVERSE (1/INT_FLOAT_MULTI) WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -1718,10 +1719,46 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetBoolArray(ID3DXBaseEffect *iface, D static HRESULT WINAPI ID3DXBaseEffectImpl_SetInt(ID3DXBaseEffect *iface, D3DXHANDLE parameter, INT n) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, n %u stub\n", This, parameter, n); + TRACE("iface %p, parameter %p, n %i\n", This, parameter, n); - return E_NOTIMPL; + if (param && !param->element_count) + { + if (param->rows == 1 && param->columns == 1) + { + set_number(param->data, param->type, &n, D3DXPT_INT); + return D3D_OK; + } + + /* + * Split the value, if parameter is a vector with dimension 3 or 4. + */ + if (param->type == D3DXPT_FLOAT && + ((param->class == D3DXPC_VECTOR && param->columns != 2) || + (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) + { + FLOAT tmp = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + set_number((DWORD *)param->data, param->type, &tmp, D3DXPT_FLOAT); + + tmp = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + set_number((DWORD *)param->data + 1, param->type, &tmp, D3DXPT_FLOAT); + + tmp = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; + set_number((DWORD *)param->data + 2, param->type, &tmp, D3DXPT_FLOAT); + + if (param->rows * param->columns > 3) + { + tmp = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + set_number((DWORD *)param->data + 3, param->type, &tmp, D3DXPT_FLOAT); + } + return D3D_OK; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetInt(ID3DXBaseEffect *iface, D3DXHANDLE parameter, INT *n)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetIntArray().
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: bb6f22d10eaf2cd3295742125276d2e4183ee3c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6f22d10eaf2cd3295742125… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Nov 24 22:36:32 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetIntArray(). --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e808e0b..619d184 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1803,10 +1803,40 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetInt(ID3DXBaseEffect *iface, D3DXHAN static HRESULT WINAPI ID3DXBaseEffectImpl_SetIntArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST INT *n, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, n %p, count %u stub\n", This, parameter, n, count); + TRACE("iface %p, parameter %p, n %p, count %u\n", This, parameter, n, count); - return E_NOTIMPL; + if (param) + { + UINT i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + { + set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); + } + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetIntArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, INT *n, UINT count)

1 0

Ulrich Czekalla : winex11: Avoid grabbing user_section while holding X11DRV_CritSection.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 392785965f596e90cbf25c29ce5a3e2db572d873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392785965f596e90cbf25c29c… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Mon Nov 28 04:56:30 2011 -0500 winex11: Avoid grabbing user_section while holding X11DRV_CritSection. --- dlls/winex11.drv/window.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ed4f570..7d8ac92 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1513,6 +1513,7 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data data->configure_serial = NextRequest( display ); XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes ); + wine_tsx11_unlock(); #ifdef HAVE_LIBXSHAPE if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) sync_window_region( display, data, (HRGN)1 ); @@ -1523,11 +1524,14 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data int new_x_offset = data->window_rect.left - data->whole_rect.left; int new_y_offset = data->window_rect.top - data->whole_rect.top; if (old_x_offset != new_x_offset || old_y_offset != new_y_offset) + { + wine_tsx11_lock(); XShapeOffsetShape( display, data->whole_window, ShapeBounding, new_x_offset - old_x_offset, new_y_offset - old_y_offset ); + wine_tsx11_unlock(); + } } #endif - wine_tsx11_unlock(); TRACE( "win %p/%lx pos %d,%d,%dx%d after %lx changes=%x serial=%lu\n", data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top,

1 0

Francois Gouget : Assorted spelling fixes and wording tweaks.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 51a256e65f7c4ff73c578f465adeb6c263a695df URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a256e65f7c4ff73c578f465… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 28 11:37:42 2011 +0100 Assorted spelling fixes and wording tweaks. --- dlls/kernel32/tests/process.c | 4 ++-- dlls/msi/where.c | 2 +- dlls/ntdll/tests/pipe.c | 2 +- dlls/user32/edit.c | 2 +- dlls/usp10/usp10.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d1ed580..c7ff0d7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1727,8 +1727,8 @@ static void test_QueryFullProcessImageNameA(void) expect_eq_s(INIT_STR, buf); /* this is a difference between the ascii and the unicode version - * the unicode version crashes when the size is big enough to hold the result - * ascii version through an error + * the unicode version crashes when the size is big enough to hold + * the result while the ascii version throws an error */ size = 1024; expect_eq_d(FALSE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, NULL, &size)); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index b7d1db8..36c8ec8 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -732,7 +732,7 @@ static UINT reorder_check( const struct expr *expr, JOINTABLE **ordered_tables, add_to_array(ordered_tables, *lastused); return res; default: - ERR("Unkown expr type: %i\n", expr->type); + ERR("Unknown expr type: %i\n", expr->type); assert(0); return 0x1000000; } diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index d9f566b..3ab4d07 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -233,7 +233,7 @@ static void test_create(void) ok(hclient != INVALID_HANDLE_VALUE, "CreateFile failed for sharing %x, access: %x, GetLastError: %d\n", sharing[j], access[k], GetLastError()); else - ok(hclient == INVALID_HANDLE_VALUE, "CreateFile succeded for sharing %x, access: %x\n", sharing[j], access[k]); + ok(hclient == INVALID_HANDLE_VALUE, "CreateFile succeeded for sharing %x, access: %x\n", sharing[j], access[k]); CloseHandle(hserver); } diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 7971333..eefe817 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3608,7 +3608,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) (es->style & ES_NOHIDESEL)); dc = hdc ? hdc : BeginPaint(es->hwndSelf, &ps); - /* The dc we use for calcualting may not be the one we paint into. + /* The dc we use for calculating may not be the one we paint into. This is the safest action. */ EDIT_InvalidateUniscribeData(es); GetClientRect(es->hwndSelf, &rcClient); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1cff0ee..fdd8750 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -544,7 +544,7 @@ static WORD get_char_script( WCHAR ch) if (ch == 0xc || ch == 0x20 || ch == 0x202f) return Script_CR; - /* These punctuation are seperated out as Latin punctuation */ + /* These punctuation are separated out as Latin punctuation */ if (strchrW(latin_punc,ch)) return Script_Punctuation2; diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b2fa29c..86eb5f1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7297,7 +7297,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE) { - /* Without FBO blits transfering from the drawable to the texture is + /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can * flip in the blitter, we don't actually need that flip anyway. So we * use the surface's texture as scratch texture, and flip the source

1 0

Piotr Caban : msxml3: Change parser position computation.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: c253bab26a6a982e31701ad8c80284d4fffcfd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c253bab26a6a982e31701ad8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 28 15:05:25 2011 +0100 msxml3: Change parser position computation. --- dlls/msxml3/saxreader.c | 211 +++++++++++++++++++++++++---------------------- 1 files changed, 111 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c253bab26a6a982e31701…

1 0

Bruno Jesus : ws2_32: Fix function GetAcceptExSockaddrs.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 743929e4f43c0aa53151256faa8c8c53b35d6b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743929e4f43c0aa53151256fa… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Nov 26 19:26:06 2011 -0200 ws2_32: Fix function GetAcceptExSockaddrs. --- dlls/ws2_32/socket.c | 4 ++-- dlls/ws2_32/tests/sock.c | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cf33400..81b6b0f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1675,13 +1675,13 @@ static NTSTATUS WS2_async_accept( void *arg, IO_STATUS_BLOCK *iosb, NTSTATUS sta /* WS2 Spec says size param is extra 16 bytes long...what do we put in it? */ addr = ((char *)wsa->buf) + wsa->data_len; len = wsa->local_len - sizeof(int); - WS_getpeername(HANDLE2SOCKET(wsa->accept_socket), + WS_getsockname(HANDLE2SOCKET(wsa->accept_socket), (struct WS_sockaddr *)(addr + sizeof(int)), &len); *(int *)addr = len; addr += wsa->local_len; len = wsa->remote_len - sizeof(int); - WS_getsockname(HANDLE2SOCKET(wsa->accept_socket), + WS_getpeername(HANDLE2SOCKET(wsa->accept_socket), (struct WS_sockaddr *)(addr + sizeof(int)), &len); *(int *)addr = len; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 11e7b3c..4e5bb52 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4495,17 +4495,18 @@ static void test_AcceptEx(void) SOCKET acceptor = INVALID_SOCKET; SOCKET connector = INVALID_SOCKET; SOCKET connector2 = INVALID_SOCKET; - struct sockaddr_in bindAddress; + struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen; - GUID acceptExGuid = WSAID_ACCEPTEX; + GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; LPFN_ACCEPTEX pAcceptEx = NULL; + LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL; fd_set fds_accept, fds_send; struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ int got, conn1, i; DWORD bytesReturned; char buffer[1024]; OVERLAPPED overlapped; - int iret; + int iret, localSize = sizeof(struct sockaddr_in), remoteSize = localSize; BOOL bret; DWORD dwret; @@ -4557,6 +4558,13 @@ static void test_AcceptEx(void) goto end; } + iret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &getAcceptExGuid, sizeof(getAcceptExGuid), + &pGetAcceptExSockaddrs, sizeof(pGetAcceptExSockaddrs), &bytesReturned, NULL, NULL); + if (iret) { + skip("WSAIoctl failed to get GetAcceptExSockaddrs with ret %d + errno %d\n", iret, WSAGetLastError()); + goto end; + } + bret = pAcceptEx(INVALID_SOCKET, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -4693,6 +4701,26 @@ static void test_AcceptEx(void) dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_TIMEOUT, "Waiting for accept event timeout failed with %d + errno %d\n", dwret, GetLastError()); + iret = getsockname( connector, (struct sockaddr *)&peerAddress, &remoteSize); + ok( !iret, "getsockname failed.\n"); + + /* Check if the buffer from AcceptEx is decoded correclty */ + pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + (struct sockaddr **)&readBindAddress, &localSize, + (struct sockaddr **)&readRemoteAddress, &remoteSize); + ok( readBindAddress->sin_addr.s_addr == bindAddress.sin_addr.s_addr, + "Local socket address is different %s != %s\n", + inet_ntoa(readBindAddress->sin_addr), inet_ntoa(bindAddress.sin_addr)); + ok( readBindAddress->sin_port == bindAddress.sin_port, + "Local socket port is different: %d != %d\n", + readBindAddress->sin_port, bindAddress.sin_port); + ok( readRemoteAddress->sin_addr.s_addr == peerAddress.sin_addr.s_addr, + "Remote socket address is different %s != %s\n", + inet_ntoa(readRemoteAddress->sin_addr), inet_ntoa(peerAddress.sin_addr)); + ok( readRemoteAddress->sin_port == peerAddress.sin_port, + "Remote socket port is different: %d != %d\n", + readRemoteAddress->sin_port, peerAddress.sin_port); + iret = send(connector, buffer, 1, 0); ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError());

1 0

Bruno Jesus : ws2_32: Remove duplicated code.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: fc09bc4533c1c6fbf31b825367b80ec79f2ace36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc09bc4533c1c6fbf31b82536… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Nov 26 20:43:03 2011 -0200 ws2_32: Remove duplicated code. --- dlls/ws2_32/async.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 01d5d48..cc330bb 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -269,10 +269,10 @@ static HANDLE run_query( HWND hWnd, UINT uMsg, LPTHREAD_START_ROUTINE func, { static LONG next_handle = 0xdead; HANDLE thread; - ULONG handle = LOWORD( InterlockedIncrement( &next_handle )); - - /* avoid handle 0 */ - while (!handle) handle = LOWORD( InterlockedIncrement( &next_handle )); + ULONG handle; + do + handle = LOWORD( InterlockedIncrement( &next_handle )); + while (!handle); /* avoid handle 0 */ query->hWnd = hWnd; query->uMsg = uMsg;

1 0