wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Michael Stefaniuc : dmloader: Use the generic DirectMusicObject implementation for DMContainer.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: ade8d0c158cbfbe80bb436dfb7f08cf5d9b7ead0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade8d0c158cbfbe80bb436dfb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:09:45 2015 +0200 dmloader: Use the generic DirectMusicObject implementation for DMContainer. --- dlls/dmloader/Makefile.in | 1 + dlls/dmloader/container.c | 216 ++++++++++--------------------------------- dlls/dmloader/dmobject.c | 170 ++++++++++++++++++++++++++++++++++ dlls/dmloader/dmobject.h | 53 +++++++++++ dlls/dmloader/tests/loader.c | 2 +- 5 files changed, 276 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ade8d0c158cbfbe80bb43…

1 0

Mark Harmstone : uxtheme: Stub out buffered painting functions.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: f9fe32939f8232064c0cee5ef2668e197d8e58eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9fe32939f8232064c0cee5ef… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon Apr 27 21:52:53 2015 +0100 uxtheme: Stub out buffered painting functions. --- dlls/uxtheme/buffer.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/uxtheme.spec | 6 ++++++ 2 files changed, 61 insertions(+) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index f4d8229..8955a0d 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -81,3 +81,58 @@ HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER hPaintBuffer, BOOL fUpdateTarget) FIXME("Stub (%p %d)\n", hPaintBuffer, fUpdateTarget); return S_OK; } + +/*********************************************************************** + * BufferedPaintClear (UXTHEME.@) + */ +HRESULT WINAPI BufferedPaintClear(HPAINTBUFFER hBufferedPaint, const RECT *prc) +{ + FIXME("Stub (%p %p)\n", hBufferedPaint, prc); + return E_NOTIMPL; +} + +/*********************************************************************** + * BufferedPaintSetAlpha (UXTHEME.@) + */ +HRESULT WINAPI BufferedPaintSetAlpha(HPAINTBUFFER hBufferedPaint, const RECT *prc, BYTE alpha) +{ + FIXME("Stub (%p %p %u)\n", hBufferedPaint, prc, alpha); + return E_NOTIMPL; +} + +/*********************************************************************** + * GetBufferedPaintBits (UXTHEME.@) + */ +HRESULT WINAPI GetBufferedPaintBits(HPAINTBUFFER hBufferedPaint, RGBQUAD **ppbBuffer, + int *pcxRow) +{ + FIXME("Stub (%p %p %p)\n", hBufferedPaint, ppbBuffer, pcxRow); + return E_NOTIMPL; +} + +/*********************************************************************** + * GetBufferedPaintDC (UXTHEME.@) + */ +HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER hBufferedPaint) +{ + FIXME("Stub (%p)\n", hBufferedPaint); + return NULL; +} + +/*********************************************************************** + * GetBufferedPaintTargetDC (UXTHEME.@) + */ +HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER hBufferedPaint) +{ + FIXME("Stub (%p)\n", hBufferedPaint); + return NULL; +} + +/*********************************************************************** + * GetBufferedPaintTargetRect (UXTHEME.@) + */ +HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER hBufferedPaint, RECT *prc) +{ + FIXME("Stub (%p %p)\n", hBufferedPaint, prc); + return E_NOTIMPL; +} diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 198957a..7d84faf 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -44,7 +44,9 @@ # Standard functions @ stdcall BeginBufferedPaint(ptr ptr long ptr ptr) +@ stdcall BufferedPaintClear(ptr ptr) @ stdcall BufferedPaintInit() +@ stdcall BufferedPaintSetAlpha(ptr ptr long) @ stdcall BufferedPaintUnInit() @ stdcall CloseThemeData(ptr) @ stdcall DrawThemeBackground(ptr ptr long long ptr ptr) @@ -56,6 +58,10 @@ @ stdcall EnableThemeDialogTexture(ptr long) @ stdcall EnableTheming(long) @ stdcall EndBufferedPaint(ptr long) +@ stdcall GetBufferedPaintBits(ptr ptr ptr) +@ stdcall GetBufferedPaintDC(ptr) +@ stdcall GetBufferedPaintTargetDC(ptr) +@ stdcall GetBufferedPaintTargetRect(ptr ptr) @ stdcall GetCurrentThemeName(wstr long wstr long wstr long) @ stdcall GetThemeAppProperties() @ stdcall GetThemeBackgroundContentRect(ptr ptr long long ptr ptr)

