September 2013 - Wine-Commits

Piotr Caban : msvcrt: Don't forward strcmp to ntdll.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 1803016c088d4a801b6a3891cdf52ce4d1834809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1803016c088d4a801b6a3891c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:45:20 2013 +0200 msvcrt: Don't forward strcmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 79124c5..9c829d9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1419,7 +1419,7 @@ @ cdecl strcat(str str) ntdll.strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr -@ cdecl strcmp(str str) ntdll.strcmp +@ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) ntdll.strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 645cc03..43ebffa 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1642,6 +1642,14 @@ void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n) } /********************************************************************* + * strcmp (MSVCRT.@) + */ +int __cdecl MSVCRT_strcmp(const char *str1, const char *str2) +{ + return strcmp(str1, str2); +} + +/********************************************************************* * strncmp (MSVCRT.@) */ int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len)

1 0

Piotr Caban : msvcrt: Don't forward memmove to ntdll.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 5b1f7f85494fb6ad4c2e781558864bd9018641eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1f7f85494fb6ad4c2e78155… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:45:11 2013 +0200 msvcrt: Don't forward memmove to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 93c09ce..79124c5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1373,7 +1373,7 @@ @ cdecl memcmp(ptr ptr long) MSVCRT_memcmp @ cdecl memcpy(ptr ptr long) MSVCRT_memcpy @ cdecl memcpy_s(ptr long ptr long) -@ cdecl memmove(ptr ptr long) ntdll.memmove +@ cdecl memmove(ptr ptr long) MSVCRT_memmove @ cdecl memmove_s(ptr long ptr long) @ cdecl memset(ptr long long) MSVCRT_memset @ cdecl mktime(ptr) MSVCRT_mktime diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b6a51b6..645cc03 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1610,6 +1610,14 @@ void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) } /********************************************************************* + * memmove (MSVCRT.@) + */ +void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n) +{ + return memmove(dst, src, n); +} + +/********************************************************************* * memset (MSVCRT.@) */ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n)

1 0

