May 2012 - Wine-Commits - list.winehq.org

Erich Hoover : ws2_32/tests: Test for AcceptEx IOCP behavior for a duplicated handle.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: a766ee4b1d6cf01b4f200d655efba63ca2982973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a766ee4b1d6cf01b4f200d655… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Apr 30 21:14:11 2012 -0600 ws2_32/tests: Test for AcceptEx IOCP behavior for a duplicated handle. --- dlls/ws2_32/tests/sock.c | 166 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 165 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 54fa086..f2e988e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5330,7 +5330,8 @@ static void test_completion_port(void) { HANDLE previous_port, io_port; WSAOVERLAPPED ov, *olp; - SOCKET src, dest, connector = INVALID_SOCKET; + SOCKET src, dest, dup, connector = INVALID_SOCKET; + WSAPROTOCOL_INFOA info; char buf[1024]; WSABUF bufs; DWORD num_bytes, flags; @@ -5553,6 +5554,169 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); + /* Test IOCP with duplicated handle */ + + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) + goto end; + + SetLastError(0xdeadbeef); + + io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + WSADuplicateSocket( src, GetCurrentProcessId(), &info ); + dup = WSASocket(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); + ok(dup != INVALID_SOCKET, "failed to duplicate socket!\n"); + + bret = pAcceptEx(dup, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &num_bytes, &ov); + ok(bret == FALSE, "AcceptEx returned %d\n", bret); + ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); + + + closesocket(src); + src = INVALID_SOCKET; + closesocket(dup); + dup = INVALID_SOCKET; + + /* Test IOCP with duplicated handle (closing duplicated handle) */ + + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) + goto end; + + SetLastError(0xdeadbeef); + + io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + WSADuplicateSocket( src, GetCurrentProcessId(), &info ); + dup = WSASocket(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); + ok(dup != INVALID_SOCKET, "failed to duplicate socket!\n"); + + bret = pAcceptEx(dup, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &num_bytes, &ov); + ok(bret == FALSE, "AcceptEx returned %d\n", bret); + ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); + + closesocket(dup); + dup = INVALID_SOCKET; + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + + bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + todo_wine ok(key == 125, "Key is %lu\n", key); + todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); + todo_wine ok(olp && (broken(olp->Internal == (ULONG)STATUS_PENDING) || (olp->Internal == (ULONG)STATUS_CANCELLED)), + "Internal status is %lx\n", olp ? olp->Internal : 0); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); + + closesocket(src); + src = INVALID_SOCKET; + + bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + todo_wine ok(key == 125, "Key is %lu\n", key); + todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); + todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); + + /* Test IOCP with duplicated handle (closing original handle) */ + + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) + goto end; + + SetLastError(0xdeadbeef); + + io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + WSADuplicateSocket( src, GetCurrentProcessId(), &info ); + dup = WSASocket(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); + ok(dup != INVALID_SOCKET, "failed to duplicate socket!\n"); + + bret = pAcceptEx(dup, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &num_bytes, &ov); + ok(bret == FALSE, "AcceptEx returned %d\n", bret); + ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); + + closesocket(src); + src = INVALID_SOCKET; + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); + + closesocket(dup); + dup = INVALID_SOCKET; + + bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + todo_wine ok(key == 125, "Key is %lu\n", key); + todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); + todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); + /* */ if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET)

1 0

Erich Hoover : ws2_32/tests: Test for AcceptEx IOCP behavior for cancelled sockets.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 23a785af7e5a3e876b0c49c790fe30298cf0cdfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=23a785af7e5a3e876b0c49c79… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Apr 30 21:13:37 2012 -0600 ws2_32/tests: Test for AcceptEx IOCP behavior for cancelled sockets. --- dlls/ws2_32/tests/sock.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ac5cef5..54fa086 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5510,6 +5510,49 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); + /* Test IOCP response on socket close (IOCP created before AcceptEx) */ + + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) + goto end; + + SetLastError(0xdeadbeef); + + io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &num_bytes, &ov); + ok(bret == FALSE, "AcceptEx returned %d\n", bret); + ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); + + closesocket(src); + src = INVALID_SOCKET; + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + + bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + todo_wine ok(key == 125, "Key is %lu\n", key); + todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); + todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); + /* */ if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET)

1 0

