wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Henri Verbeet : d3d10: Avoid LPVOID.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 69fe799c25eaf9780aee28d96798e9960194943c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69fe799c25eaf9780aee28d96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:13 2013 +0200 d3d10: Avoid LPVOID. --- dlls/d3d10/d3d10_main.c | 13 ++++++------- include/d3d10_1shader.h | 2 +- include/d3d10effect.h | 4 ++-- include/d3d10shader.h | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index ac3eee5..01fefba 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -27,16 +27,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("fdwReason=%d\n", fdwReason); - switch(fdwReason) + switch (reason) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hInstDLL ); - break; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; } + return TRUE; } diff --git a/include/d3d10_1shader.h b/include/d3d10_1shader.h index 92f5ebf..06dded7 100644 --- a/include/d3d10_1shader.h +++ b/include/d3d10_1shader.h @@ -27,7 +27,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflection1, 0xc3457783, 0xa846, 0x47ce, 0x95, 0x20, DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10ShaderReflection1 methods */ diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 5af2ef5..1494894 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -755,7 +755,7 @@ DEFINE_GUID(IID_ID3D10Effect, 0x51b0ca8b, 0xec0b, 0x4519, 0x87, 0x0d, 0x8e, 0xe1 DECLARE_INTERFACE_(ID3D10Effect, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10Effect methods */ @@ -781,7 +781,7 @@ DEFINE_GUID(IID_ID3D10EffectPool, 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10EffectPool methods */ diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 894b833..4a2fef9 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -140,7 +140,7 @@ typedef struct _D3D10_SHADER_VARIABLE_DESC UINT StartOffset; UINT Size; UINT uFlags; - LPVOID DefaultValue; + void *DefaultValue; } D3D10_SHADER_VARIABLE_DESC; typedef struct _D3D10_SHADER_TYPE_DESC @@ -193,7 +193,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflection, 0xd40e20b6, 0xf8f7, 0x42ad, 0xab, 0x20, DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10ShaderReflection methods */

1 0

Henri Verbeet : d3d10: Avoid LPCSTR.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 708615056ceca237cab1301cf385b720ec602e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708615056ceca237cab1301cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:12 2013 +0200 d3d10: Avoid LPCSTR. --- dlls/d3d10/d3d10_main.c | 6 +- dlls/d3d10/effect.c | 111 +++++++++++++++++++++--------------------- dlls/d3d10/shader.c | 4 +- include/d3d10.idl | 10 ++-- include/d3d10_1shader.h | 6 +- include/d3d10effect.h | 122 +++++++++++++++++++++++----------------------- include/d3d10shader.h | 30 ++++++------ include/d3dcommon.idl | 4 +- 8 files changed, 148 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=708615056ceca237cab13…

1 0

Henri Verbeet : ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_set_render_target ().
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 2cc421f59d0e25a69dd876fd0438af2b2aba4a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc421f59d0e25a69dd876fd0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:11 2013 +0200 ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_set_render_target(). --- dlls/ddraw/device.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9f537c1..3f3cb18 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1796,6 +1796,15 @@ static HRESULT WINAPI d3d_device2_GetCurrentViewport(IDirect3DDevice2 *iface, ID (IDirect3DViewport3 **)viewport); } +static BOOL validate_surface_palette(struct ddraw_surface *surface) +{ + return !(surface->surface_desc.u4.ddpfPixelFormat.dwFlags + & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 + | DDPF_PALETTEINDEXEDTO8)) + || wined3d_surface_get_palette(surface->wined3d_surface); +} + static HRESULT d3d_device_set_render_target(struct d3d_device *device, struct ddraw_surface *target, IUnknown *rt_iface) { @@ -1803,6 +1812,13 @@ static HRESULT d3d_device_set_render_target(struct d3d_device *device, wined3d_mutex_lock(); + if (!validate_surface_palette(target)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + if (device->rt_iface == rt_iface) { TRACE("No-op SetRenderTarget operation, not doing anything\n"); @@ -6752,11 +6768,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_INVALIDCAPS; } - if ((target->surface_desc.u4.ddpfPixelFormat.dwFlags - & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 - | DDPF_PALETTEINDEXEDTO8)) - && !wined3d_surface_get_palette(target->wined3d_surface)) + if (!validate_surface_palette(target)) { WARN("Surface %p has an indexed pixel format, but no palette.\n", target); return DDERR_NOPALETTEATTACHED;

1 0

Henri Verbeet : ddraw: Verify that the surface is in video memory in d3d_device_create().
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 4f899571617d3cde94da2e9b54cc53557784b956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f899571617d3cde94da2e9b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:10 2013 +0200 ddraw: Verify that the surface is in video memory in d3d_device_create(). --- dlls/ddraw/device.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 210a522..9f537c1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6762,6 +6762,12 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_NOPALETTEATTACHED; } + if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target); + return D3DERR_SURFACENOTINVIDMEM; + } + if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, "

