Ros-diffs

ros-diffs@reactos.org

81390 discussions

[phater] 74653: [WS2_32_APITESTS] Remove compile warning disable for GCC. Thanks Thomas. ROSTESTS-278
by phater＠svn.reactos.org 25 May '17

25 May '17

Author: phater Date: Thu May 25 15:12:40 2017 New Revision: 74653 URL: http://svn.reactos.org/svn/reactos?rev=74653&view=rev Log: [WS2_32_APITESTS] Remove compile warning disable for GCC. Thanks Thomas. ROSTESTS-278 Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/bind.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Thu May 25 15:12:40 2017 @@ -22,7 +22,3 @@ set_module_type(ws2_32_apitest win32cui) add_importlibs(ws2_32_apitest ws2_32 msvcrt iphlpapi kernel32 ntdll) add_rostests_file(TARGET ws2_32_apitest) - -if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) - add_target_compile_flags(ws2_32_apitest "-Wno-missing-braces") -endif() Modified: trunk/rostests/apitests/ws2_32/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/bind.c?re… ============================================================================== --- trunk/rostests/apitests/ws2_32/bind.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/bind.c [iso-8859-1] Thu May 25 15:12:40 2017 @@ -34,22 +34,22 @@ struct sockaddr_in ExpectedAddr; } Tests[] = { - { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, { 0x7f, 0x00, 0x00, 0x01 } }, 0, 0, { AF_INET, PORT, { 0x7f, 0x00, 0x00, 0x01 } } }, - { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, { 0x00, 0x00, 0x00, 0x00 } }, 0, 0, { AF_INET, PORT, { 0x00, 0x00, 0x00, 0x00 } } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, {{{ 0x7f, 0x00, 0x00, 0x01 }}} }, 0, 0, { AF_INET, PORT, {{{ 0x7f, 0x00, 0x00, 0x01 }}} } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, {{{ 0x00, 0x00, 0x00, 0x00 }}} }, 0, 0, { AF_INET, PORT, {{{ 0x00, 0x00, 0x00, 0x00 }}} } }, { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, Address }, 0, 0, { AF_INET, PORT, Address } }, - { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, { 0xff, 0xff, 0xff, 0xff } }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, - { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, { 0x7f, 0x00, 0x00, 0x01 } }, 0, 0, { AF_INET, 0, { 0x7f, 0x00, 0x00, 0x01 } } }, - { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, { 0x00, 0x00, 0x00, 0x00 } } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, {{{ 0xff, 0xff, 0xff, 0xff }}} }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, {{{ 0x7f, 0x00, 0x00, 0x01 }}} }, 0, 0, { AF_INET, 0, {{{ 0x7f, 0x00, 0x00, 0x01 }}} } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, {{{ 0x00, 0x00, 0x00, 0x00 }}} } }, { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, Address }, 0, 0, { AF_INET, 0, Address } }, - { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, { 0xff, 0xff, 0xff, 0xff } }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, - { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, { 0x7f, 0x00, 0x00, 0x01 } }, 0, 0, { AF_INET, PORT, { 0x7f, 0x00, 0x00, 0x01 } } }, - { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, { 0x00, 0x00, 0x00, 0x00 } }, 0, 0, { AF_INET, PORT, { 0x00, 0x00, 0x00, 0x00 } } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, {{{ 0xff, 0xff, 0xff, 0xff }}} }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, {{{ 0x7f, 0x00, 0x00, 0x01 }}} }, 0, 0, { AF_INET, PORT, {{{ 0x7f, 0x00, 0x00, 0x01 }}} } }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, {{{ 0x00, 0x00, 0x00, 0x00 }}} }, 0, 0, { AF_INET, PORT, {{{ 0x00, 0x00, 0x00, 0x00 }}} } }, { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, Address }, 0, 0, { AF_INET, PORT, Address } }, - { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, { 0xff, 0xff, 0xff, 0xff } }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, - { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, { 0x7f, 0x00, 0x00, 0x01 } }, 0, 0, { AF_INET, 0, { 0x7f, 0x00, 0x00, 0x01 } } }, - { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, { 0x00, 0x00, 0x00, 0x00 } } }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, {{{ 0xff, 0xff, 0xff, 0xff }}} }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, {{{ 0x7f, 0x00, 0x00, 0x01 }}} }, 0, 0, { AF_INET, 0, {{{ 0x7f, 0x00, 0x00, 0x01 }}} } }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, {{{ 0x00, 0x00, 0x00, 0x00 }}} } }, { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, Address }, 0, 0,{ AF_INET, 0, Address } }, - { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, { 0xff, 0xff, 0xff, 0xff } }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, {{{ 0xff, 0xff, 0xff, 0xff }}} }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, }; const INT TestCount = _countof(Tests); INT i, AddrSize;

