March 2015 - Wine-commits - list.winehq.org

Alexandre Julliard : ws2_32: Set the completion event on the server side also for AcceptEx.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 09cd7cf3e05015d1d940025963197bf4cadb3d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09cd7cf3e05015d1d94002596… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 7 15:17:05 2015 +0900 ws2_32: Set the completion event on the server side also for AcceptEx. --- dlls/ws2_32/socket.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 760e184..b4ed865 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2078,8 +2078,6 @@ static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, if (status == STATUS_PENDING) return status; - if (wsa->user_overlapped->hEvent) - NtSetEvent(wsa->user_overlapped->hEvent, NULL); if (wsa->cvalue) WS_AddCompletion( HANDLE2SOCKET(wsa->listen_socket), wsa->cvalue, iosb->u.Status, iosb->Information ); @@ -2146,6 +2144,7 @@ static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, { req->type = ASYNC_TYPE_READ; req->async.handle = wine_server_obj_handle( wsa->accept_socket ); + req->async.event = wine_server_obj_handle( wsa->user_overlapped->hEvent ); req->async.callback = wine_server_client_ptr( WS2_async_accept_recv ); req->async.iosb = wine_server_client_ptr( iosb ); req->async.arg = wine_server_client_ptr( wsa ); @@ -2164,9 +2163,6 @@ finish: iosb->u.Status = status; iosb->Information = 0; - if (wsa->user_overlapped->hEvent) - NtSetEvent(wsa->user_overlapped->hEvent, NULL); - if (wsa->read) release_async_io( &wsa->read->io ); release_async_io( &wsa->io ); return status; @@ -2434,7 +2430,6 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW DWORD status; struct ws2_accept_async *wsa; int fd; - ULONG_PTR cvalue = (overlapped && ((ULONG_PTR)overlapped->hEvent & 1) == 0) ? (ULONG_PTR)overlapped : 0; TRACE("(%lx, %lx, %p, %d, %d, %d, %p, %p)\n", listener, acceptor, dest, dest_len, local_addr_len, rem_addr_len, received, overlapped); @@ -2483,7 +2478,7 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW wsa->listen_socket = SOCKET2HANDLE(listener); wsa->accept_socket = SOCKET2HANDLE(acceptor); wsa->user_overlapped = overlapped; - wsa->cvalue = cvalue; + wsa->cvalue = !((ULONG_PTR)overlapped->hEvent & 1) ? (ULONG_PTR)overlapped : 0; wsa->buf = dest; wsa->data_len = dest_len; wsa->local_len = local_addr_len; @@ -2518,11 +2513,11 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW { req->type = ASYNC_TYPE_READ; req->async.handle = wine_server_obj_handle( SOCKET2HANDLE(listener) ); + req->async.event = wine_server_obj_handle( overlapped->hEvent ); req->async.callback = wine_server_client_ptr( WS2_async_accept ); req->async.iosb = wine_server_client_ptr( overlapped ); req->async.arg = wine_server_client_ptr( wsa ); - req->async.cvalue = cvalue; - /* We don't set event since we may also have to read */ + req->async.cvalue = wsa->cvalue; status = wine_server_call( req ); } SERVER_END_REQ;

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: e928f5544e745fcbcfb7e079df8932478139cca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e928f5544e745fcbcfb7e079d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 7 11:24:43 2015 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw4.c | 18 +++++++++--------- dlls/ddraw/tests/ddraw7.c | 18 +++++++++--------- dlls/ddraw/tests/visual.c | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e928f5544e745fcbcfb7e…

1 0

Bruno Jesus : ws2_32/tests: Move second WSACleanup test elsewhere.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 2522e205ec5349d7ca5c13254abc70f474720610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2522e205ec5349d7ca5c13254… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 8 01:05:45 2015 -0300 ws2_32/tests: Move second WSACleanup test elsewhere. --- dlls/ws2_32/tests/sock.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7155a09..6ad4265 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1124,7 +1124,14 @@ static void test_WithWSAStartup(void) closesocket(src); closesocket(dst); - WSACleanup(); + res = WSACleanup(); + ok(res == 0, "expected 0, got %d\n", res); + WSASetLastError(0xdeadbeef); + res = WSACleanup(); + error = WSAGetLastError(); + ok ( (res == SOCKET_ERROR && error == WSANOTINITIALISED) || + broken(res == 0), /* WinME */ + "WSACleanup returned %d WSAGetLastError is %d\n", res, error); } /**************** Main program utility functions ***************/ @@ -1156,11 +1163,6 @@ static void Exit (void) ret = WSACleanup(); err = WSAGetLastError(); ok ( ret == 0, "WSACleanup failed ret = %d GetLastError is %d\n", ret, err); - ret = WSACleanup(); - err = WSAGetLastError(); - ok ( (ret == SOCKET_ERROR && err == WSANOTINITIALISED) || - broken(ret == 0), /* WinME */ - "WSACleanup returned %d GetLastError is %d\n", ret, err); } static void StartServer (LPTHREAD_START_ROUTINE routine,

1 0

Bruno Jesus : ws2_32/tests: Fix a NT4 crash due to unsupported SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: a65ae0ea5746292fe9cd2fc0e209467054328504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65ae0ea5746292fe9cd2fc0e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 8 01:05:52 2015 -0300 ws2_32/tests: Fix a NT4 crash due to unsupported SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/tests/sock.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6ad4265..d2c766b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7960,6 +7960,12 @@ static void test_address_list_query(void) bytes_returned = 0; ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, 0, &bytes_returned, NULL, NULL); ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + if(WSAGetLastError() == WSAEINVAL) + { + win_skip("Windows <= NT4 is not supported in this test\n"); + closesocket(s); + return; + } ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); ok(bytes_returned >= FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0]), "Got unexpected bytes_returned %u.\n", bytes_returned);