1 0

Henri Verbeet : ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_create ().
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: c69cd599a394a8e54094679e1551391f5b0ce3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69cd599a394a8e54094679e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:09 2013 +0200 ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_create(). --- dlls/ddraw/device.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7510ed8..210a522 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6752,6 +6752,16 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_INVALIDCAPS; } + if ((target->surface_desc.u4.ddpfPixelFormat.dwFlags + & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 + | DDPF_PALETTEINDEXEDTO8)) + && !wined3d_surface_get_palette(target->wined3d_surface)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target); + return DDERR_NOPALETTEATTACHED; + } + if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, "

1 0

Piotr Caban : msvcrt: Don' t use CDECL calling convention in MSVCRT_wcsrtombs_l (internal function).
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 1f1624612e45d4ff6330fc3acb82db30bf906ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1624612e45d4ff6330fc3ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 18 09:25:26 2013 +0200 msvcrt: Don't use CDECL calling convention in MSVCRT_wcsrtombs_l (internal function). --- dlls/msvcrt/wcs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index dca6a3d..60eae92 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -392,7 +392,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, /********************************************************************* * wcsrtombs_l (INTERNAL) */ -static MSVCRT_size_t CDECL MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcstr, +static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo;

1 0

Jacek Caban : winetest: Added a binary file that has no known MIME type.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: tools Branch: master Commit: 6fb74a2f0458c41c31ed0535ca2ba7dd3ce85c3d URL: http://source.winehq.org/git/tools.git/?a=commit;h=6fb74a2f0458c41c31ed0535… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 15:43:39 2013 +0200 winetest: Added a binary file that has no known MIME type. --- winetest/tests/file.winetest | Bin 0 -> 4839 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/winetest/tests/file.winetest b/winetest/tests/file.winetest new file mode 100644 index 0000000..b42dec0 Binary files /dev/null and b/winetest/tests/file.winetest differ

1 0

Bruno Jesus : ws2_32: Do not allow socket creation if WSAStartup was not called.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 2034f515981ead985c4c24fac7b6935326cdb490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2034f515981ead985c4c24fac… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 17 10:01:07 2013 -0300 ws2_32: Do not allow socket creation if WSAStartup was not called. --- dlls/ws2_32/socket.c | 6 ++++++ dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e8d87da..8a790f3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5878,6 +5878,12 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, TRACE("af=%d type=%d protocol=%d protocol_info=%p group=%d flags=0x%x\n", af, type, protocol, lpProtocolInfo, g, dwFlags ); + if (!num_startup) + { + err = WSANOTINITIALISED; + goto done; + } + /* hack for WSADuplicateSocket */ if (lpProtocolInfo && lpProtocolInfo->dwServiceFlags4 == 0xff00ff00) { ret = lpProtocolInfo->dwServiceFlags3; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3921262..b77bb3c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -975,7 +975,6 @@ static void test_WithoutWSAStartup(void) WSASetLastError(0xdeadbeef); ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSANOTINITIALISED, "Expected 10093, received %d\n", err); WSASetLastError(0xdeadbeef);

1 0

