Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[pschweitzer] 74674: [RDBSS] [RXCE] [DDK] Add an initial implementation of the RXCE and RDBSS libraries that are used to implement mini-redirectors The associated headers are also added to DDK The ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 26 20:52:18 2017 New Revision: 74674 URL: http://svn.reactos.org/svn/reactos?rev=74674&view=rev Log: [RDBSS] [RXCE] [DDK] Add an initial implementation of the RXCE and RDBSS libraries that are used to implement mini-redirectors The associated headers are also added to DDK The implementation is partial (really!) and is only working for read-only operations. It leaks memory as hell (no refcounting implemented) and thus, objects freeing is not implemented. It was tested with NFS41 driver. With such RDBSS, it's possible for the driver to mount a remote share, to list files, to query their properties, to query volume properties, and finally to read files (with some corruption under specific conditions). Please refrain from committing in this (especially for modifying whitespaces or fixing comments...), this is still WIP and under development, it would mess with my local changes! In itself, it doesn't bring anything to ReactOS yet, as no mini redirector is available in ReactOS source tree. This may come later on with NFS41. More to follow... CORE-11327 Added: trunk/reactos/sdk/include/ddk/backpack.h (with props) trunk/reactos/sdk/include/ddk/buffring.h (with props) trunk/reactos/sdk/include/ddk/fcb.h (with props) trunk/reactos/sdk/include/ddk/fcbtable.h (with props) trunk/reactos/sdk/include/ddk/lowio.h (with props) trunk/reactos/sdk/include/ddk/mrx.h (with props) trunk/reactos/sdk/include/ddk/mrxfcb.h (with props) trunk/reactos/sdk/include/ddk/nodetype.h (with props) trunk/reactos/sdk/include/ddk/ntrxdef.h (with props) trunk/reactos/sdk/include/ddk/prefix.h (with props) trunk/reactos/sdk/include/ddk/rx.h (with props) trunk/reactos/sdk/include/ddk/rxcontx.h (with props) trunk/reactos/sdk/include/ddk/rxdata.h (with props) trunk/reactos/sdk/include/ddk/rxlog.h (with props) trunk/reactos/sdk/include/ddk/rxovride.h (with props) trunk/reactos/sdk/include/ddk/rxpooltg.h (with props) trunk/reactos/sdk/include/ddk/rxprocs.h (with props) trunk/reactos/sdk/include/ddk/rxstruc.h (with props) trunk/reactos/sdk/include/ddk/rxtimer.h (with props) trunk/reactos/sdk/include/ddk/rxtypes.h (with props) trunk/reactos/sdk/include/ddk/rxworkq.h (with props) trunk/reactos/sdk/include/ddk/scavengr.h (with props) trunk/reactos/sdk/include/ddk/struchdr.h (with props) trunk/reactos/sdk/lib/drivers/rdbsslib/ trunk/reactos/sdk/lib/drivers/rdbsslib/CMakeLists.txt (with props) trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c (with props) trunk/reactos/sdk/lib/drivers/rxce/ trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt (with props) trunk/reactos/sdk/lib/drivers/rxce/rxce.c (with props) Modified: trunk/reactos/sdk/lib/drivers/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/sdk/include/ddk/backpack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/backpack.h… Added: trunk/reactos/sdk/include/ddk/buffring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/buffring.h… Added: trunk/reactos/sdk/include/ddk/fcb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/fcb.h?rev=… Added: trunk/reactos/sdk/include/ddk/fcbtable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/fcbtable.h… Added: trunk/reactos/sdk/include/ddk/lowio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/lowio.h?re… Added: trunk/reactos/sdk/include/ddk/mrx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/mrx.h?rev=… Added: trunk/reactos/sdk/include/ddk/mrxfcb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/mrxfcb.h?r… Added: trunk/reactos/sdk/include/ddk/nodetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/nodetype.h… Added: trunk/reactos/sdk/include/ddk/ntrxdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/ntrxdef.h?… Added: trunk/reactos/sdk/include/ddk/prefix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/prefix.h?r… Added: trunk/reactos/sdk/include/ddk/rx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rx.h?rev=7… Added: trunk/reactos/sdk/include/ddk/rxcontx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxcontx.h?… Added: trunk/reactos/sdk/include/ddk/rxdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxdata.h?r… Added: trunk/reactos/sdk/include/ddk/rxlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxlog.h?re… Added: trunk/reactos/sdk/include/ddk/rxovride.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxovride.h… Added: trunk/reactos/sdk/include/ddk/rxpooltg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxpooltg.h… Added: trunk/reactos/sdk/include/ddk/rxprocs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxprocs.h?… Added: trunk/reactos/sdk/include/ddk/rxstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxstruc.h?… Added: trunk/reactos/sdk/include/ddk/rxtimer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxtimer.h?… Added: trunk/reactos/sdk/include/ddk/rxtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxtypes.h?… Added: trunk/reactos/sdk/include/ddk/rxworkq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxworkq.h?… Added: trunk/reactos/sdk/include/ddk/scavengr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/scavengr.h… Added: trunk/reactos/sdk/include/ddk/struchdr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/struchdr.h… Modified: trunk/reactos/sdk/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/CMakeLists… Added: trunk/reactos/sdk/lib/drivers/rdbsslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/C… Added: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/r… Added: trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/CMake… Added: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.…

