September 2013 - Wine-Commits

Huw Davies : iphlpapi: Use proper multibyte to unicode conversion.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 57ed5bf32e4b8bb6e539f9df1e57f2f1b2827cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ed5bf32e4b8bb6e539f9df1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 16 13:50:38 2013 +0100 iphlpapi: Use proper multibyte to unicode conversion. --- dlls/iphlpapi/iphlpapi_main.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 5f795ec..789c339 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1027,13 +1027,11 @@ static BOOL is_ip_address_string(const char *str) static ULONG get_dns_suffix(WCHAR *suffix, ULONG *len) { ULONG size, i; - char *found_suffix = NULL; + const char *found_suffix = ""; + /* Always return a NULL-terminated string, even if it's empty. */ initialise_resolver(); - /* Always return a NULL-terminated string, even if it's empty. */ - size = sizeof(WCHAR); - for (i = 0, found_suffix = NULL; - !found_suffix && i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) + for (i = 0; !*found_suffix && i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) { /* This uses a heuristic to select a DNS suffix: * the first, non-IP address string is selected. @@ -1041,22 +1039,14 @@ static ULONG get_dns_suffix(WCHAR *suffix, ULONG *len) if (!is_ip_address_string(_res.dnsrch[i])) found_suffix = _res.dnsrch[i]; } - if (found_suffix) - size += strlen(found_suffix) * sizeof(WCHAR); + + size = MultiByteToWideChar( CP_UNIXCP, 0, found_suffix, -1, NULL, 0 ) * sizeof(WCHAR); if (!suffix || *len < size) { *len = size; return ERROR_BUFFER_OVERFLOW; } - *len = size; - if (found_suffix) - { - char *p; - - for (p = found_suffix; *p; p++) - *suffix++ = *p; - } - *suffix = 0; + *len = MultiByteToWideChar( CP_UNIXCP, 0, found_suffix, -1, suffix, *len / sizeof(WCHAR) ) * sizeof(WCHAR); return ERROR_SUCCESS; } @@ -1139,7 +1129,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) aa->DnsSuffix = dnsSuffix; else - aa->DnsSuffix = (WCHAR *)((BYTE*)dnsSuffix + dns_suffix_size - 2); + aa->DnsSuffix = dnsSuffix + dns_suffix_size / sizeof(WCHAR) - 1; } ret = ERROR_SUCCESS; }

1 0

Henri Verbeet : wined3d: Pass a resource to wined3d_resource_allocate_sysmem().
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 261246ef21d285727fc2da69fb223b649d56d142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=261246ef21d285727fc2da69f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:24 2013 +0200 wined3d: Pass a resource to wined3d_resource_allocate_sysmem(). --- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/resource.c | 17 +++++++++-------- dlls/wined3d/surface.c | 11 +++++------ dlls/wined3d/volume.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2deb7d2..b61c3ce 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -500,7 +500,8 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *con /* AllocatedMemory exists if the buffer is double buffered or has no buffer object at all */ if(This->resource.allocatedMemory) return This->resource.allocatedMemory; - This->resource.heap_memory = wined3d_resource_allocate_sysmem(This->resource.size); + if (!wined3d_resource_allocate_sysmem(&This->resource)) + ERR("Failed to allocate system memory.\n"); This->resource.allocatedMemory = This->resource.heap_memory; if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a677d00..78f35e9 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -120,11 +120,10 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (size) { - resource->heap_memory = wined3d_resource_allocate_sysmem(size); - if (!resource->heap_memory) + if (!wined3d_resource_allocate_sysmem(resource)) { - ERR("Out of memory!\n"); - return WINED3DERR_OUTOFVIDEOMEMORY; + ERR("Failed to allocate system memory.\n"); + return E_OUTOFMEMORY; } } else @@ -344,19 +343,21 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st desc->size = resource->size; } -void *wined3d_resource_allocate_sysmem(SIZE_T size) +BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) { void **p; SIZE_T align = RESOURCE_ALIGNMENT - 1 + sizeof(*p); void *mem; - if (!(mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + align))) - return NULL; + if (!(mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, resource->size + align))) + return FALSE; p = (void **)(((ULONG_PTR)mem + align) & ~(RESOURCE_ALIGNMENT - 1)) - 1; *p = mem; - return ++p; + resource->heap_memory = ++p; + + return TRUE; } void wined3d_resource_free_sysmem(void *mem) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b64c8e9..e40a65a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -587,9 +587,8 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ - if (!surface->resource.heap_memory) - surface->resource.heap_memory = wined3d_resource_allocate_sysmem(surface->resource.size); - + if (!surface->resource.heap_memory && !wined3d_resource_allocate_sysmem(&surface->resource)) + ERR("Failed to allocate system memory.\n"); surface->resource.allocatedMemory = surface->resource.heap_memory; if (surface->flags & SFLAG_INSYSMEM) @@ -1432,7 +1431,7 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win else { if (!surface->resource.heap_memory) - surface->resource.heap_memory = wined3d_resource_allocate_sysmem(surface->resource.size); + wined3d_resource_allocate_sysmem(&surface->resource); else if (!(surface->flags & SFLAG_CLIENT)) ERR("Surface %p has heap_memory %p and flags %#x.\n", surface, surface->resource.heap_memory, surface->flags); @@ -1458,9 +1457,9 @@ static BOOL surface_init_sysmem(struct wined3d_surface *surface) { if (!surface->resource.heap_memory) { - if (!(surface->resource.heap_memory = wined3d_resource_allocate_sysmem(surface->resource.size))) + if (!wined3d_resource_allocate_sysmem(&surface->resource)) { - ERR("Failed to allocate memory.\n"); + ERR("Failed to allocate system memory.\n"); return FALSE; } } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 7f2dbf9..62c6ab9 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -391,9 +391,11 @@ static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) if (volume->resource.allocatedMemory) return TRUE; - volume->resource.heap_memory = wined3d_resource_allocate_sysmem(volume->resource.size); - if (!volume->resource.heap_memory) + if (!wined3d_resource_allocate_sysmem(&volume->resource)) + { + ERR("Failed to allocate system memory.\n"); return FALSE; + } volume->resource.allocatedMemory = volume->resource.heap_memory; return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a30db57..cbf6e78 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1984,7 +1984,6 @@ struct wined3d_resource_ops void (*resource_unload)(struct wined3d_resource *resource); }; -void *wined3d_resource_allocate_sysmem(SIZE_T size) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(void *mem) DECLSPEC_HIDDEN; struct wined3d_resource @@ -2025,6 +2024,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;