1 0

[phater] 74652: [WS2_32] Dereference socket in case of parameter check failure. Thanks Thomas. ROSTEST-278
by phater＠svn.reactos.org 25 May '17

25 May '17

Author: phater Date: Thu May 25 14:51:16 2017 New Revision: 74652 URL: http://svn.reactos.org/svn/reactos?rev=74652&view=rev Log: [WS2_32] Dereference socket in case of parameter check failure. Thanks Thomas. ROSTEST-278 Modified: trunk/reactos/dll/win32/ws2_32/src/sockctrl.c trunk/reactos/dll/win32/ws2_32/src/socklife.c Modified: trunk/reactos/dll/win32/ws2_32/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/sockc… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/sockctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/sockctrl.c [iso-8859-1] Thu May 25 14:51:16 2017 @@ -236,6 +236,9 @@ } else { + /* Deference the Socket Context */ + WsSockDereference(Socket); + /* name or namelen not valid */ ErrorCode = WSAEFAULT; } Modified: trunk/reactos/dll/win32/ws2_32/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/sockl… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/socklife.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/socklife.c [iso-8859-1] Thu May 25 14:51:16 2017 @@ -66,6 +66,9 @@ } else { + /* Deference the Socket Context */ + WsSockDereference(Socket); + /* name or namelen not valid */ ErrorCode = WSAEFAULT; }

1 0

[phater] 74651: [WS2_32_APITESTS] Add some bind API tests
by phater＠svn.reactos.org 25 May '17

25 May '17