Erich Hoover : ws2_32/tests: AcceptEx IOCP initialization cleanup.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 1e0b65f3a2ecd9ae67c8809cea7a7e7e8b642778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0b65f3a2ecd9ae67c8809ce… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Apr 30 21:13:18 2012 -0600 ws2_32/tests: AcceptEx IOCP initialization cleanup. --- dlls/ws2_32/tests/sock.c | 193 +++++++++++++++------------------------------- 1 files changed, 61 insertions(+), 132 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f3b33be..ac5cef5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5274,6 +5274,58 @@ static void test_WSAAsyncGetServByName(void) DestroyWindow(hwnd); } +/* + * Provide consistent initialization for the AcceptEx IOCP tests. + */ +static SOCKET setup_iocp_src(struct sockaddr_in *bindAddress) +{ + SOCKET src, ret = INVALID_SOCKET; + int iret, socklen; + + src = socket(AF_INET, SOCK_STREAM, 0); + if (src == INVALID_SOCKET) + { + skip("could not create listener socket, error %d\n", WSAGetLastError()); + goto end; + } + + memset(bindAddress, 0, sizeof(*bindAddress)); + bindAddress->sin_family = AF_INET; + bindAddress->sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(src, (struct sockaddr*)bindAddress, sizeof(*bindAddress)); + if (iret != 0) + { + skip("failed to bind, error %d\n", WSAGetLastError()); + goto end; + } + + socklen = sizeof(*bindAddress); + iret = getsockname(src, (struct sockaddr*)bindAddress, &socklen); + if (iret != 0) { + skip("failed to lookup bind address, error %d\n", WSAGetLastError()); + goto end; + } + + if (set_blocking(src, FALSE)) + { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto end; + } + + iret = listen(src, 5); + if (iret != 0) + { + skip("listening failed, errno = %d\n", WSAGetLastError()); + goto end; + } + + ret = src; +end: + if (src != ret && ret == INVALID_SOCKET) + closesocket(src); + return ret; +} + static void test_completion_port(void) { HANDLE previous_port, io_port; @@ -5289,7 +5341,6 @@ static void test_completion_port(void) struct sockaddr_in bindAddress; GUID acceptExGuid = WSAID_ACCEPTEX; LPFN_ACCEPTEX pAcceptEx = NULL; - int socklen; previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); @@ -5401,14 +5452,6 @@ static void test_completion_port(void) if (dest != INVALID_SOCKET) closesocket(dest); - - src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } - dest = socket(AF_INET, SOCK_STREAM, 0); if (dest == INVALID_SOCKET) { @@ -5416,7 +5459,7 @@ static void test_completion_port(void) goto end; } - iret = WSAIoctl(src, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), + iret = WSAIoctl(dest, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), &pAcceptEx, sizeof(pAcceptEx), &num_bytes, NULL, NULL); if (iret) { @@ -5424,28 +5467,10 @@ static void test_completion_port(void) goto end; } - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); - iret = bind(src, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + /* Test IOCP response on socket close (IOCP created after AcceptEx) */ - if (set_blocking(src, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) goto end; - } - - iret = listen(src, 5); - if (iret != 0) - { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } SetLastError(0xdeadbeef); @@ -5485,42 +5510,10 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); - src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } + /* */ - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); - iret = bind(src, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to bind, error %d\n", WSAGetLastError()); + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) goto end; - } - - socklen = sizeof(bindAddress); - iret = getsockname(src, (struct sockaddr*)&bindAddress, &socklen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto end; - } - - if (set_blocking(src, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } - - iret = listen(src, 5); - if (iret != 0) - { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } connector = socket(AF_INET, SOCK_STREAM, 0); if (connector == INVALID_SOCKET) { @@ -5575,42 +5568,10 @@ static void test_completion_port(void) if (src != INVALID_SOCKET) closesocket(dest); - src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } - - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); - iret = bind(src, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + /* */ - socklen = sizeof(bindAddress); - iret = getsockname(src, (struct sockaddr*)&bindAddress, &socklen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) goto end; - } - - if (set_blocking(src, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } - - iret = listen(src, 5); - if (iret != 0) - { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } dest = socket(AF_INET, SOCK_STREAM, 0); if (dest == INVALID_SOCKET) @@ -5675,42 +5636,10 @@ static void test_completion_port(void) if (connector != INVALID_SOCKET) closesocket(connector); - src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } - - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); - iret = bind(src, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } - - socklen = sizeof(bindAddress); - iret = getsockname(src, (struct sockaddr*)&bindAddress, &socklen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto end; - } - - if (set_blocking(src, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } + /* */ - iret = listen(src, 5); - if (iret != 0) - { - skip("listening failed, errno = %d\n", WSAGetLastError()); + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) goto end; - } dest = socket(AF_INET, SOCK_STREAM, 0); if (dest == INVALID_SOCKET)

1 0

Jacek Caban : oleaut32: SysStringByteLen code clean up.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: ab509cde5e188c9af19bedd04f653f065d6fa5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab509cde5e188c9af19bedd04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:06:44 2012 +0200 oleaut32: SysStringByteLen code clean up. --- dlls/oleaut32/oleaut.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 0d4a07c..bb3bac6 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -171,18 +171,7 @@ UINT WINAPI SysStringLen(BSTR str) */ UINT WINAPI SysStringByteLen(BSTR str) { - DWORD* bufferPointer; - - if (!str) return 0; - /* - * The length of the string (in bytes) is contained in a DWORD placed - * just before the BSTR pointer - */ - bufferPointer = (DWORD*)str; - - bufferPointer--; - - return (int)(*bufferPointer); + return str ? *((DWORD*)str-1) : 0; } /******************************************************************************

1 0

Jacek Caban : jscript: Added VT_I2 tests.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 13db9a1662fa0b52d83337e724814a27cc5d97bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=13db9a1662fa0b52d83337e72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:05:21 2012 +0200 jscript: Added VT_I2 tests. --- dlls/jscript/jsutils.c | 4 +++ dlls/jscript/tests/run.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 4773fc9..5e7e347 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -262,6 +262,8 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret WARN("failed\n"); return throw_type_error(ctx, ei, JS_E_TO_PRIMITIVE, NULL); } + case VT_I2: + assert(0); default: FIXME("Unimplemented for vt %d\n", V_VT(v)); return E_NOTIMPL; @@ -444,6 +446,8 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) case VT_BOOL: *ret = V_BOOL(v) ? 1 : 0; break; + case VT_I2: + assert(0); default: FIXME("unimplemented for vt %d\n", V_VT(v)); return E_NOTIMPL; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index c4dfd1d..332b125 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -66,6 +66,7 @@ DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); +DEFINE_EXPECT(global_testargtypes_i); DEFINE_EXPECT(puredisp_prop_d); DEFINE_EXPECT(puredisp_noprop_d); DEFINE_EXPECT(testobj_delete); @@ -99,6 +100,9 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_TESTPROPDELETE 0x1010 #define DISPID_GLOBAL_ISNULLBSTR 0x1011 #define DISPID_GLOBAL_PROPARGPUT 0x1012 +#define DISPID_GLOBAL_SHORTPROP 0x1013 +#define DISPID_GLOBAL_GETSHORT 0x1014 +#define DISPID_GLOBAL_TESTARGTYPES 0x1015 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -519,6 +523,21 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "shortProp")) { + *pid = DISPID_GLOBAL_SHORTPROP; + return S_OK; + } + + if(!strcmp_wa(bstrName, "getShort")) { + *pid = DISPID_GLOBAL_GETSHORT; + return S_OK; + } + + if(!strcmp_wa(bstrName, "testArgTypes")) { + *pid = DISPID_GLOBAL_TESTARGTYPES; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -903,6 +922,39 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, IDispatchEx_Release(dispex); return S_OK; } + case DISPID_GLOBAL_SHORTPROP: + case DISPID_GLOBAL_GETSHORT: + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = 10; + return S_OK; + + case DISPID_GLOBAL_TESTARGTYPES: { + VARIANT args[1]; + DISPPARAMS dp = {args, NULL, 1, 0}; + HRESULT hres; + + CHECK_EXPECT(global_testargtypes_i); + ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg != NULL\n"); + ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(!pvarRes, "pvarRes != NULL\n"); + + ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I4(pdp->rgvarg+1) == 10, "V_I4(psp->rgvargs+1) = %d\n", V_I4(pdp->rgvarg)); + + ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I4(pdp->rgvarg+2) == 10, "V_I4(psp->rgvargs+2) = %d\n", V_I4(pdp->rgvarg+1)); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + + V_VT(args) = VT_I2; + V_I2(args) = 2; + hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + + return S_OK; + } } ok(0, "unexpected call %x\n", id); @@ -1659,6 +1711,10 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_d); CHECK_CALLED(global_propargput_i); + SET_EXPECT(global_testargtypes_i); + parse_script_a("testArgTypes(getShort(), shortProp, function(s) {ok(getVT(s) === 'VT_I4', 'not VT_I4');});"); + CHECK_CALLED(global_testargtypes_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Jacek Caban : jscript: Added support for VT_I2 in disp_call.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: da125450dadeb859508f05a1227ec93fea338740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da125450dadeb859508f05a12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:04:51 2012 +0200 jscript: Added support for VT_I2 in disp_call. --- dlls/jscript/dispex.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 3b52145..4f6ed7e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1056,7 +1056,10 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS if(retv) V_VT(retv) = VT_EMPTY; hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, &ctx->jscaller->IServiceProvider_iface); + IDispatchEx_Release(dispex); + }else { UINT err = 0; if(flags == DISPATCH_CONSTRUCT) { @@ -1065,13 +1068,15 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS } TRACE("using IDispatch\n"); - return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei->ei, &err); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei->ei, &err); } - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); + if(FAILED(hres)) + return hres; - return hres; + if(retv) + ensure_retval_type(retv); + return S_OK; } HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, VARIANT *val, jsexcept_t *ei)

1 0

Hans Leidekker : msi: Fix a couple of DispGetParam calls.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 9700e9c7a62b1e9734bcb739a03e321e086bd55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9700e9c7a62b1e9734bcb739a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 1 12:39:17 2012 +0200 msi: Fix a couple of DispGetParam calls. --- dlls/msi/automation.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 375191e..918572a 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -884,7 +884,7 @@ static HRESULT RecordImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BSTR, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); if (FAILED(hr)) return hr; if ((ret = MsiRecordSetStringW(This->msiHandle, V_I4(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) { @@ -905,7 +905,7 @@ static HRESULT RecordImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_I4, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); if (FAILED(hr)) return hr; if ((ret = MsiRecordSetInteger(This->msiHandle, V_I4(&varg0), V_I4(&varg1))) != ERROR_SUCCESS) { @@ -1340,7 +1340,7 @@ static HRESULT SessionImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BSTR, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); if (FAILED(hr)) { VariantClear(&varg0); return hr; @@ -1374,7 +1374,7 @@ static HRESULT SessionImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BOOL, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_BOOL, &varg1, puArgErr); if (FAILED(hr)) return hr; if ((ret = MsiSetMode(This->msiHandle, V_I4(&varg0), V_BOOL(&varg1))) != ERROR_SUCCESS) { @@ -1515,7 +1515,7 @@ static HRESULT SessionImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_I4, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); if (FAILED(hr)) { VariantClear(&varg0); return hr;

1 0

Erich Hoover : ws2_32/tests: Test for IOCP behavior without AcceptEx call.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 74560c1d3995ac75eb2a6db46dfcd06018dd1f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74560c1d3995ac75eb2a6db46… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Apr 30 21:14:18 2012 -0600 ws2_32/tests: Test for IOCP behavior without AcceptEx call. --- dlls/ws2_32/tests/sock.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f2e988e..b71be34 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5717,6 +5717,30 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); + /* Test IOCP without AcceptEx */ + + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) + goto end; + + SetLastError(0xdeadbeef); + + io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + closesocket(src); + src = INVALID_SOCKET; + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); + /* */ if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET)

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in d3d9_texture_2d_LockRect().
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 61dd4fa851c72287130eaf9b69f1b9b2bcc05b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61dd4fa851c72287130eaf9b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 30 21:30:17 2012 +0200 d3d9: Properly retrieve an interface pointer in d3d9_texture_2d_LockRect(). --- dlls/d3d9/texture.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 6387e2d..bbe7808 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -350,6 +350,7 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface, { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, level %u, locked_rect %p, rect %p, flags %#x.\n", @@ -359,8 +360,10 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface, if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DSurface9_LockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource), - locked_rect, rect, flags); + { + surface_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DSurface9_LockRect(&surface_impl->IDirect3DSurface9_iface, locked_rect, rect, flags); + } wined3d_mutex_unlock(); return hr;

1 0

Alexandre Julliard : kernel32: Fix another overflow in GetModuleFileNameExW .
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: fd11023e4b44b18af7f9d44b216bcc254fe3b299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd11023e4b44b18af7f9d44b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 1 14:43:46 2012 +0200 kernel32: Fix another overflow in GetModuleFileNameExW. --- dlls/kernel32/module.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 57a24ba..adf8a99 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1255,18 +1255,20 @@ DWORD WINAPI K32GetModuleFileNameExW(HANDLE process, HMODULE module, return 0; len = ldr_module.FullDllName.Length / sizeof(WCHAR); - if (size <= len) - { - len = size; - size--; - } - if (!ReadProcessMemory(process, ldr_module.FullDllName.Buffer, - file_name, size * sizeof(WCHAR), NULL)) + file_name, min( len, size ) * sizeof(WCHAR), NULL)) return 0; - file_name[size] = 0; - return len; + if (len < size) + { + file_name[len] = 0; + return len; + } + else + { + file_name[size - 1] = 0; + return size; + } } /***********************************************************************

1 0