7 years, 5 months

[phater] 74673: [MSAFD] Don't update shared state on close if we still have active references to the socket. Checked also by ws2_32:close API test CORE-12029

by phater＠svn.reactos.org

Author: phater Date: Fri May 26 15:27:45 2017 New Revision: 74673 URL: http://svn.reactos.org/svn/reactos?rev=74673&view=rev Log: [MSAFD] Don't update shared state on close if we still have active references to the socket. Checked also by ws2_32:close API test CORE-12029 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri May 26 15:27:45 2017 @@ -677,14 +677,15 @@ if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } - /* Set the state to close */ - OldState = Socket->SharedData->State; - Socket->SharedData->State = SocketClosed; /* Decrement reference count on SharedData */ References = InterlockedDecrement(&Socket->SharedData->RefCount); if (References) goto ok; + + /* Set the state to close */ + OldState = Socket->SharedData->State; + Socket->SharedData->State = SocketClosed; /* If SO_LINGER is ON and the Socket is connected, we need to disconnect */ /* FIXME: Should we do this on Datagram Sockets too? */

7 years, 5 months

[phater] 74672: [WS2_32_APITESTS] Add close tests ROSTESTS-279

by phater＠svn.reactos.org

Author: phater Date: Fri May 26 14:02:25 2017 New Revision: 74672 URL: http://svn.reactos.org/svn/reactos?rev=74672&view=rev Log: [WS2_32_APITESTS] Add close tests ROSTESTS-279 Added: trunk/rostests/apitests/ws2_32/close.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] Fri May 26 14:02:25 2017 @@ -1,6 +1,7 @@ list(APPEND SOURCE bind.c + close.c getaddrinfo.c getnameinfo.c getservbyname.c Added: trunk/rostests/apitests/ws2_32/close.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/close.c?r… ============================================================================== --- trunk/rostests/apitests/ws2_32/close.c (added) +++ trunk/rostests/apitests/ws2_32/close.c [iso-8859-1] Fri May 26 14:02:25 2017 @@ -0,0 +1,197 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for WSASocket + * PROGRAMMERS: Peter Hater + */ + +#include <apitest.h> + +#include <stdio.h> +#include <ntstatus.h> +#include <wine/winternl.h> +#include "ws2_32.h" + +void Test_CloseDuplicatedSocket() +{ + char szBuf[10]; + int err; + SOCKET sck, dup_sck; + WSAPROTOCOL_INFOW ProtocolInfo; + struct sockaddr_in to = { AF_INET, 2222, {{{ 0x7f, 0x00, 0x00, 0x01 }}} }; + + /* Create the socket */ + sck = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + if(sck == INVALID_SOCKET) + { + skip("socket failed %d. Aborting test.\n", WSAGetLastError()); + return; + } + + err = sendto(sck, szBuf, _countof(szBuf), 0, (struct sockaddr *)&to, sizeof(to)); + ok(err == _countof(szBuf), "sendto err = %d %d\n", err, WSAGetLastError()); + + err = WSADuplicateSocketW(sck, GetCurrentProcessId(), &ProtocolInfo); + ok(err == 0, "WSADuplicateSocketW err = %d %d\n", err, WSAGetLastError()); + + dup_sck = WSASocketW(0, 0, 0, &ProtocolInfo, 0, 0); + if (dup_sck == INVALID_SOCKET) + { + skip("WSASocketW failed %d. Aborting test.\n", WSAGetLastError()); + closesocket(sck); + return; + } + + err = sendto(dup_sck, szBuf, _countof(szBuf), 0, (struct sockaddr *)&to, sizeof(to)); + ok(err == _countof(szBuf), "sendto err = %d %d\n", err, WSAGetLastError()); + + err = closesocket(sck); + ok(err == 0, "closesocket sck err = %d %d\n", err, WSAGetLastError()); + + err = sendto(dup_sck, szBuf, _countof(szBuf), 0, (struct sockaddr *)&to, sizeof(to)); + ok(err == _countof(szBuf), "sendto err = %d %d\n", err, WSAGetLastError()); + + err = closesocket(dup_sck); + ok(err == 0, "closesocket dup_sck err = %d %d\n", err, WSAGetLastError()); + return; +} + +// 100 ms +#define TIMEOUT_SEC 0 +#define TIMEOUT_USEC 100000 + +// 250 ms +#define TIME_SLEEP1 250 + +#define THREAD_PROC_LOOPS 5 + +#define LISTEN_PORT 22222 +#define LISTEN_BACKLOG 5 + +DWORD WINAPI thread_proc(void* param) +{ + fd_set read, write, except; + struct timeval tval; + SOCKET sock = (SOCKET)param; + int i; + + tval.tv_sec = TIMEOUT_SEC; + tval.tv_usec = TIMEOUT_USEC; + + for (i = 0; i < THREAD_PROC_LOOPS; ++i) + { + FD_ZERO(&read); FD_ZERO(&write); FD_ZERO(&except); + // write will be empty + FD_SET(sock, &read); FD_SET(sock, &except); + + select(0, &read, &write, &except, &tval); + } + + return 0; +} + +void Test_CloseWhileSelectSameSocket() +{ + int err; + SOCKET sock; + struct sockaddr_in addrin; + HANDLE hthread; + + /* Create the socket */ + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (sock == INVALID_SOCKET) + { + skip("socket failed %d. Aborting test.\n", WSAGetLastError()); + return; + } + + memset(&addrin, 0, sizeof(struct sockaddr_in)); + addrin.sin_family = AF_INET; + addrin.sin_addr.s_addr = inet_addr("127.0.0.1"); + addrin.sin_port = htons(LISTEN_PORT); + + err = bind(sock, (struct sockaddr*)(&addrin), sizeof(struct sockaddr_in)); + ok(err == 0, "bind err = %d %d\n", err, WSAGetLastError()); + err = listen(sock, LISTEN_BACKLOG); + ok(err == 0, "listen err = %d %d\n", err, WSAGetLastError()); + + hthread = CreateThread(NULL, 0, thread_proc, (void*)sock, 0, NULL); + ok(hthread != NULL, "CreateThread %ld\n", GetLastError()); + + Sleep(TIME_SLEEP1); + err = closesocket(sock); + ok(err == 0, "closesocket err = %d %d\n", err, WSAGetLastError()); + + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + return; +} + +void Test_CloseWhileSelectDuplicatedSocket() +{ + int err; + SOCKET sock, dup_sock; + WSAPROTOCOL_INFOW ProtocolInfo; + struct sockaddr_in addrin; + HANDLE hthread; + + /* Create the socket */ + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (sock == INVALID_SOCKET) + { + skip("socket failed %d. Aborting test.\n", WSAGetLastError()); + return; + } + + memset(&addrin, 0, sizeof(struct sockaddr_in)); + addrin.sin_family = AF_INET; + addrin.sin_addr.s_addr = inet_addr("127.0.0.1"); + addrin.sin_port = htons(LISTEN_PORT); + + err = bind(sock, (struct sockaddr*)(&addrin), sizeof(struct sockaddr_in)); + ok(err == 0, "bind err = %d %d\n", err, WSAGetLastError()); + err = listen(sock, LISTEN_BACKLOG); + ok(err == 0, "listen err = %d %d\n", err, WSAGetLastError()); + + err = WSADuplicateSocketW(sock, GetCurrentProcessId(), &ProtocolInfo); + ok(err == 0, "WSADuplicateSocketW err = %d %d\n", err, WSAGetLastError()); + + dup_sock = WSASocketW(0, 0, 0, &ProtocolInfo, 0, 0); + if (dup_sock == INVALID_SOCKET) + { + skip("WSASocketW failed %d. Aborting test.\n", WSAGetLastError()); + closesocket(sock); + return; + } + + hthread = CreateThread(NULL, 0, thread_proc, (void*)dup_sock, 0, NULL); + ok(hthread != NULL, "CreateThread %ld\n", GetLastError()); + + err = closesocket(sock); + ok(err == 0, "closesocket err = %d %d\n", err, WSAGetLastError()); + + Sleep(TIME_SLEEP1); + err = closesocket(dup_sock); + ok(err == 0, "closesocket err = %d %d\n", err, WSAGetLastError()); + + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + return; +} + +START_TEST(close) +{ + int err; + WSADATA wdata; + + /* Start up Winsock */ + err = WSAStartup(MAKEWORD(2, 2), &wdata); + ok(err == 0, "WSAStartup failed, iResult == %d %d\n", err, WSAGetLastError()); + + Test_CloseDuplicatedSocket(); + Test_CloseWhileSelectSameSocket(); + Test_CloseWhileSelectDuplicatedSocket(); + + WSACleanup(); +} + Propchange: trunk/rostests/apitests/ws2_32/close.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] Fri May 26 14:02:25 2017 @@ -4,6 +4,7 @@ #include <apitest.h> extern void func_bind(void); +extern void func_close(void); extern void func_getaddrinfo(void); extern void func_getnameinfo(void); extern void func_getservbyname(void); @@ -21,6 +22,7 @@ const struct test winetest_testlist[] = { { "bind", func_bind }, + { "close", func_close }, { "getaddrinfo", func_getaddrinfo }, { "getnameinfo", func_getnameinfo }, { "getservbyname", func_getservbyname },