Author: phater Date: Thu May 25 14:43:57 2017 New Revision: 74651 URL: http://svn.reactos.org/svn/reactos?rev=74651&view=rev Log: [WS2_32_APITESTS] Add some bind API tests Added: trunk/rostests/apitests/ws2_32/bind.c (with props) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/testlist.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Thu May 25 14:43:57 2017 @@ -1,5 +1,6 @@ list(APPEND SOURCE + bind.c getaddrinfo.c getnameinfo.c getservbyname.c @@ -21,3 +22,7 @@ set_module_type(ws2_32_apitest win32cui) add_importlibs(ws2_32_apitest ws2_32 msvcrt iphlpapi kernel32 ntdll) add_rostests_file(TARGET ws2_32_apitest) + +if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) + add_target_compile_flags(ws2_32_apitest "-Wno-missing-braces") +endif() Added: trunk/rostests/apitests/ws2_32/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/bind.c?re… ============================================================================== --- trunk/rostests/apitests/ws2_32/bind.c (added) +++ trunk/rostests/apitests/ws2_32/bind.c [iso-8859-1] Thu May 25 14:43:57 2017 @@ -0,0 +1,237 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for bind + * PROGRAMMER: Peter Hater + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <ws2tcpip.h> +#include <ndk/umtypes.h> + +CHAR LocalAddress[sizeof("255.255.255.255")]; +#define PORT 58888 + +static +VOID +TestBind(IN_ADDR Address) +{ + int Error; + struct + { + INT Type; + INT Proto; + struct sockaddr_in Addr; + INT ExpectedResult; + INT ExpectedWSAResult; + struct sockaddr_in ExpectedAddr; + } Tests[] = + { + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, { 0x7f, 0x00, 0x00, 0x01 } }, 0, 0, { AF_INET, PORT, { 0x7f, 0x00, 0x00, 0x01 } } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, { 0x00, 0x00, 0x00, 0x00 } }, 0, 0, { AF_INET, PORT, { 0x00, 0x00, 0x00, 0x00 } } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, Address }, 0, 0, { AF_INET, PORT, Address } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, PORT, { 0xff, 0xff, 0xff, 0xff } }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, { 0x7f, 0x00, 0x00, 0x01 } }, 0, 0, { AF_INET, 0, { 0x7f, 0x00, 0x00, 0x01 } } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, { 0x00, 0x00, 0x00, 0x00 } } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, Address }, 0, 0, { AF_INET, 0, Address } }, + { SOCK_STREAM, IPPROTO_TCP, { AF_INET, 0, { 0xff, 0xff, 0xff, 0xff } }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, { 0x7f, 0x00, 0x00, 0x01 } }, 0, 0, { AF_INET, PORT, { 0x7f, 0x00, 0x00, 0x01 } } }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, { 0x00, 0x00, 0x00, 0x00 } }, 0, 0, { AF_INET, PORT, { 0x00, 0x00, 0x00, 0x00 } } }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, Address }, 0, 0, { AF_INET, PORT, Address } }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, PORT, { 0xff, 0xff, 0xff, 0xff } }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, { 0x7f, 0x00, 0x00, 0x01 } }, 0, 0, { AF_INET, 0, { 0x7f, 0x00, 0x00, 0x01 } } }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, { 0x00, 0x00, 0x00, 0x00 } } }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, Address }, 0, 0,{ AF_INET, 0, Address } }, + { SOCK_DGRAM, IPPROTO_UDP, { AF_INET, 0, { 0xff, 0xff, 0xff, 0xff } }, SOCKET_ERROR, WSAEADDRNOTAVAIL }, + }; + const INT TestCount = _countof(Tests); + INT i, AddrSize; + SOCKET Socket; + struct sockaddr_in Addr; +#if 0 + BOOL Broadcast = FALSE; +#endif + + for (i = 0; i < TestCount; i++) + { + trace("%d: %s %d.%d.%d.%d:%d\n", i, Tests[i].Type == SOCK_STREAM ? "TCP" : "UDP", Tests[i].Addr.sin_addr.S_un.S_un_b.s_b1, Tests[i].Addr.sin_addr.S_un.S_un_b.s_b2, Tests[i].Addr.sin_addr.S_un.S_un_b.s_b3, Tests[i].Addr.sin_addr.S_un.S_un_b.s_b4, Tests[i].ExpectedAddr.sin_port); + Socket = socket(AF_INET, Tests[i].Type, Tests[i].Proto); + if (Socket == INVALID_SOCKET) + { + skip("Failed to create socket, skipping"); + continue; + } + Error = bind(Socket, (const struct sockaddr *) &Tests[i].Addr, sizeof(Tests[i].Addr)); + ok_dec(Error, Tests[i].ExpectedResult); + if (Error) + { + ok_dec(WSAGetLastError(), Tests[i].ExpectedWSAResult); + } + else + { + ok_dec(WSAGetLastError(), 0); + Error = getsockname(Socket, (struct sockaddr *) &Addr, &AddrSize); + ok(Error == 0, "Error getsockname for test %d, Error %d\n", i, Error); + ok_dec(WSAGetLastError(), 0); + ok_dec(AddrSize, sizeof(Addr)); + ok_dec(Addr.sin_addr.s_addr, Tests[i].ExpectedAddr.sin_addr.s_addr); + if (Tests[i].ExpectedAddr.sin_port) + { + ok_dec(Addr.sin_port, Tests[i].ExpectedAddr.sin_port); + } + else + { + ok(Addr.sin_port != 0, "Port remained zero\n"); + } + } + Error = closesocket(Socket); + ok_dec(Error, 0); + } +#if 0 + /* Check double bind */ + Socket = socket(AF_INET, Tests[0].Type, Tests[0].Proto); + Error = bind(Socket, (const struct sockaddr *) &Tests[0].Addr, sizeof(Tests[0].Addr)); + ok_dec(Error, Tests[0].ExpectedResult); + if (Error) + { + ok_dec(WSAGetLastError(), Tests[0].ExpectedWSAResult); + } + else + { + ok_dec(WSAGetLastError(), 0); + Error = getsockname(Socket, (struct sockaddr *) &Addr, &AddrSize); + ok_dec(Error, 0); + ok_dec(AddrSize, sizeof(Addr)); + ok_dec(Addr.sin_addr.s_addr, Tests[0].ExpectedAddr.sin_addr.s_addr); + if (Tests[0].ExpectedAddr.sin_port) + { + ok_dec(Addr.sin_port, Tests[0].ExpectedAddr.sin_port); + } + else + { + ok(Addr.sin_port != 0, "Port remained zero\n"); + } + Error = bind(Socket, (const struct sockaddr *) &Tests[2].Addr, sizeof(Tests[2].Addr)); + ok_dec(Error, SOCKET_ERROR); + ok_dec(WSAGetLastError(), WSAEINVAL); + } + closesocket(Socket); + /* Check disabled SO_BROADCAST and bind to broadcast address */ + Socket = socket(AF_INET, Tests[10].Type, Tests[10].Proto); + Error = setsockopt(Socket, SOL_SOCKET, SO_BROADCAST, (const char *) &Broadcast, sizeof(Broadcast)); + ok_dec(Error, 0); + // FIXME: should be made properly broadcast address + Tests[10].Addr.sin_addr.S_un.S_un_b.s_b4 = 0xff; + Error = bind(Socket, (const struct sockaddr *) &Tests[10].Addr, sizeof(Tests[10].Addr)); + ok_dec(Error, SOCKET_ERROR); + ok_dec(WSAGetLastError(), WSAEACCES); + closesocket(Socket); +#endif +} + +START_TEST(bind) +{ + WSADATA WsaData; + int Error; + CHAR LocalHostName[128]; + struct hostent *Hostent; + IN_ADDR Address; + SOCKET Socket; + struct sockaddr_in Addr = { AF_INET }; + + /* not yet initialized */ + StartSeh() + Error = bind(INVALID_SOCKET, NULL, 0); + ok_dec(Error, -1); + EndSeh(STATUS_SUCCESS); + StartSeh() + Error = bind(INVALID_SOCKET, InvalidPointer, 0); + ok_dec(Error, -1); + EndSeh(STATUS_SUCCESS); + + Error = WSAStartup(MAKEWORD(2, 2), &WsaData); + ok_dec(Error, 0); + + /* initialize LocalAddress for tests */ + Error = gethostname(LocalHostName, sizeof(LocalHostName)); + ok_dec(Error, 0); + ok_dec(WSAGetLastError(), 0); + trace("Local host name is '%s'\n", LocalHostName); + Hostent = gethostbyname(LocalHostName); + ok(Hostent != NULL, "gethostbyname failed with %d\n", WSAGetLastError()); + if (Hostent && Hostent->h_addr_list[0] && Hostent->h_length == sizeof(IN_ADDR)) + { + memcpy(&Address, Hostent->h_addr_list[0], sizeof(Address)); + strcpy(LocalAddress, inet_ntoa(Address)); + } + trace("Local address is '%s'\n", LocalAddress); + ok(LocalAddress[0] != '\0', + "Could not determine local address. Following test results may be wrong.\n"); + + /* parameter tests */ + StartSeh() + Error = bind(INVALID_SOCKET, NULL, 0); + ok_dec(Error, SOCKET_ERROR); + ok_dec(WSAGetLastError(), WSAENOTSOCK); + EndSeh(STATUS_SUCCESS); + StartSeh() + Error = bind(INVALID_SOCKET, InvalidPointer, 0); + ok_dec(Error, SOCKET_ERROR); + ok_dec(WSAGetLastError(), WSAENOTSOCK); + EndSeh(STATUS_SUCCESS); + StartSeh() + Socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + Error = bind(Socket, NULL, 0); + ok_dec(Error, SOCKET_ERROR); + ok_dec(WSAGetLastError(), WSAEFAULT); + closesocket(Socket); + EndSeh(STATUS_SUCCESS); + StartSeh() + Socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + Error = bind(Socket, InvalidPointer, 0); + ok_dec(Error, SOCKET_ERROR); + ok_dec(WSAGetLastError(), WSAEFAULT); + closesocket(Socket); + EndSeh(STATUS_SUCCESS); + StartSeh() + Socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + Error = bind(Socket, NULL, sizeof(Addr)); + ok_dec(Error, SOCKET_ERROR); + ok_dec(WSAGetLastError(), WSAEFAULT); + closesocket(Socket); + EndSeh(STATUS_SUCCESS); + StartSeh() + Socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + Error = bind(Socket, InvalidPointer, sizeof(Addr)); + ok_dec(Error, SOCKET_ERROR); + ok_dec(WSAGetLastError(), WSAEFAULT); + closesocket(Socket); + EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() + Socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + Error = bind(Socket, (const struct sockaddr *) &Addr, 0); + ok_dec(Error, SOCKET_ERROR); + ok_dec(WSAGetLastError(), WSAEFAULT); + closesocket(Socket); + EndSeh(STATUS_SUCCESS); + StartSeh() + Socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + Error = bind(Socket, (const struct sockaddr *) &Addr, sizeof(Addr)-1); + ok_dec(Error, SOCKET_ERROR); + ok_dec(WSAGetLastError(), WSAEFAULT); + closesocket(Socket); + EndSeh(STATUS_SUCCESS); + + TestBind(Address); + /* TODO: test IPv6 */ + + Error = WSACleanup(); + ok_dec(Error, 0); +} Propchange: trunk/rostests/apitests/ws2_32/bind.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Thu May 25 14:43:57 2017 @@ -3,6 +3,7 @@ #define STANDALONE #include <apitest.h> +extern void func_bind(void); extern void func_getaddrinfo(void); extern void func_getnameinfo(void); extern void func_getservbyname(void); @@ -19,6 +20,7 @@ const struct test winetest_testlist[] = { + { "bind", func_bind }, { "getaddrinfo", func_getaddrinfo }, { "getnameinfo", func_getnameinfo }, { "getservbyname", func_getservbyname },

