wine-commits September 2016

wine-commits@winehq.org

2 participants
430 discussions

Sebastian Lackner : vcomp: Implement _vcomp_reduction_{u, i}2 and add tests.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 86dea350eac15f7dd8a276d937e3c087a8f6bfc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86dea350eac15f7dd8a276d93… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 10:56:08 2016 +0200 vcomp: Implement _vcomp_reduction_{u,i}2 and add tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 30 +++++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp120/vcomp120.spec | 4 ++-- dlls/vcomp140/vcomp140.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 8 files changed, 91 insertions(+), 12 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 53ad28a..a3a29db 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -516,6 +516,36 @@ void CDECL _vcomp_atomic_xor_i2(short *dest, short val) do old = *dest; while (interlocked_cmpxchg16(dest, old ^ val, old) != old); } +static void CDECL _vcomp_atomic_bool_and_i2(short *dest, short val) +{ + short old; + do old = *dest; while (interlocked_cmpxchg16(dest, old && val, old) != old); +} + +static void CDECL _vcomp_atomic_bool_or_i2(short *dest, short val) +{ + short old; + do old = *dest; while (interlocked_cmpxchg16(dest, old ? old : (val != 0), old) != old); +} + +void CDECL _vcomp_reduction_i2(unsigned int flags, short *dest, short val) +{ + static void (CDECL * const funcs[])(short *, short) = + { + _vcomp_atomic_add_i2, + _vcomp_atomic_add_i2, + _vcomp_atomic_mul_i2, + _vcomp_atomic_and_i2, + _vcomp_atomic_or_i2, + _vcomp_atomic_xor_i2, + _vcomp_atomic_bool_and_i2, + _vcomp_atomic_bool_or_i2, + }; + unsigned int op = (flags >> 8) & 0xf; + op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + funcs[op](dest, val); +} + void CDECL _vcomp_atomic_add_i4(int *dest, int val) { interlocked_xchg_add(dest, val); diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index dc84f98..5911601 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -103,7 +103,9 @@ static int (CDECL *p_vcomp_get_thread_num)(void); static void (CDECL *p_vcomp_leave_critsect)(CRITICAL_SECTION *critsect); static int (CDECL *p_vcomp_master_begin)(void); static void (CDECL *p_vcomp_master_end)(void); +static void (CDECL *p_vcomp_reduction_i2)(unsigned int flags, short *dest, short val); static void (CDECL *p_vcomp_reduction_i4)(unsigned int flags, int *dest, int val); +static void (CDECL *p_vcomp_reduction_u2)(unsigned int flags, unsigned short *dest, unsigned short val); static void (CDECL *p_vcomp_reduction_u4)(unsigned int flags, unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_sections_init)(int n); static int (CDECL *p_vcomp_sections_next)(void); @@ -346,7 +348,9 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_leave_critsect); VCOMP_GET_PROC(_vcomp_master_begin); VCOMP_GET_PROC(_vcomp_master_end); + VCOMP_GET_PROC(_vcomp_reduction_i2); VCOMP_GET_PROC(_vcomp_reduction_i4); + VCOMP_GET_PROC(_vcomp_reduction_u2); VCOMP_GET_PROC(_vcomp_reduction_u4); VCOMP_GET_PROC(_vcomp_sections_init); VCOMP_GET_PROC(_vcomp_sections_next); @@ -1883,6 +1887,50 @@ static void test_atomic_double(void) } } +static void test_reduction_integer16(void) +{ + struct + { + unsigned int flags; + short v1, v2, expected; + } + tests[] = + { + { 0x000, 0x1122, 0x7766, -0x7778 }, + { VCOMP_REDUCTION_FLAGS_ADD, 0x1122, 0x7766, -0x7778 }, + { VCOMP_REDUCTION_FLAGS_MUL, 0x1122, 0x7766, -0x5e74 }, + { VCOMP_REDUCTION_FLAGS_MUL, 0x1122, -0x7766, 0x5e74 }, + { VCOMP_REDUCTION_FLAGS_AND, 0x1122, 0x7766, 0x1122 }, + { VCOMP_REDUCTION_FLAGS_OR, 0x1122, 0x7766, 0x7766 }, + { VCOMP_REDUCTION_FLAGS_XOR, 0x1122, 0x7766, 0x6644 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 1, 2, 1 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 0, 2, 1 }, + { 0x800, 0, 2, 1 }, + { 0x900, 0, 2, 1 }, + { 0xa00, 0, 2, 1 }, + { 0xb00, 0, 2, 1 }, + { 0xc00, 0, 2, 1 }, + { 0xd00, 0, 2, 1 }, + { 0xe00, 0, 2, 1 }, + { 0xf00, 0, 2, 1 }, + }; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + short val = tests[i].v1; + p_vcomp_reduction_i2(tests[i].flags, &val, tests[i].v2); + ok(val == tests[i].expected, "test %d: expected val == %d, got %d\n", i, tests[i].expected, val); + } + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + unsigned short val = tests[i].v1; + p_vcomp_reduction_u2(tests[i].flags, &val, tests[i].v2); + ok(val == (unsigned short)tests[i].expected, + "test %d: expected val == %u, got %u\n", i, (unsigned short)tests[i].expected, val); + } +} + static void CDECL reduction_cb(int *a, int *b) { p_vcomp_reduction_i4(VCOMP_REDUCTION_FLAGS_ADD, a, 1); @@ -1989,6 +2037,7 @@ START_TEST(vcomp) test_atomic_integer64(); test_atomic_float(); test_atomic_double(); + test_reduction_integer16(); test_reduction_integer32(); release_vcomp(); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index ddb35b8..85df49e 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -74,13 +74,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) @ cdecl _vcomp_reduction_i4(long ptr long) @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) _vcomp_reduction_i2 @ cdecl _vcomp_reduction_u4(long ptr long) _vcomp_reduction_i4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 92f6a9d..49f5a1b 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -74,13 +74,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index cb2a21d..dd9537a 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -75,13 +75,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init diff --git a/dlls/vcomp120/vcomp120.spec b/dlls/vcomp120/vcomp120.spec index cb2a21d..dd9537a 100644 --- a/dlls/vcomp120/vcomp120.spec +++ b/dlls/vcomp120/vcomp120.spec @@ -75,13 +75,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init diff --git a/dlls/vcomp140/vcomp140.spec b/dlls/vcomp140/vcomp140.spec index cb2a21d..dd9537a 100644 --- a/dlls/vcomp140/vcomp140.spec +++ b/dlls/vcomp140/vcomp140.spec @@ -75,13 +75,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 92f6a9d..49f5a1b 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -74,13 +74,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init