1 0

Thomas Faber : comctl32: Fix build with MSVC.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: e12c8c0ce93a22bec67d0926faf211456b8f5442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12c8c0ce93a22bec67d0926f… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Sep 14 21:20:53 2013 +0200 comctl32: Fix build with MSVC. --- dlls/comctl32/trackbar.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 50c44d5..9673771 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -616,8 +616,7 @@ static int TRACKBAR_FillThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, HBRUSH hbrush) { const RECT *thumb = &infoPtr->rcThumb; - const int PointCount = 6; - POINT points[PointCount]; + POINT points[6]; int PointDepth; HBRUSH oldbr; @@ -698,7 +697,7 @@ TRACKBAR_FillThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, HBRUSH hbrush) oldbr = SelectObject(hdc, hbrush); SetPolyFillMode(hdc, WINDING); - Polygon(hdc, points, PointCount); + Polygon(hdc, points, sizeof(points) / sizeof(points[0])); SelectObject(hdc, oldbr); return PointDepth;

1 0

Bruno Jesus : ws2_32: Fix the error returned for denied SOCK_RAW attempts.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 29aab5df59a485b3c8fddef284ccdc02485bd86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29aab5df59a485b3c8fddef28… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 16 01:44:40 2013 -0300 ws2_32: Fix the error returned for denied SOCK_RAW attempts. --- dlls/ws2_32/socket.c | 1 - dlls/ws2_32/tests/sock.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index dafbeb4..4750656 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5937,7 +5937,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, ERR_(winediag)("Failed to create a socket of type SOCK_RAW, this requires special permissions.\n"); else ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); - err = WSAESOCKTNOSUPPORT; } else { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 40496ca..70269b4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2050,6 +2050,53 @@ todo_wine } HeapFree(GetProcessHeap(), 0, pi); + + SetLastError(0xdeadbeef); + /* starting on vista the socket function returns error during the socket + creation and no longer in the socket operations (sendto, readfrom) */ + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_ICMP, NULL, 0, 0); + if (sock == INVALID_SOCKET) + { + err = WSAGetLastError(); + ok(err == WSAEACCES, "Expected 10013, received %d\n", err); + skip("SOCK_RAW is not supported\n"); + } + else + { + trace("SOCK_RAW is supported\n"); + + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + + todo_wine { + sock = WSASocketA(0, 0, IPPROTO_RAW, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } + + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } } static void test_WSADuplicateSocket(void)

1 0

Bruno Jesus : ws2_32: Avoid magic numbers.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 44ea5334caf05bd9b450d1d0b9f4da1d8a202acb URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ea5334caf05bd9b450d1d0b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 16 01:43:45 2013 -0300 ws2_32: Avoid magic numbers. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8762950..c6b3593 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1670,7 +1670,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->iAddressFamily = WS_AF_IPX; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x0e; - info->iSocketType = 5; + info->iSocketType = WS_SOCK_SEQPACKET; info->dwMessageSize = 0xffffffff; strcpyW( info->szProtocol, NameSpxW ); break; @@ -1687,7 +1687,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->iAddressFamily = WS_AF_IPX; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x0e; - info->iSocketType = 5; + info->iSocketType = WS_SOCK_SEQPACKET; info->dwMessageSize = 0xffffffff; strcpyW( info->szProtocol, NameSpxIIW ); break;

1 0