1 0

[phater] 74650: [WS2_32] Add some parameters check for getsockname. Use value size for size check instead of type in bind. ROSTEST-278
by phater＠svn.reactos.org 25 May '17

25 May '17

Author: phater Date: Thu May 25 14:42:24 2017 New Revision: 74650 URL: http://svn.reactos.org/svn/reactos?rev=74650&view=rev Log: [WS2_32] Add some parameters check for getsockname. Use value size for size check instead of type in bind. ROSTEST-278 Modified: trunk/reactos/dll/win32/ws2_32/src/sockctrl.c trunk/reactos/dll/win32/ws2_32/src/socklife.c Modified: trunk/reactos/dll/win32/ws2_32/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/sockc… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/sockctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/sockctrl.c [iso-8859-1] Thu May 25 14:42:24 2017 @@ -217,20 +217,28 @@ /* Get the Socket Context */ if ((Socket = WsSockGetSocket(s))) { - /* Make the call */ - Status = Socket->Provider->Service.lpWSPGetSockName(s, - name, - namelen, - &ErrorCode); - - /* Deference the Socket Context */ - WsSockDereference(Socket); - - /* Return Provider Value */ - if (Status == ERROR_SUCCESS) return Status; - - /* If everything seemed fine, then the WSP call failed itself */ - if (ErrorCode == NO_ERROR) ErrorCode = WSASYSCALLFAILURE; + if (name && namelen && (*namelen >= sizeof(*name))) + { + /* Make the call */ + Status = Socket->Provider->Service.lpWSPGetSockName(s, + name, + namelen, + &ErrorCode); + + /* Deference the Socket Context */ + WsSockDereference(Socket); + + /* Return Provider Value */ + if (Status == ERROR_SUCCESS) return Status; + + /* If everything seemed fine, then the WSP call failed itself */ + if (ErrorCode == NO_ERROR) ErrorCode = WSASYSCALLFAILURE; + } + else + { + /* name or namelen not valid */ + ErrorCode = WSAEFAULT; + } } else { Modified: trunk/reactos/dll/win32/ws2_32/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/sockl… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/socklife.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/socklife.c [iso-8859-1] Thu May 25 14:42:24 2017 @@ -48,7 +48,7 @@ /* Get the Socket Context */ if ((Socket = WsSockGetSocket(s))) { - if (name && (namelen >= sizeof(struct sockaddr))) + if (name && (namelen >= sizeof(*name))) { /* Make the call */ Status = Socket->Provider->Service.lpWSPBind(s,

