August 2013 - Wine-commits - list.winehq.org

Nikolay Sivov : ntdll: Fix typelib section leak on context release.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: a5eb9eee42481accdb4cae6097f29731aace0893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5eb9eee42481accdb4cae609… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 29 09:50:15 2013 +0400 ntdll: Fix typelib section leak on context release. --- dlls/ntdll/actctx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 1ccbf49..1ff1903 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -917,6 +917,7 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) RtlFreeHeap( GetProcessHeap(), 0, actctx->assemblies ); RtlFreeHeap( GetProcessHeap(), 0, actctx->dllredirect_section ); RtlFreeHeap( GetProcessHeap(), 0, actctx->wndclass_section ); + RtlFreeHeap( GetProcessHeap(), 0, actctx->tlib_section ); actctx->magic = 0; RtlFreeHeap( GetProcessHeap(), 0, actctx ); }

1 0

Dmitry Timoshkov : ntdll: Properly set flag which indicates buffer empty state.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 52d1080544ccd2dd4d4a261de501a4fa0770e885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d1080544ccd2dd4d4a261de… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 29 10:26:24 2013 +0900 ntdll: Properly set flag which indicates buffer empty state. --- dlls/kernel32/tests/comm.c | 1 + dlls/ntdll/serial.c | 13 +++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 4b0eb82..647c07a 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -851,6 +851,7 @@ todo_wine { res = GetOverlappedResult(hcom, &ovl_wait, &bytes, FALSE); ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); +todo_wine ok(bytes == sizeof(evtmask), "expected %u, written %u\n", (UINT)sizeof(evtmask), bytes); res = TRUE; } diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 93991f9..de699ef 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -838,16 +838,13 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) TRACE("TIOCSERGETLSR err %s\n", strerror(errno)); #endif #ifdef TIOCOUTQ /* otherwise we log when the out queue gets empty */ - if (ioctl(fd, TIOCOUTQ, &irq_info->temt)) + if (!ioctl(fd, TIOCOUTQ, &out)) { - TRACE("TIOCOUTQ err %s\n", strerror(errno)); - return FILE_GetNtStatus(); - } - else - { - if (irq_info->temt == 0) - irq_info->temt = 1; + irq_info->temt = out == 0; + return STATUS_SUCCESS; } + TRACE("TIOCOUTQ err %s\n", strerror(errno)); + return FILE_GetNtStatus(); #endif return STATUS_SUCCESS; }

1 0