7 years, 5 months

[phater] 74671: [WS2_32_APITESTS] Fix broadcast test ROSTESTS-278

by phater＠svn.reactos.org

Author: phater Date: Fri May 26 14:00:47 2017 New Revision: 74671 URL: http://svn.reactos.org/svn/reactos?rev=74671&view=rev Log: [WS2_32_APITESTS] Fix broadcast test ROSTESTS-278 Modified: trunk/rostests/apitests/ws2_32/bind.c 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] Fri May 26 14:00:47 2017 @@ -74,11 +74,9 @@ } else { - ok(WSAGetLastError() == 0, "Unexpected error %d on bind for test %d\n", WSAGetLastError(), i); AddrSize = sizeof(Addr); Error = getsockname(Socket, (struct sockaddr *) &Addr, &AddrSize); - ok(Error == 0, "Unexpected error %d on getsockname for test %d\n", Error, i); - ok(WSAGetLastError() == 0, "Unexpected error %d on getsockname for test %d\n", WSAGetLastError(), i); + ok(Error == 0, "Unexpected error %d %d on getsockname for test %d\n", Error, WSAGetLastError(), i); ok(AddrSize == sizeof(Addr), "Returned size %d differs from expected %d for test %d\n", AddrSize, sizeof(Addr), i); ok(Addr.sin_addr.s_addr == Tests[i].ExpectedAddr.sin_addr.s_addr, "Expected address %lx differs from returned address %lx for test %d\n", Tests[i].ExpectedAddr.sin_addr.s_addr, Addr.sin_addr.s_addr, i); if (Tests[i].ExpectedAddr.sin_port) @@ -91,8 +89,7 @@ } } Error = closesocket(Socket); - ok(Error == 0, "Unexpected error %d on closesocket for test %d\n", Error, i); - ok(WSAGetLastError() == 0, "Unexpected wsa error %d on closesocket for test %d\n", WSAGetLastError(), i); + ok(Error == 0, "Unexpected error %d %d on closesocket for test %d\n", Error, WSAGetLastError(), i); } /* Check double bind */ Socket = socket(AF_INET, Tests[0].Type, Tests[0].Proto); @@ -105,11 +102,9 @@ } else { - ok(WSAGetLastError() == 0, "Unexpected error %d on bind for double bind test\n", WSAGetLastError()); AddrSize = sizeof(Addr); Error = getsockname(Socket, (struct sockaddr *) &Addr, &AddrSize); - ok(Error == 0, "Unexpected error %d on getsockname for double bind test\n", Error); - ok(WSAGetLastError() == 0, "Unexpected error %d on getsockname for double bind test\n", WSAGetLastError()); + ok(Error == 0, "Unexpected error %d %d on getsockname for double bind test\n", Error, WSAGetLastError()); ok(AddrSize == sizeof(Addr), "Returned size %d differs from expected %d for double bind test\n", AddrSize, sizeof(Addr)); ok(Addr.sin_addr.s_addr == Tests[0].ExpectedAddr.sin_addr.s_addr, "Expected address %lx differs from returned address %lx for double bind test\n", Tests[0].ExpectedAddr.sin_addr.s_addr, Addr.sin_addr.s_addr); if (Tests[0].ExpectedAddr.sin_port) @@ -121,24 +116,19 @@ ok(Addr.sin_port != 0, "Port remained zero for double bind test\n"); } Error = bind(Socket, (const struct sockaddr *) &Tests[2].Addr, sizeof(Tests[2].Addr)); - ok(Error == SOCKET_ERROR, "Unexpected result %d expected %d for double bind test\n", Error, SOCKET_ERROR); - ok(WSAGetLastError() == WSAEINVAL, "Unexpected wsa result %d expected %ld for double bind test\n", WSAGetLastError(), WSAEINVAL); + ok(Error == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "Unexpected result %d expected %d and wsa result %d expected %ld for double bind test\n", Error, SOCKET_ERROR, WSAGetLastError(), WSAEINVAL); } Error = closesocket(Socket); - ok(Error == 0, "Unexpected error %d on closesocket for double bind test\n", Error); - ok(WSAGetLastError() == 0, "Unexpected wsa error %d on closesocket for double bind test\n", WSAGetLastError()); + ok(Error == 0, "Unexpected error %d %d on closesocket for double bind test\n", Error, WSAGetLastError()); /* Check SO_BROADCAST and bind to broadcast address */ - Socket = socket(AF_INET, Tests[11].Type, Tests[11].Proto); + Socket = socket(AF_INET, Tests[10].Type, Tests[10].Proto); ok(Socket != INVALID_SOCKET, "Failed to create socket with error %d for broadcast test, next tests might be wrong\n", WSAGetLastError()); Error = setsockopt(Socket, SOL_SOCKET, SO_BROADCAST, (const char *) &Broadcast, sizeof(Broadcast)); - ok(Error == 0, "Unexpected error %d on setsockopt for broadcast test\n", Error); - ok(WSAGetLastError() == 0, "Unexpected wsa error %d on setsockopt for broadcast test\n", WSAGetLastError()); - Error = bind(Socket, (const struct sockaddr *) &Tests[11].Addr, sizeof(Tests[11].Addr)); - ok(Error == 0, "Unexpected error %d on bind for broadcast test\n", Error); - ok(WSAGetLastError() == 0, "Unexpected wsa error %d on bind for broadcast test\n", WSAGetLastError()); + ok(Error == 0, "Unexpected error %d %d on setsockopt for broadcast test\n", Error, WSAGetLastError()); + Error = bind(Socket, (const struct sockaddr *) &Tests[10].Addr, sizeof(Tests[10].Addr)); + ok(Error == 0, "Unexpected error %d %d on bind for broadcast test\n", Error, WSAGetLastError()); Error = closesocket(Socket); - ok(Error == 0, "Unexpected error %d on closesocket for broadcast test\n", Error); - ok(WSAGetLastError() == 0, "Unexpected wsa error %d on closesocket for broadcast test\n", WSAGetLastError()); + ok(Error == 0, "Unexpected error %d %d on closesocket for broadcast test\n", Error, WSAGetLastError()); } START_TEST(bind) @@ -218,7 +208,7 @@ ok_dec(Error, SOCKET_ERROR); ok_dec(WSAGetLastError(), WSAEFAULT); closesocket(Socket); - EndSeh(STATUS_ACCESS_VIOLATION); + EndSeh(STATUS_SUCCESS); StartSeh() Socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); Error = bind(Socket, (const struct sockaddr *) &Addr, 0);