1 0

[phater] 74649: [WS2_32] Perform parameters check on bind. ROSTESTS-278
by phater＠svn.reactos.org 25 May '17

25 May '17

Author: phater Date: Thu May 25 12:34:33 2017 New Revision: 74649 URL: http://svn.reactos.org/svn/reactos?rev=74649&view=rev Log: [WS2_32] Perform parameters check on bind. ROSTESTS-278 Modified: trunk/reactos/dll/win32/ws2_32/src/socklife.c Modified: trunk/reactos/dll/win32/ws2_32/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/sockl… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/socklife.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/socklife.c [iso-8859-1] Thu May 25 12:34:33 2017 @@ -48,19 +48,27 @@ /* Get the Socket Context */ if ((Socket = WsSockGetSocket(s))) { - /* Make the call */ - Status = Socket->Provider->Service.lpWSPBind(s, - name, - namelen, - &ErrorCode); - /* Deference the Socket Context */ - WsSockDereference(Socket); - - /* Return Provider Value */ - if (Status == ERROR_SUCCESS) return Status; - - /* If everything seemed fine, then the WSP call failed itself */ - if (ErrorCode == NO_ERROR) ErrorCode = WSASYSCALLFAILURE; + if (name && (namelen >= sizeof(struct sockaddr))) + { + /* Make the call */ + Status = Socket->Provider->Service.lpWSPBind(s, + name, + namelen, + &ErrorCode); + /* Deference the Socket Context */ + WsSockDereference(Socket); + + /* Return Provider Value */ + if (Status == ERROR_SUCCESS) return Status; + + /* If everything seemed fine, then the WSP call failed itself */ + if (ErrorCode == NO_ERROR) ErrorCode = WSASYSCALLFAILURE; + } + else + { + /* name or namelen not valid */ + ErrorCode = WSAEFAULT; + } } else {