1 0

Bruno Jesus : ws2_32/test: Don't test unsupported IP_MULTICAST_TTL on NT4.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 9eaf92d62a73750733af13a139da166833ae33f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eaf92d62a73750733af13a13… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 8 01:05:59 2015 -0300 ws2_32/test: Don't test unsupported IP_MULTICAST_TTL on NT4. --- dlls/ws2_32/tests/sock.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d2c766b..7acc489 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1380,17 +1380,24 @@ todo_wine s = socket(AF_INET, SOCK_DGRAM, 0); ok(s != INVALID_SOCKET, "Failed to create socket\n"); size = sizeof(i); - for (i = 0; i < 4; i++) + i = 0x0000000a; + err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &i, size); + if (!err) { - int k, j; - const int tests[] = {0xffffff0a, 0xffff000b, 0xff00000c, 0x0000000d}; - err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &tests[i], i + 1); - ok(!err, "Test [%d] Expected 0, got %d\n", i, err); - err = getsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &k, &size); - ok(!err, "Test [%d] Expected 0, got %d\n", i, err); - j = i != 3 ? tests[i] & ((1 << (i + 1) * 8) - 1) : tests[i]; - ok(k == j, "Test [%d] Expected 0x%x, got 0x%x\n", i, j, k); + for (i = 0; i < 4; i++) + { + int k, j; + const int tests[] = {0xffffff0a, 0xffff000b, 0xff00000c, 0x0000000d}; + err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &tests[i], i + 1); + ok(!err, "Test [%d] Expected 0, got %d\n", i, err); + err = getsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &k, &size); + ok(!err, "Test [%d] Expected 0, got %d\n", i, err); + j = i != 3 ? tests[i] & ((1 << (i + 1) * 8) - 1) : tests[i]; + ok(k == j, "Test [%d] Expected 0x%x, got 0x%x\n", i, j, k); + } } + else + win_skip("IP_MULTICAST_TTL is unsupported\n"); closesocket(s); /* test SO_PROTOCOL_INFOA invalid parameters */

1 0