7 years, 5 months

[phater] 74670: [WS2_32] Revert r74669

by phater＠svn.reactos.org

Author: phater Date: Fri May 26 13:44:01 2017 New Revision: 74670 URL: http://svn.reactos.org/svn/reactos?rev=74670&view=rev Log: [WS2_32] Revert r74669 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] Fri May 26 13:44:01 2017 @@ -59,11 +59,7 @@ WsSockDereference(Socket); /* Return Provider Value */ - if (Status == ERROR_SUCCESS) - { - SetLastError(ErrorCode); - return Status; - } + if (Status == ERROR_SUCCESS) return Status; /* If everything seemed fine, then the WSP call failed itself */ if (ErrorCode == NO_ERROR) ErrorCode = WSASYSCALLFAILURE; @@ -124,11 +120,7 @@ WsSockDereference(Socket); /* Return success if everything is OK */ - if (ErrorCode == ERROR_SUCCESS) - { - SetLastError(ErrorCode); - return ErrorCode; - } + if (ErrorCode == ERROR_SUCCESS) return ErrorCode; } } else @@ -355,7 +347,6 @@ } /* Return */ - SetLastError(ErrorCode); return Status; } } @@ -430,7 +421,6 @@ } /* Return */ - SetLastError(ErrorCode); return Status; } } @@ -592,7 +582,6 @@ { /* Add an API reference and return */ WsSockAddApiReference(Status); - SetLastError(ErrorCode); return Status; } }