1 0

Sebastian Lackner : vcomp: Implement _vcomp_reduction_{u, i}4 and add tests.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 96e0c994b232dcd1def407d006d488483252c152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e0c994b232dcd1def407d00… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 10:56:01 2016 +0200 vcomp: Implement _vcomp_reduction_{u,i}4 and add tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 30 ++++++++++++++ dlls/vcomp/tests/vcomp.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 +- dlls/vcomp100/vcomp100.spec | 4 +- dlls/vcomp110/vcomp110.spec | 4 +- dlls/vcomp120/vcomp120.spec | 4 +- dlls/vcomp140/vcomp140.spec | 4 +- dlls/vcomp90/vcomp90.spec | 4 +- 8 files changed, 137 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96e0c994b232dcd1def40…

1 0

Bruno Jesus : ws2_32/tests: Add non-interactive SIO_ADDRESS_LIST_CHANGE tests.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 9a66463256b534a8c5608ffd32b3c55da37e8e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a66463256b534a8c5608ffd3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 6 23:46:18 2016 -0300 ws2_32/tests: Add non-interactive SIO_ADDRESS_LIST_CHANGE tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 105 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 98 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2640dd4..98ff7c7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8336,17 +8336,11 @@ static void test_sioAddressListChange(void) struct in_addr net_address; WSAOVERLAPPED overlapped; struct hostent *h; - DWORD num_bytes; + DWORD num_bytes, error; SOCKET sock; int acount; int ret; - if (!winetest_interactive) - { - skip("Cannot test SIO_ADDRESS_LIST_CHANGE, interactive tests must be enabled\n"); - return; - } - /* Use gethostbyname to find the list of local network interfaces */ h = gethostbyname(""); if (!h) @@ -8361,8 +8355,105 @@ static void test_sioAddressListChange(void) skip("Cannot test SIO_ADDRESS_LIST_CHANGE, test requires a network card.\n"); return; } + net_address.s_addr = *(ULONG *) h->h_addr_list[0]; + sock = socket(AF_INET, 0, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = net_address.s_addr; + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, FALSE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); +todo_wine + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + sock = socket(AF_INET, 0, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = net_address.s_addr; + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, TRUE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = net_address.s_addr; + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, FALSE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); +todo_wine + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = net_address.s_addr; + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, TRUE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + if (!winetest_interactive) + { + skip("Cannot test SIO_ADDRESS_LIST_CHANGE, interactive tests must be enabled\n"); + return; + } + /* Bind an overlapped socket to the first found network interface */ sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n");

1 0

Alexandre Julliard : winex11: Remove support for synthesizing clipboard formats.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 761d244970dd189b1a639121e668a5089fd0112d URL: http://source.winehq.org/git/wine.git/?a=commit;h=761d244970dd189b1a639121e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 11:35:14 2016 +0900 winex11: Remove support for synthesizing clipboard formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 454 ++------------------------------------ dlls/winex11.drv/winex11.drv.spec | 1 - 2 files changed, 14 insertions(+), 441 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=761d244970dd189b1a639…

1 0

Alexandre Julliard : user32: Synthesize bitmap clipboard formats on the user32 side.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 9a652e211c06d1a139f6105173a523450dbf9e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a652e211c06d1a139f610517… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 11:35:02 2016 +0900 user32: Synthesize bitmap clipboard formats on the user32 side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 122 ++++++++++++++++++++++++++++++++++++++---- dlls/user32/cursoricon.c | 2 +- dlls/user32/tests/clipboard.c | 18 ++----- dlls/user32/user_private.h | 1 + 4 files changed, 119 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a652e211c06d1a139f61…

1 0

Alexandre Julliard : user32: Synthesize metafile clipboard formats on the user32 side.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 199389845912b523a529f115b738b07f94e81f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199389845912b523a529f115b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 10:51:21 2016 +0900 user32: Synthesize metafile clipboard formats on the user32 side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 68 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/clipboard.c | 6 ++-- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 9383fe3..0fe5631 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -140,6 +140,16 @@ static void add_synthesized_text(void) } } +/* add synthesized metafile formats based on what is already in the clipboard */ +static void add_synthesized_metafile(void) +{ + BOOL has_mf = IsClipboardFormatAvailable( CF_METAFILEPICT ); + BOOL has_emf = IsClipboardFormatAvailable( CF_ENHMETAFILE ); + + if (!has_mf && has_emf) add_synthesized_format( CF_METAFILEPICT, CF_ENHMETAFILE ); + else if (!has_emf && has_mf) add_synthesized_format( CF_ENHMETAFILE, CF_METAFILEPICT ); +} + /* render synthesized ANSI text based on the contents of the 'from' format */ static HANDLE render_synthesized_textA( HANDLE data, UINT format, UINT from ) { @@ -190,6 +200,57 @@ static HANDLE render_synthesized_textW( HANDLE data, UINT from ) return ret; } +/* render a synthesized metafile based on the enhmetafile clipboard data */ +static HANDLE render_synthesized_metafile( HANDLE data ) +{ + HANDLE ret = 0; + UINT size; + void *bits; + METAFILEPICT *pict; + ENHMETAHEADER header; + HDC hdc = GetDC( 0 ); + + size = GetWinMetaFileBits( data, 0, NULL, MM_ISOTROPIC, hdc ); + if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) + { + if (GetEnhMetaFileHeader( data, sizeof(header), &header ) && + GetWinMetaFileBits( data, size, bits, MM_ISOTROPIC, hdc )) + { + if ((ret = GlobalAlloc( GMEM_FIXED, sizeof(*pict) ))) + { + pict = (METAFILEPICT *)ret; + pict->mm = MM_ISOTROPIC; + pict->xExt = header.rclFrame.right - header.rclFrame.left; + pict->yExt = header.rclFrame.bottom - header.rclFrame.top; + pict->hMF = SetMetaFileBitsEx( size, bits ); + } + } + HeapFree( GetProcessHeap(), 0, bits ); + } + ReleaseDC( 0, hdc ); + return ret; +} + +/* render a synthesized enhmetafile based on the metafile clipboard data */ +static HANDLE render_synthesized_enhmetafile( HANDLE data ) +{ + METAFILEPICT *pict; + HANDLE ret = 0; + UINT size; + void *bits; + + if (!(pict = GlobalLock( data ))) return 0; + + size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); + if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) + { + GetMetaFileBitsEx( pict->hMF, size, bits ); + ret = SetWinMetaFileBits( size, bits, NULL, pict ); + HeapFree( GetProcessHeap(), 0, bits ); + } + return ret; +} + /* render a synthesized format */ static HANDLE render_synthesized_format( UINT format, UINT from ) { @@ -207,6 +268,12 @@ static HANDLE render_synthesized_format( UINT format, UINT from ) case CF_UNICODETEXT: data = render_synthesized_textW( data, from ); break; + case CF_METAFILEPICT: + data = render_synthesized_metafile( data ); + break; + case CF_ENHMETAFILE: + data = render_synthesized_enhmetafile( data ); + break; default: assert( 0 ); } @@ -338,6 +405,7 @@ BOOL WINAPI CloseClipboard(void) { memset( synthesized_formats, 0, sizeof(synthesized_formats) ); add_synthesized_text(); + add_synthesized_metafile(); } SERVER_START_REQ( close_clipboard ) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index c674c9d..4c00361 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -665,7 +665,7 @@ static void test_synthesized(void) cf = EnumClipboardFormats(cf); ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); data = GetClipboardData(cf); - todo_wine ok(data != NULL, "couldn't get data, cf %08x\n", cf); + ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); ok(cf == 0, "cf %08x\n", cf); @@ -756,7 +756,6 @@ static void test_synthesized(void) i, j, cf, tests[i].expected[j] ); if (cf != tests[i].expected[j]) break; data = GetClipboardData( cf ); - todo_wine_if (j && cf == CF_METAFILEPICT) ok(data != NULL || broken( tests[i].format == CF_DIBV5 && cf == CF_DIB ), /* >= Vista */ "%u: couldn't get data, cf %04x err %d\n", i, cf, GetLastError()); @@ -830,13 +829,12 @@ static void test_synthesized(void) else { ok(!data, "%u: format %04x got data %p\n", i, cf, data); - todo_wine_if( tests[i].format == CF_ENHMETAFILE && tests[i].expected[j] == CF_METAFILEPICT ) ok( rendered == (1 << tests[i].format), "%u.%u: formats %08x have been rendered\n", i, j, rendered ); /* try to render a second time */ data = GetClipboardData( cf ); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - todo_wine_if( i > 2 && j == 1 ) + todo_wine_if( i > 4 && j == 1 ) ok( rendered == (1 << tests[i].format), "%u.%u: formats %08x have been rendered\n", i, j, rendered ); }

1 0

Akihiro Sagawa : imm32: Set the default IME window title and styles as in native.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 686369022d4b54d8eccaa9f76f53c0943634cdc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=686369022d4b54d8eccaa9f76… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 7 00:04:45 2016 +0900 imm32: Set the default IME window title and styles as in native. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 6 ++++-- dlls/imm32/tests/imm32.c | 9 +++++++++ dlls/user32/misc.c | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 495d476..3f8ad18 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -109,6 +109,7 @@ static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; static const WCHAR szwIME[] = {'I','M','E',0}; +static const WCHAR szwDefaultIME[] = {'D','e','f','a','u','l','t',' ','I','M','E',0}; static CRITICAL_SECTION threaddata_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -1662,8 +1663,9 @@ BOOL WINAPI __wine_register_window(HWND hwnd) { /* Do not create the window inside of a critical section */ LeaveCriticalSection(&threaddata_cs); - new = CreateWindowExW( WS_EX_TOOLWINDOW, - szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0); + new = CreateWindowExW( 0, szwIME, szwDefaultIME, + WS_POPUP | WS_DISABLED | WS_CLIPSIBLINGS, + 0, 0, 1, 1, 0, 0, 0, 0); /* thread_data is in the current thread so we can assume it's still valid */ EnterCriticalSection(&threaddata_cs); /* See if anyone beat us */ diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 8e45efb..a2072e9 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -866,6 +866,8 @@ static void test_ImmDefaultHwnd(void) HWND def1, def3; HANDLE thread; HWND hwnd; + char title[16]; + LONG style; hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, @@ -882,6 +884,13 @@ static void test_ImmDefaultHwnd(void) def1 = ImmGetDefaultIMEWnd(hwnd); + GetWindowTextA(def1, title, sizeof(title)); + ok(!strcmp(title, "Default IME"), "got %s\n", title); + style = GetWindowLongA(def1, GWL_STYLE); + ok(style == (WS_DISABLED | WS_POPUP | WS_CLIPSIBLINGS), "got %08x\n", style); + style = GetWindowLongA(def1, GWL_EXSTYLE); + ok(style == 0, "got %08x\n", style); + imc2 = ImmCreateContext(); ImmSetOpenStatus(imc2, TRUE); diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 1e60e0d..beed6aa 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -882,7 +882,7 @@ LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { HWND uiwnd; - if (msg==WM_CREATE || msg==WM_NCCREATE) + if (msg==WM_CREATE) return TRUE; if (imm_get_ui_window && is_ime_ui_msg(msg)) @@ -899,7 +899,7 @@ LRESULT WINAPI ImeWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { HWND uiwnd; - if (msg==WM_CREATE || msg==WM_NCCREATE) + if (msg==WM_CREATE) return TRUE; if (imm_get_ui_window && is_ime_ui_msg(msg))

1 0

Nikolay Sivov : dbghelp: Support CIE version 4 in parse_cie_details().
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: ab27cb48fc6bc0a11bff05f0be49b8befc3718e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab27cb48fc6bc0a11bff05f0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 7 01:43:27 2016 +0300 dbghelp: Support CIE version 4 in parse_cie_details(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index dcbcf0a..3fd1920 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2641,7 +2641,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* /* parse the CIE first */ version = dwarf2_parse_byte(ctx); - if (version != 1 && version != 3) + if (version != 1 && version != 3 && version != 4) { FIXME("unknown CIE version %u at %p\n", version, ctx->data - 1); return FALSE; @@ -2649,12 +2649,21 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* augmentation = (const char*)ctx->data; ctx->data += strlen(augmentation) + 1; - info->code_align = dwarf2_leb128_as_unsigned(ctx); - info->data_align = dwarf2_leb128_as_signed(ctx); - if (version == 1) - info->retaddr_reg = dwarf2_parse_byte(ctx); - else - info->retaddr_reg = dwarf2_leb128_as_unsigned(ctx); + switch (version) + { + case 4: + /* skip 'address_size' and 'segment_size' */ + ctx->data += 2; + /* fallthrough */ + case 1: + case 3: + info->code_align = dwarf2_leb128_as_unsigned(ctx); + info->data_align = dwarf2_leb128_as_signed(ctx); + info->retaddr_reg = version == 1 ? dwarf2_parse_byte(ctx) :dwarf2_leb128_as_unsigned(ctx); + break; + default: + ; + } info->state.cfa_rule = RULE_CFA_OFFSET; end = NULL;

1 0

Bruno Jesus : dinput: Only complain for unsupported effect envelope if it really is useful.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: f85e7d17167760080f31aaec39632c18ed5b7f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85e7d17167760080f31aaec3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 6 15:32:52 2016 -0300 dinput: Only complain for unsupported effect envelope if it really is useful. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 1015105..fe3334a 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -585,7 +585,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( env->fade_length = 0; env->fade_level = 0; } - else + else if(peff->lpEnvelope->dwAttackTime || peff->lpEnvelope->dwAttackLevel || + peff->lpEnvelope->dwFadeTime || peff->lpEnvelope->dwFadeLevel) WARN("Ignoring dinput envelope not supported in the linux effect\n"); }

1 0

Bruno Jesus : ws2_32: Debug the ioctl code name whenever possible.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 048964b40e1518c985e907d99ec606b4dd619444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=048964b40e1518c985e907d99… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 6 15:30:35 2016 -0300 ws2_32: Debug the ioctl code name whenever possible. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 68 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 59 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 79ccfc2..ccd50f8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4393,11 +4393,61 @@ char* WINAPI WS_inet_ntoa(struct WS_in_addr in) return data->ntoa_buffer; } -static const char *debugstr_wsaioctl(DWORD ioctl) +static const char *debugstr_wsaioctl(DWORD code) { - const char *buf_type, *family; + const char *name = NULL, *buf_type, *family; - switch(ioctl & 0x18000000) +#define IOCTL_NAME(x) case x: name = #x; break + switch (code) + { + IOCTL_NAME(WS_FIONBIO); + IOCTL_NAME(WS_FIONREAD); + IOCTL_NAME(WS_SIOCATMARK); + /* IOCTL_NAME(WS_SIO_ACQUIRE_PORT_RESERVATION); */ + IOCTL_NAME(WS_SIO_ADDRESS_LIST_CHANGE); + IOCTL_NAME(WS_SIO_ADDRESS_LIST_QUERY); + IOCTL_NAME(WS_SIO_ASSOCIATE_HANDLE); + /* IOCTL_NAME(WS_SIO_ASSOCIATE_PORT_RESERVATION); + IOCTL_NAME(WS_SIO_BASE_HANDLE); + IOCTL_NAME(WS_SIO_BSP_HANDLE); + IOCTL_NAME(WS_SIO_BSP_HANDLE_SELECT); + IOCTL_NAME(WS_SIO_BSP_HANDLE_POLL); + IOCTL_NAME(WS_SIO_CHK_QOS); */ + IOCTL_NAME(WS_SIO_ENABLE_CIRCULAR_QUEUEING); + IOCTL_NAME(WS_SIO_FIND_ROUTE); + IOCTL_NAME(WS_SIO_FLUSH); + IOCTL_NAME(WS_SIO_GET_BROADCAST_ADDRESS); + IOCTL_NAME(WS_SIO_GET_EXTENSION_FUNCTION_POINTER); + IOCTL_NAME(WS_SIO_GET_GROUP_QOS); + IOCTL_NAME(WS_SIO_GET_INTERFACE_LIST); + /* IOCTL_NAME(WS_SIO_GET_INTERFACE_LIST_EX); */ + IOCTL_NAME(WS_SIO_GET_QOS); + /* IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_CHANGE); + IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_QUERY); */ + IOCTL_NAME(WS_SIO_KEEPALIVE_VALS); + IOCTL_NAME(WS_SIO_MULTIPOINT_LOOPBACK); + IOCTL_NAME(WS_SIO_MULTICAST_SCOPE); + /* IOCTL_NAME(WS_SIO_QUERY_RSS_SCALABILITY_INFO); + IOCTL_NAME(WS_SIO_QUERY_WFP_ALE_ENDPOINT_HANDLE); */ + IOCTL_NAME(WS_SIO_RCVALL); + IOCTL_NAME(WS_SIO_RCVALL_IGMPMCAST); + IOCTL_NAME(WS_SIO_RCVALL_MCAST); + /* IOCTL_NAME(WS_SIO_RELEASE_PORT_RESERVATION); */ + IOCTL_NAME(WS_SIO_ROUTING_INTERFACE_CHANGE); + IOCTL_NAME(WS_SIO_ROUTING_INTERFACE_QUERY); + IOCTL_NAME(WS_SIO_SET_COMPATIBILITY_MODE); + IOCTL_NAME(WS_SIO_SET_GROUP_QOS); + IOCTL_NAME(WS_SIO_SET_QOS); + IOCTL_NAME(WS_SIO_TRANSLATE_HANDLE); + IOCTL_NAME(WS_SIO_UDP_CONNRESET); + } +#undef IOCTL_NAME + + if (name) + return name + 3; + + /* If this is not a known code split its bits */ + switch(code & 0x18000000) { case WS_IOC_WS2: family = "IOC_WS2"; @@ -4410,12 +4460,12 @@ static const char *debugstr_wsaioctl(DWORD ioctl) break; default: /* WS_IOC_UNIX */ { - BYTE size = (ioctl >> 16) & WS_IOCPARM_MASK; - char x = (ioctl & 0xff00) >> 8; - BYTE y = ioctl & 0xff; + BYTE size = (code >> 16) & WS_IOCPARM_MASK; + char x = (code & 0xff00) >> 8; + BYTE y = code & 0xff; char args[14]; - switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) + switch (code & (WS_IOC_VOID|WS_IOC_INOUT)) { case WS_IOC_VOID: buf_type = "_IO"; @@ -4439,7 +4489,7 @@ static const char *debugstr_wsaioctl(DWORD ioctl) } /* We are different from WS_IOC_UNIX. */ - switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) + switch (code & (WS_IOC_VOID|WS_IOC_INOUT)) { case WS_IOC_VOID: buf_type = "_WSAIO"; @@ -4459,7 +4509,7 @@ static const char *debugstr_wsaioctl(DWORD ioctl) } return wine_dbg_sprintf("%s(%s, %d)", buf_type, family, - (USHORT)(ioctl & 0xffff)); + (USHORT)(code & 0xffff)); } /* do an ioctl call through the server */

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2016