Henri Verbeet : wined3d: Get rid of the SHADER_PGMSIZE constant.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 605136ab04cc427fb66ed18e194f5e1a0d0c5245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605136ab04cc427fb66ed18e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 29 10:26:23 2013 +0200 wined3d: Get rid of the SHADER_PGMSIZE constant. --- dlls/wined3d/shader.c | 5 ++--- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 786d491..624d091 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -245,13 +245,12 @@ void shader_buffer_clear(struct wined3d_shader_buffer *buffer) BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) { - buffer->buffer = HeapAlloc(GetProcessHeap(), 0, SHADER_PGMSIZE); - if (!buffer->buffer) + buffer->buffer_size = 16384; + if (!(buffer->buffer = HeapAlloc(GetProcessHeap(), 0, buffer->buffer_size))) { ERR("Failed to allocate shader buffer memory.\n"); return FALSE; } - buffer->buffer_size = SHADER_PGMSIZE; shader_buffer_clear(buffer); return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c320b65..ee90b67 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -412,8 +412,6 @@ enum wined3d_shader_rel_op * Shader model 3 according to msdn (and for software shaders) */ #define MAX_LABELS 16 -#define SHADER_PGMSIZE 16384 - struct wined3d_shader_buffer { char *buffer;

1 0

Henri Verbeet : wined3d: Get rid of the DDRAW_PITCH_ALIGNMENT and D3D8_PITCH_ALIGNMENT constants.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 43ecaf29c39b71eb3f7d3a13a8eb6d0138bb84b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ecaf29c39b71eb3f7d3a13a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 29 10:26:24 2013 +0200 wined3d: Get rid of the DDRAW_PITCH_ALIGNMENT and D3D8_PITCH_ALIGNMENT constants. --- dlls/ddraw/ddraw.c | 12 ++++-------- dlls/ddraw/ddraw_private.h | 2 ++ dlls/wined3d/directx.c | 1 - dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 1 - 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aac1b5a..420c400 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1228,11 +1228,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwSSBCKeyCaps = winecaps.ddraw_caps.ssb_color_key_caps; caps.dwSSBFXCaps = winecaps.ddraw_caps.ssb_fx_caps; - if (winecaps.ddraw_caps.stride_align) - { - caps.dwCaps |= DDCAPS_ALIGNSTRIDE; - caps.dwAlignStrideAlign = winecaps.ddraw_caps.stride_align; - } + caps.dwCaps |= DDCAPS_ALIGNSTRIDE; + caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT; if(DriverCaps) { @@ -5276,9 +5273,8 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->flags |= DDRAW_NO3D; } - hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, - NULL, 0, 8, &ddraw->device_parent, &ddraw->wined3d_device); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, + NULL, 0, DDRAW_STRIDE_ALIGNMENT, &ddraw->device_parent, &ddraw->wined3d_device))) { WARN("Failed to create a wined3d device, hr %#x.\n", hr); wined3d_decref(ddraw->wined3d); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 84f90c4..299d6ca 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -55,6 +55,8 @@ struct FvfToDecl #define DDRAW_NO3D 0x00000008 #define DDRAW_SCL_DDRAW1 0x00000010 +#define DDRAW_STRIDE_ALIGNMENT 8 + struct ddraw { /* Interfaces */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1e4dc6d..e235043 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4657,7 +4657,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDSCAPS_SYSTEMMEMORY | WINEDDSCAPS_VIDEOMEMORY | WINEDDSCAPS_VISIBLE; - caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT; if (!(wined3d->flags & WINED3D_NO3D)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ee90b67..76f6888 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1886,8 +1886,6 @@ struct wined3d_device BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */ -#define DDRAW_PITCH_ALIGNMENT 8 -#define D3D8_PITCH_ALIGNMENT 4 unsigned char surface_alignment; /* Line Alignment of surfaces */ struct wined3d_state state; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ff6cfbe..bf4b392 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1748,7 +1748,6 @@ struct wined3d_ddraw_caps DWORD ssb_color_key_caps; DWORD ssb_fx_caps; DWORD dds_caps; - DWORD stride_align; }; typedef struct _WINED3DCAPS

1 0

Henri Verbeet : wined3d: Get rid of the unused WINED3D_BUFFER_OPTIMIZED flag.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 805fc6419830240dfcac6c460efd0922c112d7e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805fc6419830240dfcac6c460… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 29 10:26:25 2013 +0200 wined3d: Get rid of the unused WINED3D_BUFFER_OPTIMIZED flag. --- dlls/wined3d/wined3d_private.h | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76f6888..17c0a0a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,14 +2491,13 @@ struct wined3d_map_range UINT size; }; -#define WINED3D_BUFFER_OPTIMIZED 0x01 /* Optimize has been called for the buffer */ -#define WINED3D_BUFFER_HASDESC 0x02 /* A vertex description has been found */ -#define WINED3D_BUFFER_CREATEBO 0x04 /* Attempt to create a buffer object next PreLoad */ -#define WINED3D_BUFFER_DOUBLEBUFFER 0x08 /* Use a vbo and local allocated memory */ -#define WINED3D_BUFFER_FLUSH 0x10 /* Manual unmap flushing */ -#define WINED3D_BUFFER_DISCARD 0x20 /* A DISCARD lock has occurred since the last PreLoad */ -#define WINED3D_BUFFER_NOSYNC 0x40 /* All locks since the last PreLoad had NOOVERWRITE set */ -#define WINED3D_BUFFER_APPLESYNC 0x80 /* Using sync as in GL_APPLE_flush_buffer_range */ +#define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ +#define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */ +#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ +#define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */ +#define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */ +#define WINED3D_BUFFER_NOSYNC 0x20 /* All locks since the last preload had NOOVERWRITE set. */ +#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ struct wined3d_buffer {

1 0