7 years, 5 months

[phater] 74669: [WS2_32] Set last error on exit on some functions

by phater＠svn.reactos.org

Author: phater Date: Fri May 26 11:51:33 2017 New Revision: 74669 URL: http://svn.reactos.org/svn/reactos?rev=74669&view=rev Log: [WS2_32] Set last error on exit on some functions 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] Fri May 26 11:51:33 2017 @@ -59,7 +59,11 @@ WsSockDereference(Socket); /* Return Provider Value */ - if (Status == ERROR_SUCCESS) return Status; + if (Status == ERROR_SUCCESS) + { + SetLastError(ErrorCode); + return Status; + } /* If everything seemed fine, then the WSP call failed itself */ if (ErrorCode == NO_ERROR) ErrorCode = WSASYSCALLFAILURE; @@ -120,7 +124,11 @@ WsSockDereference(Socket); /* Return success if everything is OK */ - if (ErrorCode == ERROR_SUCCESS) return ErrorCode; + if (ErrorCode == ERROR_SUCCESS) + { + SetLastError(ErrorCode); + return ErrorCode; + } } } else @@ -347,6 +355,7 @@ } /* Return */ + SetLastError(ErrorCode); return Status; } } @@ -421,6 +430,7 @@ } /* Return */ + SetLastError(ErrorCode); return Status; } } @@ -582,6 +592,7 @@ { /* Add an API reference and return */ WsSockAddApiReference(Status); + SetLastError(ErrorCode); return Status; } }