1 0

Henri Verbeet : wined3d: Cleanup the sampler map in shader_cleanup() ( Valgrind).
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: f09288cfc48a7f14689e6cbb142d07fd31bfcdd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09288cfc48a7f14689e6cbb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 16:39:36 2015 +0200 wined3d: Cleanup the sampler map in shader_cleanup() (Valgrind). --- dlls/wined3d/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9ff768..87a22c2 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1866,6 +1866,7 @@ static void shader_cleanup(struct wined3d_shader *shader) HeapFree(GetProcessHeap(), 0, shader->signature_strings); shader->device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf); + HeapFree(GetProcessHeap(), 0, shader->reg_maps.sampler_map.entries); HeapFree(GetProcessHeap(), 0, shader->function); shader_delete_constant_list(&shader->constantsF); shader_delete_constant_list(&shader->constantsB);

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetExtendModeY().
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: abc84588d2ab3596db15c883b35c81ce9409d264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc84588d2ab3596db15c883b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 16:39:35 2015 +0200 d2d1: Implement d2d_bitmap_brush_GetExtendModeY(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 309d234..cd5476a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -612,9 +612,11 @@ static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeX(ID2D1B static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeY(ID2D1BitmapBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); - return D2D1_EXTEND_MODE_CLAMP; + TRACE("iface %p.\n", iface); + + return brush->u.bitmap.extend_mode_y; } static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInterpolationMode(ID2D1BitmapBrush *iface)

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetExtendModeY().
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 0a02f346f64a88b3331056ded3c519752cd36377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a02f346f64a88b3331056ded… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 16:39:34 2015 +0200 d2d1: Implement d2d_bitmap_brush_SetExtendModeY(). --- dlls/d2d1/brush.c | 15 +++++++++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 575675e..309d234 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -569,7 +569,16 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush * static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) { - FIXME("iface %p, mode %#x stub!\n", iface, mode); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.bitmap.extend_mode_y = mode; + if (brush->u.bitmap.sampler_state) + { + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + brush->u.bitmap.sampler_state = NULL; + } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapBrush *iface, @@ -659,11 +668,13 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_tar if (bitmap_brush_desc) { brush->u.bitmap.extend_mode_x = bitmap_brush_desc->extendModeX; + brush->u.bitmap.extend_mode_y = bitmap_brush_desc->extendModeY; brush->u.bitmap.interpolation_mode = bitmap_brush_desc->interpolationMode; } else { brush->u.bitmap.extend_mode_x = D2D1_EXTEND_MODE_CLAMP; + brush->u.bitmap.extend_mode_y = D2D1_EXTEND_MODE_CLAMP; brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; } @@ -712,7 +723,7 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) else sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; sampler_desc.AddressU = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); - sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; sampler_desc.MaxAnisotropy = 0; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b5820d0..447a136 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -126,6 +126,7 @@ struct d2d_brush { struct d2d_bitmap *bitmap; D2D1_EXTEND_MODE extend_mode_x; + D2D1_EXTEND_MODE extend_mode_y; D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; ID3D10SamplerState *sampler_state; } bitmap;

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetExtendModeX().
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: b940f2fd9ef5b1abd41ec6dbaf18ed629b4675b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b940f2fd9ef5b1abd41ec6dba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 16:39:33 2015 +0200 d2d1: Implement d2d_bitmap_brush_GetExtendModeX(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b6702c0..575675e 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -594,9 +594,11 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush *iface static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeX(ID2D1BitmapBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); - return D2D1_EXTEND_MODE_CLAMP; + TRACE("iface %p.\n", iface); + + return brush->u.bitmap.extend_mode_x; } static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeY(ID2D1BitmapBrush *iface)

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetExtendModeX().
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 21a4a1087970c23c008485e7413c45f29f70b101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a4a1087970c23c008485e74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 16:39:32 2015 +0200 d2d1: Implement d2d_bitmap_brush_SetExtendModeX(). --- dlls/d2d1/brush.c | 35 +++++++++++++++++++++++++++++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index f2cb99e..b6702c0 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -555,7 +555,16 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_GetTransform(ID2D1BitmapBrush *if static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) { - FIXME("iface %p, mode %#x stub!\n", iface, mode); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.bitmap.extend_mode_x = mode; + if (brush->u.bitmap.sampler_state) + { + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + brush->u.bitmap.sampler_state = NULL; + } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) @@ -646,9 +655,15 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_tar brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); if (bitmap_brush_desc) + { + brush->u.bitmap.extend_mode_x = bitmap_brush_desc->extendModeX; brush->u.bitmap.interpolation_mode = bitmap_brush_desc->interpolationMode; + } else + { + brush->u.bitmap.extend_mode_x = D2D1_EXTEND_MODE_CLAMP; brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; + } return S_OK; } @@ -663,6 +678,22 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); } +static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTEND_MODE mode) +{ + switch (mode) + { + case D2D1_EXTEND_MODE_CLAMP: + return D3D10_TEXTURE_ADDRESS_CLAMP; + case D2D1_EXTEND_MODE_WRAP: + return D3D10_TEXTURE_ADDRESS_WRAP; + case D2D1_EXTEND_MODE_MIRROR: + return D3D10_TEXTURE_ADDRESS_MIRROR; + default: + FIXME("Unhandled extend mode %#x.\n", mode); + return D3D10_TEXTURE_ADDRESS_CLAMP; + } +} + void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) { HRESULT hr; @@ -678,7 +709,7 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; else sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; - sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressU = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 285c422..b5820d0 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -125,6 +125,7 @@ struct d2d_brush struct { struct d2d_bitmap *bitmap; + D2D1_EXTEND_MODE extend_mode_x; D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; ID3D10SamplerState *sampler_state; } bitmap;

1 0

Jacek Caban : ws2_32: Use get_rcvsnd_timeo helper in getsockopt.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: edb780e87f212a8d4a6528eaea7285c8f8cb3c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb780e87f212a8d4a6528eae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 16:01:15 2015 +0200 ws2_32: Use get_rcvsnd_timeo helper in getsockopt. --- dlls/ws2_32/socket.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f904252..52b5394 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3619,16 +3619,10 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } return ret ? 0 : SOCKET_ERROR; } -#ifdef SO_RCVTIMEO case WS_SO_RCVTIMEO: -#endif -#ifdef SO_SNDTIMEO case WS_SO_SNDTIMEO: -#endif -#if defined(SO_RCVTIMEO) || defined(SO_SNDTIMEO) { - struct timeval tv; - socklen_t len = sizeof(struct timeval); + INT64 timeout; if (!optlen || *optlen < sizeof(int)|| !optval) { @@ -3638,22 +3632,12 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; - convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, &tv, &len) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - { - *(int *)optval = tv.tv_sec * 1000 + tv.tv_usec / 1000; - *optlen = sizeof(int); - } + timeout = get_rcvsnd_timeo(fd, optname == WS_SO_RCVTIMEO); + *(int *)optval = timeout <= UINT32_MAX ? timeout : UINT32_MAX; release_sock_fd( s, fd ); return ret; } -#endif case WS_SO_TYPE: { if (!optlen || *optlen < sizeof(int) || !optval)