Henri Verbeet : d3dx9: Simplify D3DXCreateTextureFromResourceExA().
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 4b56eae0f1253c2db1d168a6126b4264897897d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b56eae0f1253c2db1d168a61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 29 10:26:26 2013 +0200 d3dx9: Simplify D3DXCreateTextureFromResourceExA(). --- dlls/d3dx9_36/texture.c | 35 ++++++++++++++--------------------- 1 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 9e45506..d32d834 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -785,34 +785,27 @@ HRESULT WINAPI D3DXCreateTextureFromResourceExA(struct IDirect3DDevice9 *device, PALETTEENTRY *palette, struct IDirect3DTexture9 **texture) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(resource)); + TRACE("device %p, srcmodule %p, resource %s, width %u, height %u, miplevels %u, usage %#x, format %#x, " + "pool %#x, filter %#x, mipfilter %#x, colorkey 0x%08x, srcinfo %p, palette %p, texture %p.\n", + device, srcmodule, debugstr_a(resource), width, height, miplevels, usage, format, + pool, filter, mipfilter, colorkey, srcinfo, palette, texture); if (!device || !texture) return D3DERR_INVALIDCALL; - resinfo = FindResourceA(srcmodule, resource, (const char *)RT_RCDATA); - if (!resinfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ - resinfo = FindResourceA(srcmodule, resource, (const char *)RT_BITMAP); - - if (resinfo) - { - LPVOID buffer; - HRESULT hr; - DWORD size; - - hr = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); - - if (FAILED(hr)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceA(srcmodule, resource, (const char *)RT_RCDATA)) + /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ + && !(resinfo = FindResourceA(srcmodule, resource, (const char *)RT_BITMAP))) + return D3DXERR_INVALIDDATA; - return D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, - height, miplevels, usage, format, - pool, filter, mipfilter, colorkey, - srcinfo, palette, texture); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, height, miplevels, + usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); } HRESULT WINAPI D3DXCreateTextureFromResourceExW(struct IDirect3DDevice9 *device, HMODULE srcmodule,

1 0

Henri Verbeet : d3dx9: Simplify D3DXCreateTextureFromResourceExW().
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: d35c67becd4c0c220e7d5554d5b7268f5fb3c3dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35c67becd4c0c220e7d5554d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 29 10:26:27 2013 +0200 d3dx9: Simplify D3DXCreateTextureFromResourceExW(). --- dlls/d3dx9_36/texture.c | 35 ++++++++++++++--------------------- 1 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index d32d834..f0b5569 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -814,34 +814,27 @@ HRESULT WINAPI D3DXCreateTextureFromResourceExW(struct IDirect3DDevice9 *device, PALETTEENTRY *palette, struct IDirect3DTexture9 **texture) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(resource)); + TRACE("device %p, srcmodule %p, resource %s, width %u, height %u, miplevels %u, usage %#x, format %#x, " + "pool %#x, filter %#x, mipfilter %#x, colorkey 0x%08x, srcinfo %p, palette %p, texture %p.\n", + device, srcmodule, debugstr_w(resource), width, height, miplevels, usage, format, + pool, filter, mipfilter, colorkey, srcinfo, palette, texture); if (!device || !texture) return D3DERR_INVALIDCALL; - resinfo = FindResourceW(srcmodule, resource, (const WCHAR *)RT_RCDATA); - if (!resinfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ - resinfo = FindResourceW(srcmodule, resource, (const WCHAR *)RT_BITMAP); - - if (resinfo) - { - LPVOID buffer; - HRESULT hr; - DWORD size; - - hr = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); - - if (FAILED(hr)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceW(srcmodule, resource, (const WCHAR *)RT_RCDATA)) + /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ + && !(resinfo = FindResourceW(srcmodule, resource, (const WCHAR *)RT_BITMAP))) + return D3DXERR_INVALIDDATA; - return D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, - height, miplevels, usage, format, - pool, filter, mipfilter, colorkey, - srcinfo, palette, texture); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, height, miplevels, + usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); } HRESULT WINAPI D3DXCreateCubeTexture(struct IDirect3DDevice9 *device, UINT size, UINT miplevels,

1 0

Wolfgang Walter : ntdll: Call tcdrain for serial handles from NtFlushBuffersFile.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: f93a5d25608766a28ae5012327de0b4de27debf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93a5d25608766a28ae501232… Author: Wolfgang Walter <wine(a)stwm.de> Date: Tue Jan 20 17:52:38 2009 +0100 ntdll: Call tcdrain for serial handles from NtFlushBuffersFile. --- dlls/ntdll/file.c | 39 +++++++++++++++++++++++++++++++-------- server/serial.c | 11 +---------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5147ef5..3ffc632 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -66,6 +66,9 @@ #ifdef HAVE_SYS_STATFS_H # include <sys/statfs.h> #endif +#ifdef HAVE_TERMIOS_H +#include <termios.h> +#endif #ifdef HAVE_VALGRIND_MEMCHECK_H # include <valgrind/memcheck.h> #endif @@ -2749,19 +2752,39 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock { NTSTATUS ret; HANDLE hEvent = NULL; + enum server_fd_type type; + int fd, needs_close; - SERVER_START_REQ( flush_file ) + ret = server_get_unix_fd( hFile, FILE_WRITE_DATA, &fd, &needs_close, &type, NULL ); + + if (!ret && type == FD_TYPE_SERIAL) { - req->handle = wine_server_obj_handle( hFile ); - ret = wine_server_call( req ); - hEvent = wine_server_ptr_handle( reply->event ); + while (tcdrain( fd ) == -1) + { + if (errno != EINTR) + { + ret = FILE_GetNtStatus(); + break; + } + } } - SERVER_END_REQ; - if (!ret && hEvent) + else { - ret = NtWaitForSingleObject( hEvent, FALSE, NULL ); - NtClose( hEvent ); + SERVER_START_REQ( flush_file ) + { + req->handle = wine_server_obj_handle( hFile ); + ret = wine_server_call( req ); + hEvent = wine_server_ptr_handle( reply->event ); + } + SERVER_END_REQ; + if (!ret && hEvent) + { + ret = NtWaitForSingleObject( hEvent, FALSE, NULL ); + NtClose( hEvent ); + } } + + if (needs_close) close( fd ); return ret; } diff --git a/server/serial.c b/server/serial.c index 587fee1..aac20fa 100644 --- a/server/serial.c +++ b/server/serial.c @@ -61,7 +61,6 @@ static struct fd *serial_get_fd( struct object *obj ); static void serial_destroy(struct object *obj); static enum server_fd_type serial_get_fd_type( struct fd *fd ); -static void serial_flush( struct fd *fd, struct event **event ); static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); struct serial @@ -107,7 +106,7 @@ static const struct fd_ops serial_fd_ops = { default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ - serial_flush, /* flush */ + no_flush, /* flush */ serial_get_fd_type, /* get_fd_type */ default_fd_ioctl, /* ioctl */ serial_queue_async, /* queue_async */ @@ -196,14 +195,6 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ } } -static void serial_flush( struct fd *fd, struct event **event ) -{ - /* MSDN says: If hFile is a handle to a communications device, - * the function only flushes the transmit buffer. - */ - if (tcflush( get_unix_fd(fd), TCOFLUSH ) == -1) file_set_error(); -} - DECL_HANDLER(get_serial_info) { struct serial *serial;

1 0

Bruno Jesus : ws2_32/tests: Add SO_PROTOCOL_INFO tests.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 4ce3ddedb916eb1d7a0b7d63b1a64b3e00169b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce3ddedb916eb1d7a0b7d63b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 28 21:19:43 2013 -0300 ws2_32/tests: Add SO_PROTOCOL_INFO tests. --- dlls/ws2_32/tests/sock.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5ce4959..5d80fca 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1105,6 +1105,18 @@ static void test_set_getsockopt(void) int timeout; LINGER lingval; int size; + WSAPROTOCOL_INFOA infoA; + WSAPROTOCOL_INFOW infoW; + char providername[WSAPROTOCOL_LEN + 1]; + struct _prottest + { + int family, type, proto; + } prottest[] = { + {AF_INET, SOCK_STREAM, IPPROTO_TCP}, + {AF_INET, SOCK_DGRAM, IPPROTO_UDP}, + {AF_INET6, SOCK_STREAM, IPPROTO_TCP}, + {AF_INET6, SOCK_DGRAM, IPPROTO_UDP} + }; s = socket(AF_INET, SOCK_STREAM, 0); ok(s!=INVALID_SOCKET, "socket() failed error: %d\n", WSAGetLastError()); @@ -1221,6 +1233,81 @@ todo_wine err, WSAGetLastError()); closesocket(s); + + /* test SO_PROTOCOL_INFOA invalid parameters */ + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, NULL), + "getsockopt should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, NULL), + "getsockopt should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, &size), + "getsockopt should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + + size = sizeof(WSAPROTOCOL_INFOA) / 2; + ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size), + "getsockopt should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + closesocket(s); + + /* test SO_PROTOCOL_INFO structure returned for different protocols */ + for (i = 0; i < sizeof(prottest) / sizeof(prottest[0]); i++) + { + s = socket(prottest[i].family, prottest[i].type, prottest[i].proto); + if (s == INVALID_SOCKET && prottest[i].family == AF_INET6) continue; + + ok(s != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + + /* compare both A and W version */ + infoA.szProtocol[0] = 0; + size = sizeof(WSAPROTOCOL_INFOA); + err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size); +todo_wine + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + + infoW.szProtocol[0] = 0; + size = sizeof(WSAPROTOCOL_INFOW); + err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOW, (char *) &infoW, &size); +todo_wine + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + + trace("provider name '%s', family %d, type %d, proto %d\n", + infoA.szProtocol, prottest[i].family, prottest[i].type, prottest[i].proto); + + todo_wine { + ok(infoA.szProtocol[0], "WSAPROTOCOL_INFOA was not filled\n"); + ok(infoW.szProtocol[0], "WSAPROTOCOL_INFOW was not filled\n"); + } + + WideCharToMultiByte(CP_ACP, 0, infoW.szProtocol, -1, + providername, sizeof(providername), NULL, NULL); + ok(!strcmp(infoA.szProtocol,providername), + "different provider names '%s' != '%s'\n", infoA.szProtocol, providername); + + todo_wine { + ok(!memcmp(&infoA, &infoW, FIELD_OFFSET(WSAPROTOCOL_INFOA, szProtocol)), + "SO_PROTOCOL_INFO[A/W] comparison failed\n"); + ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", + prottest[i].family, infoA.iAddressFamily); + ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", + prottest[i].type, infoA.iSocketType); + ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n", + prottest[i].proto, infoA.iProtocol); + } + + closesocket(s); + } } static void test_so_reuseaddr(void)