Bruno Jesus : ws2_32: Filter invalid socket parameters and return the appropriate error.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 0298165bea97e577401383eb62bd0c882116fbd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0298165bea97e577401383eb6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 17 10:00:52 2013 -0300 ws2_32: Filter invalid socket parameters and return the appropriate error. --- dlls/ws2_32/socket.c | 48 +++++++++++++++++++++++++++++++++++++++++---- dlls/ws2_32/tests/sock.c | 20 +++++++++++------- 2 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1e2c44e..e8d87da 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5868,6 +5868,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, { SOCKET ret; DWORD err; + int unixaf, unixtype; /* FIXME: The "advanced" parameters of WSASocketW (lpProtocolInfo, @@ -5913,14 +5914,50 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } } - /* convert the socket family and type */ - af = convert_af_w2u(af); - type = convert_socktype_w2u(type); + /* convert the socket family, type and protocol */ + unixaf = convert_af_w2u(af); + unixtype = convert_socktype_w2u(type); + protocol = convert_proto_w2u(protocol); + if (unixaf == AF_UNSPEC) unixaf = -1; + + /* filter invalid parameters */ + if (protocol < 0) + { + /* the type could not be converted */ + if (type && unixtype < 0) + { + err = WSAESOCKTNOSUPPORT; + goto done; + } + + err = WSAEPROTONOSUPPORT; + goto done; + } + if (unixaf < 0) + { + /* both family and protocol can't be invalid */ + if (protocol <= 0) + { + err = WSAEINVAL; + goto done; + } + + /* family could not be converted and neither socket type */ + if (unixtype < 0 && af >= 0) + { + + err = WSAESOCKTNOSUPPORT; + goto done; + } + + err = WSAEAFNOSUPPORT; + goto done; + } SERVER_START_REQ( create_socket ) { - req->family = af; - req->type = type; + req->family = unixaf; + req->type = unixtype; req->protocol = protocol; req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; req->attributes = OBJ_INHERIT; @@ -5952,6 +5989,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, err = WSAEPROTONOSUPPORT; } +done: WARN("\t\tfailed, error %d!\n", err); SetLastError(err); return INVALID_SOCKET; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a9e6333..3921262 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1784,7 +1784,6 @@ static void test_WSASocket(void) ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); @@ -1811,10 +1810,21 @@ todo_wine ok(WSASocketA(0, -1, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, -1, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, 0, -1, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + SetLastError(0xdeadbeef); ok(WSASocketA(0, -1, -1, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); @@ -1824,7 +1834,6 @@ todo_wine ok(WSASocketA(-1, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); sock = WSASocketA(AF_INET, 0, IPPROTO_TCP, NULL, 0, 0); @@ -1835,14 +1844,12 @@ todo_wine ok(WSASocketA(0, SOCK_STREAM, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); SetLastError(0xdeadbeef); ok(WSASocketA(0, 0, 0xdead, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); SetLastError(0xdeadbeef); @@ -1855,7 +1862,6 @@ todo_wine ok(WSASocketA(0, 0xdead, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); sock = WSASocketA(0, 0, IPPROTO_TCP, NULL, 0, 0); @@ -1917,7 +1923,6 @@ todo_wine ok(WSASocketA(0, 0, IPPROTO_UDP, &pi[0], 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); pi[0].iProtocol = 0; @@ -1932,7 +1937,6 @@ todo_wine else { err = WSAGetLastError(); -todo_wine ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); }

1 0

Bruno Jesus : ws2_32: Auto detect the socket type and family based on the protocol.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 35e54fa59bf4b45abfa18e2323a590bc3c673498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e54fa59bf4b45abfa18e232… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 17 10:00:37 2013 -0300 ws2_32: Auto detect the socket type and family based on the protocol. --- dlls/ws2_32/socket.c | 31 ++++++++++++++++++------------- dlls/ws2_32/tests/sock.c | 13 ------------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 30c3c6c..1e2c44e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5894,24 +5894,29 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, protocol = lpProtocolInfo->iProtocol; } - /* convert the socket family and type */ - af = convert_af_w2u(af); - type = convert_socktype_w2u(type); - - if ( af == AF_UNSPEC) /* did they not specify the address family? */ + if (!type && (af || protocol)) { - if ((protocol == IPPROTO_TCP && type == SOCK_STREAM) || - (protocol == IPPROTO_UDP && type == SOCK_DGRAM)) - { - af = AF_INET; - } - else + WSAPROTOCOL_INFOW infow; + + /* default to the first valid protocol */ + if (!protocol) + protocol = valid_protocols[0]; + + if (WS_EnterSingleProtocolW(protocol, &infow)) { - SetLastError(WSAEPROTOTYPE); - return INVALID_SOCKET; + type = infow.iSocketType; + + /* after win2003 it's no longer possible to pass AF_UNSPEC + using the protocol info struct */ + if (!lpProtocolInfo && af == WS_AF_UNSPEC) + af = infow.iAddressFamily; } } + /* convert the socket family and type */ + af = convert_af_w2u(af); + type = convert_socktype_w2u(type); + SERVER_START_REQ( create_socket ) { req->family = af; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1f18869..a9e6333 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1788,7 +1788,6 @@ todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); @@ -1800,14 +1799,12 @@ todo_wine ok(WSASocketA(0, SOCK_STREAM, -1, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); SetLastError(0xdeadbeef); ok(WSASocketA(0, -1, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); SetLastError(0xdeadbeef); @@ -1821,7 +1818,6 @@ todo_wine ok(WSASocketA(0, -1, -1, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); SetLastError(0xdeadbeef); @@ -1832,7 +1828,6 @@ todo_wine ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); sock = WSASocketA(AF_INET, 0, IPPROTO_TCP, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); @@ -1864,7 +1859,6 @@ todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); sock = WSASocketA(0, 0, IPPROTO_TCP, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); @@ -1992,20 +1986,17 @@ todo_wine * from WSAEnumProtocols that has the flag PFL_MATCHES_PROTOCOL_ZERO * is returned */ sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); -todo_wine 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); -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; @@ -2019,14 +2010,12 @@ todo_wine for (i = 0; i < sizeof(autoprotocols) / sizeof(autoprotocols[0]); i++) { sock = WSASocketA(0, 0, autoprotocols[i], NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "Failed to create socket for protocol %d, received %d\n", autoprotocols[i], WSAGetLastError()); 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 (err = 1, j = 0; j < items; j++) @@ -2036,13 +2025,11 @@ todo_wine if (socktype == pi[j].iSocketType) err = 0; else -todo_wine ok(0, "Wrong socket type, expected %d received %d\n", pi[j].iSocketType, socktype); break; } } -todo_wine ok(!err, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); closesocket(sock);

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
65
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 September 2013