1 0

Jacek Caban : ws2_32: Call get_rcvsnd_timeo directly.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 6a80fe9e6bdfe28f4600dee41367e95e9e23b7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a80fe9e6bdfe28f4600dee41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 16:00:57 2015 +0200 ws2_32: Call get_rcvsnd_timeo directly. --- dlls/ws2_32/socket.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d6bfa94..f904252 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1252,29 +1252,31 @@ static char *strdup_lower(const char *str) /* Utility: get the SO_RCVTIMEO or SO_SNDTIMEO socket option * from an fd and return the value converted to milli seconds * or 0 if there is an infinite time out */ -static inline INT64 get_rcvsnd_timeo( int fd, int optname) +static inline INT64 get_rcvsnd_timeo( int fd, BOOL is_recv) { struct timeval tv; socklen_t len = sizeof(tv); - int res = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); - if (res < 0) - return 0; - return (UINT64)tv.tv_sec * 1000 + tv.tv_usec / 1000; -} + int optname, res; -/* macro wrappers for portability */ + if (is_recv) #ifdef SO_RCVTIMEO -#define GET_RCVTIMEO(fd) get_rcvsnd_timeo( (fd), SO_RCVTIMEO) + optname = SO_RCVTIMEO; #else -#define GET_RCVTIMEO(fd) (0) + return 0; #endif - + else #ifdef SO_SNDTIMEO -#define GET_SNDTIMEO(fd) get_rcvsnd_timeo( (fd), SO_SNDTIMEO) + optname = SO_SNDTIMEO; #else -#define GET_SNDTIMEO(fd) (0) + return 0; #endif + res = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); + if (res < 0) + return 0; + return (UINT64)tv.tv_sec * 1000 + tv.tv_usec / 1000; +} + /* utility: given an fd, will block until one of the events occurs */ static inline int do_block( int fd, int events, int timeout ) { @@ -5075,7 +5077,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { struct pollfd pfd; int poll_timeout = -1; - INT64 timeout = GET_SNDTIMEO(fd); + INT64 timeout = get_rcvsnd_timeo(fd, FALSE); if (timeout) { @@ -7131,7 +7133,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { struct pollfd pfd; int poll_timeout = -1; - INT64 timeout = GET_RCVTIMEO(fd); + INT64 timeout = get_rcvsnd_timeo(fd, TRUE); if (timeout) {