Bruno Jesus : ws2_32/tests: Improve setup_connector_socket to allow non-blocking connect calls.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 4ca53984e46a434dcbfc43b3a0f8047dc05473e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca53984e46a434dcbfc43b3a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 8 01:06:04 2015 -0300 ws2_32/tests: Improve setup_connector_socket to allow non-blocking connect calls. --- dlls/ws2_32/tests/sock.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7acc489..d741ca5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -196,6 +196,9 @@ static int client_id; /**************** General utility functions ***************/ +static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len); +static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL nonblock); + static int tcp_socketpair(SOCKET *src, SOCKET *dst) { SOCKET server = INVALID_SOCKET; @@ -3632,7 +3635,7 @@ static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len) return server_socket; } -static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len) +static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL nonblock) { int ret; SOCKET connector; @@ -3640,8 +3643,18 @@ static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create connector socket %d\n", WSAGetLastError()); + if (nonblock) + set_blocking(connector, !nonblock); + ret = connect(connector, (struct sockaddr *)addr, len); - ok(!ret, "connecting to accepting socket failed %d\n", WSAGetLastError()); + if (!nonblock) + ok(!ret, "connecting to accepting socket failed %d\n", WSAGetLastError()); + else if (ret == SOCKET_ERROR) + { + DWORD error = WSAGetLastError(); + ok(error == WSAEWOULDBLOCK || error == WSAEINPROGRESS, + "expected 10035 or 10036, got %d\n", error); + } return connector; } @@ -3669,7 +3682,7 @@ static void test_accept(void) return; } - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; trace("Blocking accept next\n"); @@ -3717,7 +3730,7 @@ static void test_accept(void) server_socket = setup_server_socket(&address, &socklen); if (server_socket == INVALID_SOCKET) goto done; - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; socklen = 0; @@ -3728,7 +3741,7 @@ static void test_accept(void) connector = INVALID_SOCKET; socklen = sizeof(address); - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; accepted = WSAAccept(server_socket, NULL, NULL, NULL, 0); @@ -3738,7 +3751,7 @@ static void test_accept(void) accepted = connector = INVALID_SOCKET; socklen = sizeof(address); - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; socklen = sizeof(ss); @@ -3752,7 +3765,7 @@ static void test_accept(void) accepted = connector = INVALID_SOCKET; socklen = sizeof(address); - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; socklen = 0; @@ -3763,7 +3776,7 @@ static void test_accept(void) accepted = connector = INVALID_SOCKET; socklen = sizeof(address); - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; accepted = accept(server_socket, NULL, NULL); @@ -3773,7 +3786,7 @@ static void test_accept(void) accepted = connector = INVALID_SOCKET; socklen = sizeof(address); - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; socklen = sizeof(ss);

1 0

Bruno Jesus : ws2_32/tests: Add more select() tests.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 3e676b205da646dbe2b0408cbbe881e6857a4336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e676b205da646dbe2b0408cb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 8 01:06:19 2015 -0300 ws2_32/tests: Add more select() tests. --- dlls/ws2_32/tests/sock.c | 124 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 110 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d741ca5..f27d522 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3389,16 +3389,19 @@ static void test_listen(void) ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); } +#define FD_ZERO_ALL() { FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds); } +#define FD_SET_ALL(s) { FD_SET(s, &readfds); FD_SET(s, &writefds); FD_SET(s, &exceptfds); } static void test_select(void) { - static const char tmp_buf[1024]; + static char tmp_buf[1024]; - SOCKET fdRead, fdWrite; + SOCKET fdListen, fdRead, fdWrite; fd_set readfds, writefds, exceptfds; unsigned int maxfd; - int ret; + int ret, len; char buffer; struct timeval select_timeout; + struct sockaddr_in address; select_thread_params thread_params; HANDLE thread_handle; DWORD id; @@ -3407,14 +3410,10 @@ static void test_select(void) ok( (fdRead != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); fdWrite = socket(AF_INET, SOCK_STREAM, 0); ok( (fdWrite != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); - - FD_ZERO(&readfds); - FD_ZERO(&writefds); - FD_ZERO(&exceptfds); - FD_SET(fdRead, &readfds); - FD_SET(fdWrite, &writefds); - FD_SET(fdRead, &exceptfds); - FD_SET(fdWrite, &exceptfds); + + FD_ZERO_ALL(); + FD_SET_ALL(fdRead); + FD_SET_ALL(fdWrite); select_timeout.tv_sec=0; select_timeout.tv_usec=500; @@ -3455,9 +3454,7 @@ static void test_select(void) ok( (ret == -1), "peek at closed socket expected -1 got %d\n", ret); /* Test selecting invalid handles */ - FD_ZERO(&readfds); - FD_ZERO(&writefds); - FD_ZERO(&exceptfds); + FD_ZERO_ALL(); SetLastError(0); ret = select(maxfd+1, 0, 0, 0, &select_timeout); @@ -3564,7 +3561,106 @@ static void test_select(void) closesocket(fdRead); closesocket(fdWrite); + + /* select() works in 3 distinct states: + * - to check if a connection attempt ended with success or error; + * - to check if a pending connection is waiting for acceptance; + * - to check for data to read, avaliability for write and OOB data + * + * The tests below ensure that all conditions are tested. + */ + memset(&address, 0, sizeof(address)); + address.sin_addr.s_addr = inet_addr("127.0.0.1"); + address.sin_family = AF_INET; + len = sizeof(address); + fdListen = setup_server_socket(&address, &len); + select_timeout.tv_sec = 1; + select_timeout.tv_usec = 250000; + + /* When a socket is attempting to connect the listening socket receives the read descriptor */ + fdWrite = setup_connector_socket(&address, len, TRUE); + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdListen, &readfds), "fdListen socket is not in the set\n"); + len = sizeof(address); + fdRead = accept(fdListen, (struct sockaddr*) &address, &len); + ok(fdRead != INVALID_SOCKET, "expected a valid socket\n"); + + /* The connector is signaled through the write descriptor */ + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + FD_SET_ALL(fdRead); + FD_SET_ALL(fdWrite); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 2, "expected 2, got %d\n", ret); + ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &writefds), "fdRead socket is not in the set\n"); + + /* When data is received the receiver gets the read descriptor */ + ret = send(fdWrite, "1234", 4, 0); + ok(ret == 4, "expected 4, got %d\n", ret); + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + FD_SET(fdRead, &readfds); + FD_SET(fdRead, &exceptfds); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); + ok(ret == 4, "expected 4, got %d\n", ret); + ok(!strcmp(tmp_buf, "1234"), "data received differs from sent\n"); + + /* When OOB data is received the socket is set in the except descriptor */ + ret = send(fdWrite, "A", 1, MSG_OOB); + ok(ret == 1, "expected 4, got %d\n", ret); + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + FD_SET(fdRead, &readfds); + FD_SET(fdRead, &exceptfds); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine + ok(FD_ISSET(fdRead, &exceptfds), "fdRead socket is not in the set\n"); + tmp_buf[0] = 0xAF; + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), MSG_OOB); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); + + /* When the connection is closed the socket is set in the read descriptor */ + ret = closesocket(fdRead); + ok(ret == 0, "expected 0, got %d\n", ret); + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + FD_SET(fdWrite, &readfds); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); + ok(ret == 0, "expected 0, got %d\n", ret); + + /* When a connection is attempted to a non-listening socket it will get to the except descriptor */ + ret = closesocket(fdWrite); + ok(ret == 0, "expected 0, got %d\n", ret); + ret = closesocket(fdListen); + ok(ret == 0, "expected 0, got %d\n", ret); + fdWrite = setup_connector_socket(&address, len, TRUE); + FD_ZERO_ALL(); + FD_SET(fdWrite, &writefds); + FD_SET(fdWrite, &exceptfds); + select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */ + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); + closesocket(fdWrite); } +#undef FD_SET_ALL +#undef FD_ZERO_ALL static DWORD WINAPI AcceptKillThread(void *param) {