1 0

[cfinck] 74648: Create a branch for the USBXHCI driver for USB 3.x controllers GSoC 2017 project
by cfinck＠svn.reactos.org 25 May '17

25 May '17

Author: cfinck Date: Thu May 25 08:53:34 2017 New Revision: 74648 URL: http://svn.reactos.org/svn/reactos?rev=74648&view=rev Log: Create a branch for the USBXHCI driver for USB 3.x controllers GSoC 2017 project Added: branches/GSoC_2017/usbxhci/ (props changed) - copied from r74647, trunk/ Propchange: branches/GSoC_2017/usbxhci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu May 25 08:53:34 2017 @@ -0,0 +1 @@ +/branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595

1 0

[cfinck] 74647: Create a branch for the Taskbar Shell Extensions for ReactOS GSoC 2017 project
by cfinck＠svn.reactos.org 25 May '17

25 May '17

Author: cfinck Date: Thu May 25 08:52:48 2017 New Revision: 74647 URL: http://svn.reactos.org/svn/reactos?rev=74647&view=rev Log: Create a branch for the Taskbar Shell Extensions for ReactOS GSoC 2017 project Added: branches/GSoC_2017/shellext/ (props changed) - copied from r74646, trunk/ Propchange: branches/GSoC_2017/shellext/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu May 25 08:52:48 2017 @@ -0,0 +1 @@ +/branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595