1 0

Piotr Caban : msvcrt: Add _wsetlocale implementation.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 33d697c001049b6c20203d3332299dfc4c5af6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d697c001049b6c20203d333… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 29 12:07:03 2013 +0200 msvcrt: Add _wsetlocale implementation. --- dlls/msvcrt/locale.c | 48 ++++++++++++++++++++++++++++++++++-------------- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 14ccd0a..4e8467a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -407,20 +407,6 @@ static inline char* construct_lc_all(MSVCRT_pthreadlocinfo locinfo) { /********************************************************************* - * wsetlocale (MSVCRT.@) - */ -MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* locale) -{ - static MSVCRT_wchar_t fake[] = { - 'E','n','g','l','i','s','h','_','U','n','i','t','e','d',' ', - 'S','t','a','t','e','s','.','1','2','5','2',0 }; - - FIXME("%d %s\n", category, debugstr_w(locale)); - - return fake; -} - -/********************************************************************* * _Getdays (MSVCRT.@) */ char* CDECL _Getdays(void) @@ -1435,6 +1421,40 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) return locinfo->lc_category[category].locale; } +/********************************************************************* + * _wsetlocale (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* wlocale) +{ + static MSVCRT_wchar_t current_lc_all[MAX_LOCALE_LENGTH]; + + char *locale = NULL; + const char *ret; + MSVCRT_size_t len; + + if(wlocale) { + len = MSVCRT_wcstombs(NULL, wlocale, 0); + if(len == -1) + return NULL; + + locale = MSVCRT_malloc(++len); + if(!locale) + return NULL; + + MSVCRT_wcstombs(locale, wlocale, len); + } + + LOCK_LOCALE; + ret = MSVCRT_setlocale(category, locale); + MSVCRT_free(locale); + + if(ret && MSVCRT_mbstowcs(current_lc_all, ret, MAX_LOCALE_LENGTH)==-1) + ret = NULL; + + UNLOCK_LOCALE; + return ret ? current_lc_all : NULL; +} + /* _configthreadlocale - not exported in native msvcrt */ int CDECL _configthreadlocale(int type) { diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 35e9c7d..98922af 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -953,6 +953,7 @@ int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); int __cdecl MSVCRT_mbtowc(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); +MSVCRT_size_t __cdecl MSVCRT_wcstombs(char*,const MSVCRT_wchar_t*,MSVCRT_size_t); MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl MSVRT__spawnvpe(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl MSVCRT__wspawnve(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *);

1 0