7 years, 5 months

[phater] 74668: [MSAFD] Add some parameters check for WSPBind. Inspired by results of bind test

by phater＠svn.reactos.org

Author: phater Date: Fri May 26 10:32:01 2017 New Revision: 74668 URL: http://svn.reactos.org/svn/reactos?rev=74668&view=rev Log: [MSAFD] Add some parameters check for WSPBind. Inspired by results of bind test Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri May 26 10:32:01 2017 @@ -860,6 +860,27 @@ if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } + if (Socket->SharedData->State != SocketOpen) + { + if (lpErrno) *lpErrno = WSAEINVAL; + return SOCKET_ERROR; + } + if (!SocketAddress || SocketAddressLength < Socket->SharedData->SizeOfLocalAddress) + { + if (lpErrno) *lpErrno = WSAEINVAL; + return SOCKET_ERROR; + } + + /* Get Address Information */ + Socket->HelperData->WSHGetSockaddrType ((PSOCKADDR)SocketAddress, + SocketAddressLength, + &SocketInfo); + + if (SocketInfo.AddressInfo == SockaddrAddressInfoBroadcast && !Socket->SharedData->Broadcast) + { + if (lpErrno) *lpErrno = WSAEADDRNOTAVAIL; + return SOCKET_ERROR; + } Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, @@ -886,11 +907,6 @@ RtlCopyMemory (BindData->Address.Address[0].Address, SocketAddress->sa_data, SocketAddressLength - sizeof(SocketAddress->sa_family)); - - /* Get Address Information */ - Socket->HelperData->WSHGetSockaddrType ((PSOCKADDR)SocketAddress, - SocketAddressLength, - &SocketInfo); /* Set the Share Type */ if (Socket->SharedData->ExclusiveAddressUse)