1 0

Nikolay Sivov : rpcrt4: Handle memory allocation error when creating OLE stream instance.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: e7a608a4e317f28546c1f2c4d880113fdc33485c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a608a4e317f28546c1f2c4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 20:16:40 2015 +0300 rpcrt4: Handle memory allocation error when creating OLE stream instance. --- dlls/rpcrt4/ndr_ole.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index c3ab529..0ad4860 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -95,14 +95,15 @@ static HRESULT WINAPI RpcStream_QueryInterface(LPSTREAM iface, REFIID riid, LPVOID *obj) { - RpcStreamImpl *This = impl_from_IStream(iface); if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ISequentialStream, riid) || IsEqualGUID(&IID_IStream, riid)) { - *obj = This; - InterlockedIncrement( &This->RefCount ); + *obj = iface; + IStream_AddRef(iface); return S_OK; } + + *obj = NULL; return E_NOINTERFACE; } @@ -120,7 +121,6 @@ static ULONG WINAPI RpcStream_Release(LPSTREAM iface) TRACE("size=%d\n", *This->size); This->pMsg->Buffer = This->data + *This->size; HeapFree(GetProcessHeap(),0,This); - return 0; } return ref; } @@ -212,11 +212,13 @@ static const IStreamVtbl RpcStream_Vtbl = NULL /* Clone */ }; -static LPSTREAM RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init) +static HRESULT RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init, IStream **stream) { RpcStreamImpl *This; + + *stream = NULL; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(RpcStreamImpl)); - if (!This) return NULL; + if (!This) return E_OUTOFMEMORY; This->IStream_iface.lpVtbl = &RpcStream_Vtbl; This->RefCount = 1; This->pMsg = pStubMsg; @@ -225,7 +227,8 @@ static LPSTREAM RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init) This->pos = 0; if (init) *This->size = 0; TRACE("init size=%d\n", *This->size); - return (LPSTREAM)This; + *stream = &This->IStream_iface; + return S_OK; } static const IID* get_ip_iid(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) @@ -260,19 +263,17 @@ unsigned char * WINAPI NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->MaxCount = 0; if (!LoadCOM()) return NULL; if (pStubMsg->Buffer + sizeof(DWORD) <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { - stream = RpcStream_Create(pStubMsg, TRUE); - if (stream) { + hr = RpcStream_Create(pStubMsg, TRUE, &stream); + if (hr == S_OK) { if (pMemory) hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, pStubMsg->dwDestContext, pStubMsg->pvDestContext, MSHLFLAGS_NORMAL); - else - hr = S_OK; - IStream_Release(stream); - if (FAILED(hr)) - RpcRaiseException(hr); } + + if (FAILED(hr)) + RpcRaiseException(hr); } return NULL; } @@ -292,13 +293,14 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg if (!LoadCOM()) return NULL; *(LPVOID*)ppMemory = NULL; if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { - stream = RpcStream_Create(pStubMsg, FALSE); - if (!stream) RpcRaiseException(E_OUTOFMEMORY); - if (*((RpcStreamImpl *)stream)->size != 0) - hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); - else - hr = S_OK; - IStream_Release(stream); + hr = RpcStream_Create(pStubMsg, FALSE, &stream); + if (hr == S_OK) { + if (*((RpcStreamImpl *)stream)->size != 0) + hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); + + IStream_Release(stream); + } + if (FAILED(hr)) RpcRaiseException(hr); }