1 0

Jacek Caban : ws2_32: Avoid overflows in get_rcvsnd_timeo.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 9e3a3f46fae62e758d75c8eca46c7b79f7930de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3a3f46fae62e758d75c8eca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 16:00:37 2015 +0200 ws2_32: Avoid overflows in get_rcvsnd_timeo. --- dlls/ws2_32/socket.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 95ea83c..d6bfa94 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1251,30 +1251,28 @@ static char *strdup_lower(const char *str) /* Utility: get the SO_RCVTIMEO or SO_SNDTIMEO socket option * from an fd and return the value converted to milli seconds - * or -1 if there is an infinite time out */ -static inline int get_rcvsnd_timeo( int fd, int optname) + * or 0 if there is an infinite time out */ +static inline INT64 get_rcvsnd_timeo( int fd, int optname) { struct timeval tv; socklen_t len = sizeof(tv); - int ret = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); - if( ret >= 0) - ret = tv.tv_sec * 1000 + tv.tv_usec / 1000; - if( ret <= 0 ) /* tv == {0,0} means infinite time out */ - return -1; - return ret; + int res = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); + if (res < 0) + return 0; + return (UINT64)tv.tv_sec * 1000 + tv.tv_usec / 1000; } /* macro wrappers for portability */ #ifdef SO_RCVTIMEO #define GET_RCVTIMEO(fd) get_rcvsnd_timeo( (fd), SO_RCVTIMEO) #else -#define GET_RCVTIMEO(fd) (-1) +#define GET_RCVTIMEO(fd) (0) #endif #ifdef SO_SNDTIMEO #define GET_SNDTIMEO(fd) get_rcvsnd_timeo( (fd), SO_SNDTIMEO) #else -#define GET_SNDTIMEO(fd) (-1) +#define GET_SNDTIMEO(fd) (0) #endif /* utility: given an fd, will block until one of the events occurs */ @@ -5076,18 +5074,20 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, while (wsa->first_iovec < wsa->n_iovecs) { struct pollfd pfd; - int timeout = GET_SNDTIMEO(fd); + int poll_timeout = -1; + INT64 timeout = GET_SNDTIMEO(fd); - if (timeout != -1) + if (timeout) { timeout -= GetTickCount() - timeout_start; - if (timeout < 0) timeout = 0; + if (timeout < 0) poll_timeout = 0; + else poll_timeout = timeout <= INT_MAX ? timeout : INT_MAX; } pfd.fd = fd; pfd.events = POLLOUT; - if (!timeout || !poll( &pfd, 1, timeout )) + if (!poll_timeout || !poll( &pfd, 1, poll_timeout )) { err = WSAETIMEDOUT; goto error; /* msdn says a timeout in send is fatal */ @@ -7130,18 +7130,21 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if ( is_blocking ) { struct pollfd pfd; - int timeout = GET_RCVTIMEO(fd); - if (timeout != -1) + int poll_timeout = -1; + INT64 timeout = GET_RCVTIMEO(fd); + + if (timeout) { timeout -= GetTickCount() - timeout_start; - if (timeout < 0) timeout = 0; + if (timeout < 0) poll_timeout = 0; + else poll_timeout = timeout <= INT_MAX ? timeout : INT_MAX; } pfd.fd = fd; pfd.events = POLLIN; if (*lpFlags & WS_MSG_OOB) pfd.events |= POLLPRI; - if (!timeout || !poll( &pfd, 1, timeout )) + if (!poll_timeout || !poll( &pfd, 1, poll_timeout )) { err = WSAETIMEDOUT; /* a timeout is not fatal */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
46
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 April 2015