7 years, 5 months

[phater] 74667: [WS2_32_APITESTS] Fix broadcast test ROSTESTS-278

by phater＠svn.reactos.org

Author: phater Date: Fri May 26 10:31:50 2017 New Revision: 74667 URL: http://svn.reactos.org/svn/reactos?rev=74667&view=rev Log: [WS2_32_APITESTS] Fix broadcast test ROSTESTS-278 Modified: trunk/rostests/apitests/ws2_32/bind.c 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] Fri May 26 10:31:50 2017 @@ -128,12 +128,12 @@ ok(Error == 0, "Unexpected error %d on closesocket for double bind test\n", Error); ok(WSAGetLastError() == 0, "Unexpected wsa error %d on closesocket for double bind test\n", WSAGetLastError()); /* Check SO_BROADCAST and bind to broadcast address */ - Socket = socket(AF_INET, Tests[10].Type, Tests[10].Proto); + Socket = socket(AF_INET, Tests[11].Type, Tests[11].Proto); ok(Socket != INVALID_SOCKET, "Failed to create socket with error %d for broadcast test, next tests might be wrong\n", WSAGetLastError()); Error = setsockopt(Socket, SOL_SOCKET, SO_BROADCAST, (const char *) &Broadcast, sizeof(Broadcast)); ok(Error == 0, "Unexpected error %d on setsockopt for broadcast test\n", Error); ok(WSAGetLastError() == 0, "Unexpected wsa error %d on setsockopt for broadcast test\n", WSAGetLastError()); - Error = bind(Socket, (const struct sockaddr *) &Tests[10].Addr, sizeof(Tests[10].Addr)); + Error = bind(Socket, (const struct sockaddr *) &Tests[11].Addr, sizeof(Tests[11].Addr)); ok(Error == 0, "Unexpected error %d on bind for broadcast test\n", Error); ok(WSAGetLastError() == 0, "Unexpected wsa error %d on bind for broadcast test\n", WSAGetLastError()); Error = closesocket(Socket);

7 years, 5 months

[phater] 74666: [WS2_32_APITESTS] Add rebind and bind to broadcast tests ROSTESTS-278

by phater＠svn.reactos.org