1 0

Nikolay Sivov : rpcrt4: Return buffer size directly to avoid accessing implementation fields.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 71d663f1deb66caed55a8c11c537c5e8da646eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d663f1deb66caed55a8c11c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 20:28:24 2015 +0300 rpcrt4: Return buffer size directly to avoid accessing implementation fields. --- dlls/rpcrt4/ndr_ole.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 0ad4860..81d08b3 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -212,21 +212,23 @@ static const IStreamVtbl RpcStream_Vtbl = NULL /* Clone */ }; -static HRESULT RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init, IStream **stream) +static HRESULT RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init, ULONG *size, IStream **stream) { RpcStreamImpl *This; *stream = NULL; - This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(RpcStreamImpl)); + This = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcStreamImpl)); if (!This) return E_OUTOFMEMORY; This->IStream_iface.lpVtbl = &RpcStream_Vtbl; This->RefCount = 1; This->pMsg = pStubMsg; This->size = (LPDWORD)pStubMsg->Buffer; - This->data = (unsigned char*)(This->size + 1); + This->data = pStubMsg->Buffer + sizeof(DWORD); This->pos = 0; if (init) *This->size = 0; TRACE("init size=%d\n", *This->size); + + if (size) *size = *This->size; *stream = &This->IStream_iface; return S_OK; } @@ -263,7 +265,7 @@ unsigned char * WINAPI NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->MaxCount = 0; if (!LoadCOM()) return NULL; if (pStubMsg->Buffer + sizeof(DWORD) <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { - hr = RpcStream_Create(pStubMsg, TRUE, &stream); + hr = RpcStream_Create(pStubMsg, TRUE, NULL, &stream); if (hr == S_OK) { if (pMemory) hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, @@ -293,9 +295,11 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg if (!LoadCOM()) return NULL; *(LPVOID*)ppMemory = NULL; if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { - hr = RpcStream_Create(pStubMsg, FALSE, &stream); + ULONG size; + + hr = RpcStream_Create(pStubMsg, FALSE, &size, &stream); if (hr == S_OK) { - if (*((RpcStreamImpl *)stream)->size != 0) + if (size != 0) hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); IStream_Release(stream);

1 0

Nikolay Sivov : rpcrt4: Add all stubs to OLE marshalling stream.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 15d7436a0d7f134b48d3b51d4638df50cfa669a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d7436a0d7f134b48d3b51d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 21:07:39 2015 +0300 rpcrt4: Add all stubs to OLE marshalling stream. --- dlls/rpcrt4/ndr_ole.c | 67 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 81d08b3..143bba7 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -19,7 +19,6 @@ * * TODO: * - fix the wire-protocol to match MS/RPC - * - finish RpcStream_Vtbl */ #include <stdarg.h> @@ -194,6 +193,58 @@ static HRESULT WINAPI RpcStream_SetSize(LPSTREAM iface, return S_OK; } +static HRESULT WINAPI RpcStream_CopyTo(IStream *iface, IStream *dest, + ULARGE_INTEGER len, ULARGE_INTEGER *read, ULARGE_INTEGER *written) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_Commit(IStream *iface, DWORD flags) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p)->(0x%08x): stub\n", This, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_Revert(IStream *iface) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_LockRegion(IStream *iface, + ULARGE_INTEGER offset, ULARGE_INTEGER len, DWORD locktype) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_UnlockRegion(IStream *iface, + ULARGE_INTEGER offset, ULARGE_INTEGER len, DWORD locktype) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_Stat(IStream *iface, STATSTG *stat, DWORD flag) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_Clone(IStream *iface, IStream **cloned) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + static const IStreamVtbl RpcStream_Vtbl = { RpcStream_QueryInterface, @@ -203,13 +254,13 @@ static const IStreamVtbl RpcStream_Vtbl = RpcStream_Write, RpcStream_Seek, RpcStream_SetSize, - NULL, /* CopyTo */ - NULL, /* Commit */ - NULL, /* Revert */ - NULL, /* LockRegion */ - NULL, /* UnlockRegion */ - NULL, /* Stat */ - NULL /* Clone */ + RpcStream_CopyTo, + RpcStream_Commit, + RpcStream_Revert, + RpcStream_LockRegion, + RpcStream_UnlockRegion, + RpcStream_Stat, + RpcStream_Clone }; static HRESULT RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init, ULONG *size, IStream **stream)

1 0