1 0

[cfinck] 74646: Create a branch for the ReactOS App Manager GSoC 2017 project
by cfinck＠svn.reactos.org 25 May '17

25 May '17

Author: cfinck Date: Thu May 25 08:51:53 2017 New Revision: 74646 URL: http://svn.reactos.org/svn/reactos?rev=74646&view=rev Log: Create a branch for the ReactOS App Manager GSoC 2017 project Added: branches/GSoC_2017/rapps/ (props changed) - copied from r74645, trunk/ Propchange: branches/GSoC_2017/rapps/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu May 25 08:51:53 2017 @@ -0,0 +1 @@ +/branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595

1 0

[cfinck] 74645: Create a folder for the GSoC 2017 branches
by cfinck＠svn.reactos.org 25 May '17

25 May '17

Author: cfinck Date: Thu May 25 08:23:09 2017 New Revision: 74645 URL: http://svn.reactos.org/svn/reactos?rev=74645&view=rev Log: Create a folder for the GSoC 2017 branches Added: branches/GSoC_2017/

1 0

[hbelusca] 74644: Code styling: [NDK]: Make a #define value look less "magical". [ARC]: Write "BaseDllName" using the regular case used in other parts of ReactOS' code.
by hbelusca＠svn.reactos.org 24 May '17

24 May '17

Author: hbelusca Date: Wed May 24 23:52:56 2017 New Revision: 74644 URL: http://svn.reactos.org/svn/reactos?rev=74644&view=rev Log: Code styling: [NDK]: Make a #define value look less "magical". [ARC]: Write "BaseDllName" using the regular case used in other parts of ReactOS' code. Modified: trunk/reactos/sdk/include/ndk/cmtypes.h trunk/reactos/sdk/include/reactos/arc/setupblk.h Modified: trunk/reactos/sdk/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/cmtypes.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/cmtypes.h [iso-8859-1] Wed May 24 23:52:56 2017 @@ -124,7 +124,7 @@ #define CM_BOOT_FLAG_SMSS 0x0000 #define CM_BOOT_FLAG_SETUP 0x0001 #define CM_BOOT_FLAG_ACCEPTED 0x0002 -#define CM_BOOT_FLAG_MAX 0x03E9 +#define CM_BOOT_FLAG_MAX (CM_BOOT_FLAG_ACCEPTED + 999) #ifdef NTOS_MODE_USER Modified: trunk/reactos/sdk/include/reactos/arc/setupblk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/arc/se… ============================================================================== --- trunk/reactos/sdk/include/reactos/arc/setupblk.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/arc/setupblk.h [iso-8859-1] Wed May 24 23:52:56 2017 @@ -73,7 +73,7 @@ BOOLEAN ThirdPartyOptionSelected; ULONG FileTypeBits; PDETECTED_DEVICE_FILE Files; - PCHAR BasedllName; + PCHAR BaseDllName; BOOLEAN MigratedDriver; PPNP_HARDWARE_ID HardwareIds; } DETECTED_DEVICE, *PDETECTED_DEVICE;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs