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

Jacek Caban : oleaut32: SysStringByteLen code clean up.
by Alexandre Julliard 01 May '12

01 May '12

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

Erich Hoover : ws2_32/tests: AcceptEx IOCP initialization cleanup.
by Alexandre Julliard 01 May '12

01 May '12

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

Erich Hoover : ws2_32/tests: Test for AcceptEx IOCP behavior for cancelled sockets.
by Alexandre Julliard 01 May '12

01 May '12

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: Test for AcceptEx IOCP behavior for a duplicated handle.
by Alexandre Julliard 01 May '12

01 May '12

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 IOCP behavior without AcceptEx call.
by Alexandre Julliard 01 May '12

01 May '12

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

Alexander E. Patrakov : dsound: Clean up MixToTemporary().
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 0195e0199059afc28787083ddc5137de845fece7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0195e0199059afc28787083dd… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Mon Nov 7 10:17:09 2011 -0600 dsound: Clean up MixToTemporary(). --- dlls/dsound/dsound_convert.c | 2 +- dlls/dsound/mixer.c | 59 +++++++++++++----------------------------- 2 files changed, 19 insertions(+), 42 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 63e3dbe..dd982c6 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -66,8 +66,8 @@ static inline void src_advance(const void **src, UINT stride, INT *count, UINT * ULONG adv = (*freqAcc >> DSOUND_FREQSHIFT); *freqAcc &= (1 << DSOUND_FREQSHIFT) - 1; *(const char **)src += adv * stride; - *count -= adv; } + *count -= 1; } static void convert_8_to_8 (const void *src, void *dst, UINT src_stride, diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 7d0ea66..1cb7e05 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -138,8 +138,6 @@ DWORD DSOUND_secpos_to_bufpos(const IDirectSoundBufferImpl *dsb, DWORD secpos, D } /** Convert a resampled pointer that fits for primary to a 'native' sample pointer - * freqAccNext is used here rather than freqAcc: In case the app wants to fill up to - * the play position it won't overwrite it */ static DWORD DSOUND_bufpos_to_secpos(const IDirectSoundBufferImpl *dsb, DWORD bufpos) { @@ -148,12 +146,15 @@ static DWORD DSOUND_bufpos_to_secpos(const IDirectSoundBufferImpl *dsb, DWORD bu DWORD64 acc; framelen = bufpos/oAdv; - acc = framelen * (DWORD64)dsb->freqAdjust + (DWORD64)dsb->freqAccNext; + acc = framelen * (DWORD64)dsb->freqAdjust + (DWORD64)dsb->freqAcc; acc = acc >> DSOUND_FREQSHIFT; pos = (DWORD)acc * iAdv; - if (pos >= dsb->buflen) - /* Because of differences between freqAcc and freqAccNext, this might happen */ + if (pos >= dsb->buflen) { + /* FIXME: can this happen at all? */ + ERR("pos >= dsb->buflen: %d >= %d, capping\n", pos, dsb->buflen); pos = dsb->buflen - iAdv; + } + TRACE("Converted %d/%d to %d/%d\n", bufpos, dsb->tmp_buffer_len, pos, dsb->buflen); return pos; } @@ -334,41 +335,32 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2) * * NOTE: writepos + len <= buflen. When called by mixer, MixOne makes sure of this. */ -static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD len) +static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD tmp_len) { INT size; - BYTE *ibp, *obp, *obp_begin; + BYTE *ibp, *obp; INT iAdvance = dsb->pwfx->nBlockAlign; INT oAdvance = dsb->device->pwfx->nBlockAlign; - DWORD freqAcc, overshot, maxlen; - - assert(writepos + len <= dsb->buflen); - if (writepos + len < dsb->buflen) - len += dsb->pwfx->nBlockAlign; + DWORD freqAcc; - maxlen = DSOUND_secpos_to_bufpos(dsb, len, 0, NULL); - - ibp = dsb->buffer->memory + writepos; - if (dsb->device->tmp_buffer_len < maxlen || !dsb->device->tmp_buffer) + ibp = dsb->buffer->memory + dsb->sec_mixpos; + if (dsb->device->tmp_buffer_len < tmp_len || !dsb->device->tmp_buffer) { - dsb->device->tmp_buffer_len = maxlen; + dsb->device->tmp_buffer_len = tmp_len; if (dsb->device->tmp_buffer) - dsb->device->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->tmp_buffer, maxlen); + dsb->device->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->tmp_buffer, tmp_len); else - dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, maxlen); - obp_begin = dsb->device->tmp_buffer; + dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, tmp_len); } - else - obp_begin = dsb->device->tmp_buffer; + obp = dsb->device->tmp_buffer; TRACE("(%p, %p)\n", dsb, ibp); - size = len / iAdvance; + size = tmp_len / oAdvance; /* Check for same sample rate */ if (dsb->freq == dsb->device->pwfx->nSamplesPerSec) { TRACE("(%p) Same sample rate %d = primary %d\n", dsb, dsb->freq, dsb->device->pwfx->nSamplesPerSec); - obp = obp_begin; cp_fields(dsb, ibp, obp, iAdvance, oAdvance, size, 0, 1 << DSOUND_FREQSHIFT); return; @@ -377,22 +369,7 @@ static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD write /* Mix in different sample rates */ TRACE("(%p) Adjusting frequency: %d -> %d\n", dsb, dsb->freq, dsb->device->pwfx->nSamplesPerSec); - DSOUND_secpos_to_bufpos(dsb, writepos, dsb->sec_mixpos, &freqAcc); - overshot = freqAcc >> DSOUND_FREQSHIFT; - if (overshot) - { - if (overshot >= size) - return; - size -= overshot; - writepos += overshot * iAdvance; - if (writepos >= dsb->buflen) - return; - ibp = dsb->buffer->memory + writepos; - freqAcc &= (1 << DSOUND_FREQSHIFT) - 1; - TRACE("Overshot: %d, freqAcc: %04x\n", overshot, freqAcc); - } - - obp = obp_begin; + DSOUND_secpos_to_bufpos(dsb, dsb->sec_mixpos, dsb->sec_mixpos, &freqAcc); /* FIXME: Small problem here when we're overwriting buf_mixpos, it then STILL uses old freqAcc, not sure if it matters or not */ cp_fields(dsb, ibp, obp, iAdvance, oAdvance, size, freqAcc, dsb->freqAdjust); @@ -497,7 +474,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO } /* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */ - DSOUND_MixToTemporary(dsb, dsb->sec_mixpos, DSOUND_bufpos_to_secpos(dsb, dsb->buf_mixpos+len) - dsb->sec_mixpos); + DSOUND_MixToTemporary(dsb, len); ibuf = dsb->device->tmp_buffer; /* Apply volume if needed */

1 0

Alexander E. Patrakov : dsound: Clean up cp_fields.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: ab4ef6636d2e2662a696988000981f70f7ce9fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4ef6636d2e2662a69698800… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Mon Dec 12 14:03:19 2011 -0600 dsound: Clean up cp_fields. --- dlls/dsound/mixer.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 95f8e9f..4f73831 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -269,16 +269,19 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len } /** - * Copy a single frame from the given input buffer to the given output buffer. + * Copy frames from the given input buffer to the given output buffer. * Translate 8 <-> 16 bits and mono <-> stereo */ -static inline void cp_fields(const IDirectSoundBufferImpl *dsb, const BYTE *ibuf, - UINT istride, UINT ostride, UINT count, UINT freqAcc, UINT adj) +static inline void cp_fields(const IDirectSoundBufferImpl *dsb, + UINT ostride, UINT count, UINT freqAcc) { + DWORD ipos = dsb->sec_mixpos; + UINT istride = dsb->pwfx->nBlockAlign; + UINT adj = dsb->freqAdjust; DirectSoundDevice *device = dsb->device; float value; ULONG adv; - DWORD ipos = dsb->sec_mixpos, opos = 0; + DWORD opos = 0; while (count-- > 0) { if (device->pwfx->nChannels == dsb->pwfx->nChannels || @@ -345,13 +348,10 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2) */ static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD tmp_len) { - INT size; - BYTE *ibp; - INT iAdvance = dsb->pwfx->nBlockAlign; INT oAdvance = dsb->device->pwfx->nBlockAlign; + INT size = tmp_len / oAdvance; DWORD freqAcc; - ibp = dsb->buffer->memory + dsb->sec_mixpos; if (dsb->device->tmp_buffer_len < tmp_len || !dsb->device->tmp_buffer) { dsb->device->tmp_buffer_len = tmp_len; @@ -361,15 +361,12 @@ static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD tmp_l dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, tmp_len); } - TRACE("(%p, %p)\n", dsb, ibp); - size = tmp_len / oAdvance; - /* Check for same sample rate */ if (dsb->freq == dsb->device->pwfx->nSamplesPerSec) { TRACE("(%p) Same sample rate %d = primary %d\n", dsb, dsb->freq, dsb->device->pwfx->nSamplesPerSec); - cp_fields(dsb, ibp, iAdvance, oAdvance, size, 0, 1 << DSOUND_FREQSHIFT); + cp_fields(dsb, oAdvance, size, 0); return; } @@ -379,7 +376,7 @@ static void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD tmp_l DSOUND_secpos_to_bufpos(dsb, dsb->sec_mixpos, dsb->sec_mixpos, &freqAcc); /* FIXME: Small problem here when we're overwriting buf_mixpos, it then STILL uses old freqAcc, not sure if it matters or not */ - cp_fields(dsb, ibp, iAdvance, oAdvance, size, freqAcc, dsb->freqAdjust); + cp_fields(dsb, oAdvance, size, freqAcc); } /** Apply volume to the given soundbuffer from (primary) position writepos and length len

1 0

Alexander E. Patrakov : dsound: Replace convert() functions with get() and put().
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: f88f3d41495bd71e9dd8d7f729b10033ec4c8d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88f3d41495bd71e9dd8d7f72… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Mon Nov 7 10:25:49 2011 -0600 dsound: Replace convert() functions with get() and put(). --- dlls/dsound/dsound_convert.c | 400 ++++++++---------------------------------- dlls/dsound/dsound_private.h | 12 +- dlls/dsound/mixer.c | 77 +++++---- 3 files changed, 123 insertions(+), 366 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f88f3d41495bd71e9dd8d…

1 0

Alexandre Julliard : gdi32: Add support for clipping source coordinates to the DC device rectangle.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 41e5bc06d8928d6d9b56b8910164683cf66b4cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e5bc06d8928d6d9b56b8910… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 30 21:17:00 2012 +0200 gdi32: Add support for clipping source coordinates to the DC device rectangle. --- dlls/gdi32/bitblt.c | 14 +++-------- dlls/gdi32/bitmap.c | 1 + dlls/gdi32/clipping.c | 55 +++++++++++++++++++++++++++------------------ dlls/gdi32/dc.c | 1 + dlls/gdi32/dib.c | 1 + dlls/gdi32/gdi_private.h | 2 + 6 files changed, 42 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a97231c..6b99e43 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -146,13 +146,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, } get_bounding_rect( &rect, src->x, src->y, src->width, src->height ); - /* source is not clipped */ - if (dc_src->header.type == OBJ_MEMDC) - intersect_rect( &src->visrect, &rect, &dc_src->vis_rect ); - else - src->visrect = rect; /* FIXME: clip to device size */ - - if (is_rect_empty( &src->visrect )) return FALSE; + if (!clip_device_rect( dc_src, &src->visrect, &rect )) return FALSE; if (is_rect_empty( &dst->visrect )) return FALSE; return intersect_vis_rectangles( dst, src ); @@ -932,9 +926,9 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig if (src.x < 0 || src.y < 0 || src.width < 0 || src.height < 0 || src.log_width < 0 || src.log_height < 0 || - (dcSrc->header.type == OBJ_MEMDC && - (src.width > dcSrc->vis_rect.right - dcSrc->vis_rect.left - src.x || - src.height > dcSrc->vis_rect.bottom - dcSrc->vis_rect.top - src.y))) + (!is_rect_empty( &dcSrc->device_rect ) && + (src.width > dcSrc->device_rect.right - dcSrc->vis_rect.left - src.x || + src.height > dcSrc->device_rect.bottom - dcSrc->vis_rect.top - src.y))) { WARN( "Invalid src coords: (%d,%d), size %dx%d\n", src.x, src.y, src.width, src.height ); SetLastError( ERROR_INVALID_PARAMETER ); diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index cee9204..68e9c9a 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -609,6 +609,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) dc->vis_rect.top = 0; dc->vis_rect.right = bitmap->dib.dsBm.bmWidth; dc->vis_rect.bottom = bitmap->dib.dsBm.bmHeight; + dc->device_rect = dc->vis_rect; GDI_ReleaseObj( handle ); DC_InitDC( dc ); GDI_dec_ref_count( ret ); diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index c413e1a..1cb420c 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -29,15 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipping); -/* return the DC visible rectangle if not empty */ -static inline BOOL get_dc_visrect( DC *dc, RECT *rect ) +/* return the DC device rectangle if not empty */ +static inline BOOL get_dc_device_rect( DC *dc, RECT *rect ) { - if (dc->header.type != OBJ_MEMDC) return FALSE; - rect->left = 0; - rect->top = 0; - rect->right = dc->vis_rect.right - dc->vis_rect.left; - rect->bottom = dc->vis_rect.bottom - dc->vis_rect.top; - return TRUE; + *rect = dc->device_rect; + offset_rect( rect, -dc->vis_rect.left, -dc->vis_rect.top ); + return !is_rect_empty( rect ); } /*********************************************************************** @@ -64,6 +61,20 @@ static inline RECT get_clip_rect( DC * dc, int left, int top, int right, int bot } /*********************************************************************** + * clip_device_rect + * + * Clip a rectangle to the whole DC surface. + */ +BOOL clip_device_rect( DC *dc, RECT *dst, const RECT *src ) +{ + RECT clip; + + if (get_dc_device_rect( dc, &clip )) return intersect_rect( dst, src, &clip ); + *dst = *src; + return TRUE; +} + +/*********************************************************************** * clip_visrect * * Clip a rectangle to the DC visible rect. @@ -72,11 +83,9 @@ BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) { RECT clip; - if (get_dc_visrect( dc, &clip )) intersect_rect( dst, src, &clip ); - else *dst = *src; - - if (GetRgnBox( get_dc_region(dc), &clip )) intersect_rect( dst, dst, &clip ); - return !is_rect_empty( dst ); + if (!clip_device_rect( dc, dst, src )) return FALSE; + if (GetRgnBox( get_dc_region(dc), &clip )) return intersect_rect( dst, dst, &clip ); + return TRUE; } /*********************************************************************** @@ -117,7 +126,7 @@ static inline void create_default_clip_region( DC * dc ) { RECT rect; - if (!get_dc_visrect( dc, &rect )) + if (!get_dc_device_rect( dc, &rect )) { rect.left = 0; rect.top = 0; @@ -361,7 +370,7 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) pt.y = y; LPtoDP( hdc, &pt, 1 ); update_dc( dc ); - ret = (!get_dc_visrect( dc, &visrect ) || + ret = (!get_dc_device_rect( dc, &visrect ) || (pt.x >= visrect.left && pt.x < visrect.right && pt.y >= visrect.top && pt.y < visrect.bottom)); if (ret && get_dc_region( dc )) ret = PtInRegion( get_dc_region( dc ), pt.x, pt.y ); @@ -385,7 +394,7 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) LPtoDP( hdc, (POINT *)&tmpRect, 2 ); update_dc( dc ); - ret = (!get_dc_visrect( dc, &visrect ) || intersect_rect( &visrect, &visrect, &tmpRect )); + ret = (!get_dc_device_rect( dc, &visrect ) || intersect_rect( &visrect, &visrect, &tmpRect )); if (ret && get_dc_region( dc )) ret = RectInRegion( get_dc_region( dc ), &tmpRect ); release_dc_ptr( dc ); return ret; @@ -406,7 +415,7 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) if (get_dc_region( dc )) { ret = GetRgnBox( get_dc_region( dc ), rect ); - if (get_dc_visrect( dc, &visrect ) && !intersect_rect( rect, rect, &visrect )) + if (get_dc_device_rect( dc, &visrect ) && !intersect_rect( rect, rect, &visrect )) ret = NULLREGION; } else @@ -492,7 +501,6 @@ INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn ) INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) { INT ret = 1; - RECT visrect; DC *dc = get_dc_ptr( hDC ); if (!dc) return -1; @@ -516,13 +524,16 @@ INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) case SYSRGN: /* == 4 */ update_dc( dc ); if (dc->hVisRgn) + { CombineRgn( hRgn, dc->hVisRgn, 0, RGN_COPY ); - else if (get_dc_visrect( dc, &visrect )) - SetRectRgn( hRgn, visrect.left, visrect.top, visrect.right, visrect.bottom ); + /* On Windows NT/2000, the SYSRGN returned is in screen coordinates */ + if (!(GetVersion() & 0x80000000)) OffsetRgn( hRgn, dc->vis_rect.left, dc->vis_rect.top ); + } + else if (!is_rect_empty( &dc->device_rect )) + SetRectRgn( hRgn, dc->device_rect.left, dc->device_rect.top, + dc->device_rect.right, dc->device_rect.bottom ); else ret = 0; - /* On Windows NT/2000, the SYSRGN returned is in screen coordinates */ - if (ret && !(GetVersion() & 0x80000000)) OffsetRgn( hRgn, dc->vis_rect.left, dc->vis_rect.top ); break; default: WARN("Unknown code %d\n", iCode); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 33c1033..95dd3e2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -698,6 +698,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) dc->vis_rect.top = 0; dc->vis_rect.right = 1; dc->vis_rect.bottom = 1; + dc->device_rect = dc->vis_rect; ret = dc->hSelf; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index d8d283e..f7e08a5 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1624,6 +1624,7 @@ static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) dc->vis_rect.top = 0; dc->vis_rect.right = bitmap->dib.dsBm.bmWidth; dc->vis_rect.bottom = bitmap->dib.dsBm.bmHeight; + dc->device_rect = dc->vis_rect; GDI_ReleaseObj( handle ); DC_InitDC( dc ); GDI_dec_ref_count( ret ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 20b522d..2589238 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -104,6 +104,7 @@ typedef struct tagDC SIZE virtual_res; /* Initially HORZRES,VERTRES. Changed by SetVirtualResolution */ SIZE virtual_size; /* Initially HORZSIZE,VERTSIZE. Changed by SetVirtualResolution */ RECT vis_rect; /* visible rectangle in screen coords */ + RECT device_rect; /* rectangle for the whole device */ FLOAT miterLimit; int flags; @@ -217,6 +218,7 @@ extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; /* clipping.c */ +extern BOOL clip_device_rect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN; extern BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN; extern void update_dc_clipping( DC * dc ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Always pass the actual coordinates to the get_pixel_ptr functions.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 025b58870ee9747d0f8473f0fe777d06f6038a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025b58870ee9747d0f8473f0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 14:24:43 2012 +0200 gdi32: Always pass the actual coordinates to the get_pixel_ptr functions. --- dlls/gdi32/dibdrv/primitives.c | 226 ++++++++++++++++++++-------------------- 1 files changed, 113 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=025b58870ee9747d0f847…

1 0