Piotr Caban : msvcrt: Don't forward wcsstr to ntdll.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 882761f15d180c5b2185bbe2750c6d694f80a05b URL: http://source.winehq.org/git/wine.git/?a=commit;h=882761f15d180c5b2185bbe27… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:46:42 2013 +0200 msvcrt: Don't forward wcsstr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4d029bd..90bd7ff 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1501,7 +1501,7 @@ @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn -@ cdecl wcsstr(wstr wstr) ntdll.wcsstr +@ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a752f01..dca6a3d 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1856,3 +1856,11 @@ int CDECL MSVCRT_wcslen(const MSVCRT_wchar_t *str) { return strlenW(str); } + +/********************************************************************* + * wcsstr (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT_wcsstr(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *sub) +{ + return strstrW(str, sub); +}

1 0

Piotr Caban : msvcrt: Don't forward strncat to ntdll.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 31d92b926e448ce46e0e534286a62e5e3ce07a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d92b926e448ce46e0e53428… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:45:44 2013 +0200 msvcrt: Don't forward strncat to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7cbef2a..5445e3e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1428,7 +1428,7 @@ @ cdecl strerror_s(ptr long long) @ cdecl strftime(str long str ptr) MSVCRT_strftime @ cdecl strlen(str) MSVCRT_strlen -@ cdecl strncat(str str long) ntdll.strncat +@ cdecl strncat(str str long) MSVCRT_strncat @ cdecl strncat_s(str long str long) MSVCRT_strncat_s @ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncpy(ptr str long) MSVCRT_strncpy diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b59d604..677db63 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -677,6 +677,14 @@ int CDECL MSVCRT_strncat_s( char* dst, MSVCRT_size_t elem, const char* src, MSVC } /********************************************************************* + * strncat (MSVCRT.@) + */ +char* __cdecl MSVCRT_strncat(char *dst, const char *src, MSVCRT_size_t len) +{ + return strncat(dst, src, len); +} + +/********************************************************************* * strxfrm (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_strxfrm( char *dest, const char *src, MSVCRT_size_t len )

1 0

Bruno Jesus : ws2_32: Filter invalid socket parameters and return the appropriate error.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

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 Sept. 17, 2013

Sept. 17, 2013

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

Bruno Jesus : ws2_32: Use the struct information when the parameters are zero in WSASocket.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 8e29fcddb92b5a37092f74c388072f8196db3649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e29fcddb92b5a37092f74c38… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 17 10:00:24 2013 -0300 ws2_32: Use the struct information when the parameters are zero in WSASocket. --- dlls/ws2_32/socket.c | 14 +++++++------- dlls/ws2_32/tests/sock.c | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4750656..30c3c6c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5884,20 +5884,20 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return ret; } - /* convert the socket family and type */ - af = convert_af_w2u(af); - type = convert_socktype_w2u(type); - if (lpProtocolInfo) { - if (af == FROM_PROTOCOL_INFO) + if (af == FROM_PROTOCOL_INFO || !af) af = lpProtocolInfo->iAddressFamily; - if (type == FROM_PROTOCOL_INFO) + if (type == FROM_PROTOCOL_INFO || !type) type = lpProtocolInfo->iSocketType; - if (protocol == FROM_PROTOCOL_INFO) + if (protocol == FROM_PROTOCOL_INFO || !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 ((protocol == IPPROTO_TCP && type == SOCK_STREAM) || diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 70269b4..1f18869 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1946,7 +1946,6 @@ todo_wine pi[0].iSocketType = SOCK_DGRAM; pi[0].iAddressFamily = AF_INET; sock = WSASocketA(0, 0, 0, &pi[0], 0, 0); -todo_wine { ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); size = sizeof(socktype); @@ -1956,7 +1955,7 @@ todo_wine { ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", SOCK_DGRAM, socktype); closesocket(sock); -} + sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError());

1 0

Piotr Caban : msvcrt: Don't forward wcslen to ntdll.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: a89f72635543924ff8d2ec50cd4e0ff426130347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89f72635543924ff8d2ec50c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:46:30 2013 +0200 msvcrt: Don't forward wcslen to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5c3216c..4d029bd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1489,7 +1489,7 @@ @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime -@ cdecl wcslen(wstr) ntdll.wcslen +@ cdecl wcslen(wstr) MSVCRT_wcslen @ cdecl wcsncat(wstr wstr long) ntdll.wcsncat @ cdecl wcsncat_s(wstr long wstr long) MSVCRT_wcsncat_s @ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 8b64e4b..a752f01 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1848,3 +1848,11 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch { return strchrW(str, ch); } + +/*********************************************************************** + * wcslen (MSVCRT.@) + */ +int CDECL MSVCRT_wcslen(const MSVCRT_wchar_t *str) +{ + return strlenW(str); +}

1 0

Piotr Caban : msvcrt: Don't forward wcschr to ntdll.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 300c0123728cbb5cdc91b9598843d9aff6c4b857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300c0123728cbb5cdc91b9598… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:46:17 2013 +0200 msvcrt: Don't forward wcschr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4de1722..5c3216c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1482,7 +1482,7 @@ # stub wcrtomb_s(ptr ptr long long ptr) @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s -@ cdecl wcschr(wstr long) ntdll.wcschr +@ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) ntdll.wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5f47ee5..8b64e4b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1840,3 +1840,11 @@ int CDECL MSVCRT_towlower(MSVCRT_wint_t c) { return MSVCRT__towlower_l(c, NULL); } + +/********************************************************************* + * wcschr (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch) +{ + return strchrW(str, ch); +}

1 0

Piotr Caban : msvcrt: Don't forward strlen to ntdll.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: f0ec9b134a314b60315575f34b67d4fe1bbc6eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ec9b134a314b60315575f34… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:45:29 2013 +0200 msvcrt: Don't forward strlen to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9c829d9..7cbef2a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1427,7 +1427,7 @@ @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) @ cdecl strftime(str long str ptr) MSVCRT_strftime -@ cdecl strlen(str) ntdll.strlen +@ cdecl strlen(str) MSVCRT_strlen @ cdecl strncat(str str long) ntdll.strncat @ cdecl strncat_s(str long str long) MSVCRT_strncat_s @ cdecl strncmp(str str long) MSVCRT_strncmp diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 43ebffa..b59d604 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -781,6 +781,14 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) return ret; } +/********************************************************************* + * strlen (MSVCRT.@) + */ +MSVCRT_size_t __cdecl MSVCRT_strlen(const char *str) +{ + return strlen(str); +} + /****************************************************************** * strnlen (MSVCRT.@) */

1 0