Author: phater Date: Fri May 26 09:02:08 2017 New Revision: 74666 URL: http://svn.reactos.org/svn/reactos?rev=74666&view=rev Log: [WS2_32_APITESTS] Add rebind and bind to broadcast tests ROSTESTS-278 Modified: trunk/rostests/apitests/ws2_32/bind.c 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] Fri May 26 09:02:08 2017 @@ -55,9 +55,7 @@ INT i, AddrSize; SOCKET Socket; struct sockaddr_in Addr; -#if 0 - BOOL Broadcast = FALSE; -#endif + BOOL Broadcast = TRUE; for (i = 0; i < TestCount; i++) { @@ -94,48 +92,53 @@ } Error = closesocket(Socket); ok(Error == 0, "Unexpected error %d on closesocket for test %d\n", Error, i); - ok(WSAGetLastError() == 0, "Unexpected error %d on closesocket for test %d\n", WSAGetLastError(), i); - } -#if 0 + ok(WSAGetLastError() == 0, "Unexpected wsa error %d on closesocket for test %d\n", WSAGetLastError(), i); + } /* Check double bind */ Socket = socket(AF_INET, Tests[0].Type, Tests[0].Proto); + ok(Socket != INVALID_SOCKET, "Failed to create socket with error %d for double bind test, next tests might be wrong\n", WSAGetLastError()); Error = bind(Socket, (const struct sockaddr *) &Tests[0].Addr, sizeof(Tests[0].Addr)); - ok_dec(Error, Tests[0].ExpectedResult); + ok(Error == Tests[0].ExpectedResult, "Error %d differs from expected %d for double bind test\n", Error, Tests[0].ExpectedResult); if (Error) { - ok_dec(WSAGetLastError(), Tests[0].ExpectedWSAResult); + ok(WSAGetLastError() == Tests[i].ExpectedWSAResult, "Error %d differs from expected %d for double bind test\n", WSAGetLastError(), Tests[0].ExpectedWSAResult); } else { - ok_dec(WSAGetLastError(), 0); + ok(WSAGetLastError() == 0, "Unexpected error %d on bind for double bind test\n", WSAGetLastError()); + AddrSize = sizeof(Addr); 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); + ok(Error == 0, "Unexpected error %d on getsockname for double bind test\n", Error); + ok(WSAGetLastError() == 0, "Unexpected error %d on getsockname for double bind test\n", WSAGetLastError()); + ok(AddrSize == sizeof(Addr), "Returned size %d differs from expected %d for double bind test\n", AddrSize, sizeof(Addr)); + ok(Addr.sin_addr.s_addr == Tests[0].ExpectedAddr.sin_addr.s_addr, "Expected address %lx differs from returned address %lx for double bind test\n", Tests[0].ExpectedAddr.sin_addr.s_addr, Addr.sin_addr.s_addr); if (Tests[0].ExpectedAddr.sin_port) { - ok_dec(Addr.sin_port, Tests[0].ExpectedAddr.sin_port); + ok(Addr.sin_port == Tests[0].ExpectedAddr.sin_port, "Returned port %d differs from expected %d for double bind test\n", Addr.sin_port, Tests[0].ExpectedAddr.sin_port); } else { - ok(Addr.sin_port != 0, "Port remained zero\n"); + ok(Addr.sin_port != 0, "Port remained zero for double bind test\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 */ + ok(Error == SOCKET_ERROR, "Unexpected result %d expected %d for double bind test\n", Error, SOCKET_ERROR); + ok(WSAGetLastError() == WSAEINVAL, "Unexpected wsa result %d expected %ld for double bind test\n", WSAGetLastError(), WSAEINVAL); + } + Error = closesocket(Socket); + ok(Error == 0, "Unexpected error %d on closesocket for double bind test\n", Error); + ok(WSAGetLastError() == 0, "Unexpected wsa error %d on closesocket for double bind test\n", WSAGetLastError()); + /* Check SO_BROADCAST and bind to broadcast address */ Socket = socket(AF_INET, Tests[10].Type, Tests[10].Proto); + ok(Socket != INVALID_SOCKET, "Failed to create socket with error %d for broadcast test, next tests might be wrong\n", WSAGetLastError()); 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; + ok(Error == 0, "Unexpected error %d on setsockopt for broadcast test\n", Error); + ok(WSAGetLastError() == 0, "Unexpected wsa error %d on setsockopt for broadcast test\n", WSAGetLastError()); 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 + ok(Error == 0, "Unexpected error %d on bind for broadcast test\n", Error); + ok(WSAGetLastError() == 0, "Unexpected wsa error %d on bind for broadcast test\n", WSAGetLastError()); + Error = closesocket(Socket); + ok(Error == 0, "Unexpected error %d on closesocket for broadcast test\n", Error); + ok(WSAGetLastError() == 0, "Unexpected wsa error %d on closesocket for broadcast test\n", WSAGetLastError()); } START_TEST(bind)

7 years, 5 months

[pschweitzer] 74665: [GDIPLUS] Import Wine commit (by Vincent Povirk): - b8a8e1bde9382897927945ec0b58b8a2fcfcfe59, Check SHADEBLENDCAPS only for printer devices. In short, this avoids black boxes i...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 26 08:31:10 2017 New Revision: 74665 URL: http://svn.reactos.org/svn/reactos?rev=74665&view=rev Log: [GDIPLUS] Import Wine commit (by Vincent Povirk): - b8a8e1bde9382897927945ec0b58b8a2fcfcfe59, Check SHADEBLENDCAPS only for printer devices. In short, this avoids black boxes in GOG setup. This may help other software having rendering issues due to alpha layer. Modified: trunk/reactos/dll/win32/gdiplus/graphics.c Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Fri May 26 08:31:10 2017 @@ -320,7 +320,8 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) { - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + if (GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && + GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) { TRACE("alpha blending not supported by device, fallback to StretchBlt\n"); @@ -400,7 +401,8 @@ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE || + if ((GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && + GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) || fmt & PixelFormatPAlpha) memcpy(temp_bits, src, src_width * src_height * 4); else

7 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2017