Henri Verbeet : dxgi: Avoid LPVOID.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 19f028ce6d0d7d0857454392d9502fa2132da1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f028ce6d0d7d0857454392d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:28 2013 +0200 dxgi: Avoid LPVOID. --- dlls/dxgi/dxgi_main.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index ed5f3a5..8249b88 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -49,19 +49,17 @@ static void dxgi_main_cleanup(void) DeleteCriticalSection(&dxgi_cs); } -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("fdwReason %u\n", fdwReason); - - switch(fdwReason) + switch (reason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); + DisableThreadLibraryCalls(inst); break; case DLL_PROCESS_DETACH: - if (lpv) break; - dxgi_main_cleanup(); + if (!reserved) + dxgi_main_cleanup(); break; }

1 0

Henri Verbeet : dxgi: Avoid LPCSTR.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: e032d013d7b2b9396b233390e685134f90f18b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e032d013d7b2b9396b233390e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:27 2013 +0200 dxgi: Avoid LPCSTR. --- dlls/dxgi/dxgi_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index e9ed482..ed5f3a5 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -131,8 +131,7 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) HMODULE mod; BOOL ret; - ret = GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)d3d10core, &mod); - if (!ret) + if (!(ret = GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const char *)d3d10core, &mod))) { LeaveCriticalSection(&dxgi_cs); return E_FAIL;

1 0

Henri Verbeet : ddraw: Take surface usage into account when checking format capabilities in CreateSurface ().
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: dbdde3bd4b1cde34e5b43eb09610a51ec8ed79a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdde3bd4b1cde34e5b43eb09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:26 2013 +0200 ddraw: Take surface usage into account when checking format capabilities in CreateSurface(). --- dlls/ddraw/ddraw.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d3385e0..608804f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3005,6 +3005,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, { enum wined3d_format_id format = wined3dformat_from_ddrawformat(&desc2.u4.ddpfPixelFormat); enum wined3d_resource_type rtype; + DWORD usage = 0; if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) rtype = WINED3D_RTYPE_TEXTURE; @@ -3013,8 +3014,13 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, else rtype = WINED3D_RTYPE_SURFACE; + if (desc2.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + usage = WINED3DUSAGE_DEPTHSTENCIL; + else if (desc2.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + usage = WINED3DUSAGE_RENDERTARGET; + hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, - mode.format_id, 0, rtype, format); + mode.format_id, usage, rtype, format); if (SUCCEEDED(hr)) desc2.ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; else

1 0

Alexandre Julliard : libwine: Put the server directory inside the wineprefix on Android.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 2b2bf64d3bbcccb5f04a1c1c7c6cba7af1237b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2bf64d3bbcccb5f04a1c1c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 16 12:44:15 2013 +0200 libwine: Put the server directory inside the wineprefix on Android. --- libs/wine/config.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index d8c46be..3b5dd68 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -222,7 +222,9 @@ static void init_server_dir( dev_t dev, ino_t ino ) { char *p, *root; -#ifdef HAVE_GETUID +#ifdef __ANDROID__ /* there's no /tmp dir on Android */ + root = build_path( config_dir, ".wineserver" ); +#elif defined(HAVE_GETUID) root = xmalloc( sizeof(server_root_prefix) + 12 ); sprintf( root, "%s-%u", server_root_prefix, getuid() ); #else

1 0

Bruno Jesus : ws2_32: Advertise protocol entries as default.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: e0581b38a7edee6ba61f5b3559a68af82d7d1f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0581b38a7edee6ba61f5b355… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 16 01:43:31 2013 -0300 ws2_32: Advertise protocol entries as default. --- dlls/ws2_32/socket.c | 5 +++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eacc793..8762950 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1613,6 +1613,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) XP1_GUARANTEED_DELIVERY; info->ProviderId = ProviderIdIP; info->dwCatalogEntryId = 0x3e9; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; info->iAddressFamily = WS_AF_INET; @@ -1628,6 +1629,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) XP1_CONNECTIONLESS; info->ProviderId = ProviderIdIP; info->dwCatalogEntryId = 0x3ea; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; info->iAddressFamily = WS_AF_INET; @@ -1644,6 +1646,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) XP1_CONNECTIONLESS; info->ProviderId = ProviderIdIPX; info->dwCatalogEntryId = 0x406; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; info->iAddressFamily = WS_AF_IPX; @@ -1661,6 +1664,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) XP1_GUARANTEED_DELIVERY; info->ProviderId = ProviderIdSPX; info->dwCatalogEntryId = 0x407; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; info->iAddressFamily = WS_AF_IPX; @@ -1677,6 +1681,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; info->ProviderId = ProviderIdSPX; info->dwCatalogEntryId = 0x409; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; info->iAddressFamily = WS_AF_IPX; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3c3658f..bc2bd10 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2000,22 +2000,22 @@ todo_wine ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); -todo_wine { size = sizeof(socktype); socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); +todo_wine ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); for(i = 0; i < items; i++) { if(pi[i].dwProviderFlags & PFL_MATCHES_PROTOCOL_ZERO) { +todo_wine ok(socktype == pi[i].iSocketType, "Wrong socket type, expected %d received %d\n", pi[i].iSocketType, socktype); break; } } ok(i != items, "Creating a socket without protocol and socket type didn't work\n"); -} closesocket(sock); /* when no socket type is specified the first entry from WSAEnumProtocols

1 0