November 2018 - Wine-Commits

Zebediah Figura : xinput: Avoid calling XInputGetStateEx() in XInputGetState().
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: b72da1fdef65ced62c8d7bf6813cc11ca364528c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72da1fdef65ced62c8d7bf6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 18 13:15:40 2018 -0600 xinput: Avoid calling XInputGetStateEx() in XInputGetState(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46142 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput_main.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 56bb36a..f6e3e15 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -85,13 +85,31 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) return HID_set_state(&controllers[index], vibration); } +/* Some versions of SteamOverlayRenderer hot-patch XInputGetStateEx() and call + * XInputGetState() in the hook, so we need a wrapper. */ +static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) +{ + HID_find_gamepads(controllers); + + if (index >= XUSER_MAX_COUNT) + return ERROR_BAD_ARGUMENTS; + if (!controllers[index].connected) + return ERROR_DEVICE_NOT_CONNECTED; + + HID_update_state(&controllers[index]); + memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); + + return ERROR_SUCCESS; +} + + DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { DWORD ret; TRACE("(index %u, state %p)!\n", index, state); - ret = XInputGetStateEx(index, state); + ret = xinput_get_state(index, state); if (ret != ERROR_SUCCESS) return ret; @@ -105,17 +123,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state { TRACE("(index %u, state %p)!\n", index, state); - HID_find_gamepads(controllers); - - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) - return ERROR_DEVICE_NOT_CONNECTED; - - HID_update_state(&controllers[index]); - memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); - - return ERROR_SUCCESS; + return xinput_get_state(index, state); } DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke)

1 0

Zebediah Figura : ntdll: Don't write more IOCP entries than requested.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: e09248d3633522474c11e733238f5fd01a3e4f70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e09248d3633522474c11e733… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 17 20:06:17 2018 -0600 ntdll: Don't write more IOCP entries than requested. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45948 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3037e58..0c373a4 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1351,7 +1351,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE port, FILE_IO_COMPLETION_INFORMAT for (;;) { - for (;;) + while (i < count) { SERVER_START_REQ( remove_completion ) { @@ -1368,7 +1368,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE port, FILE_IO_COMPLETION_INFORMAT if (ret != STATUS_SUCCESS) break; - if (i++ >= count) break; + ++i; } if (i || ret != STATUS_PENDING)

1 0

Zebediah Figura : ntdll: Only wait on the completion port if no entries were returned.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: fbde01335fef80d36975adbc9e2de9f382d57874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbde01335fef80d36975adbc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 17 20:06:16 2018 -0600 ntdll: Only wait on the completion port if no entries were returned. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a00a159..3037e58 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1371,9 +1371,10 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE port, FILE_IO_COMPLETION_INFORMAT if (i++ >= count) break; } - if (i && ret == STATUS_PENDING) + if (i || ret != STATUS_PENDING) { - ret = STATUS_SUCCESS; + if (ret == STATUS_PENDING) + ret = STATUS_SUCCESS; break; }

1 0

Andre Heider : Revert "include: Use the ARRAY_SIZE() macro in debug.h.".
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 6d4d8f2ea0a53dd3d9259bde95a73422963a2dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d4d8f2ea0a53dd3d9259bde… Author: Andre Heider <a.heider(a)gmail.com> Date: Sun Nov 18 18:26:21 2018 +0100 Revert "include: Use the ARRAY_SIZE() macro in debug.h.". This reverts commit af3992374e530a037e650b45194f933c5406038f. wine/debug.h is a public header, and ARRAY_SIZE() is not defined for external projects. Signed-off-by: Andre Heider <a.heider(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 066873a..fb0d6bb 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -254,7 +254,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) if (vt & ~VT_TYPEMASK) return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); - if (vt < ARRAY_SIZE(variant_types)) + if (vt < sizeof(variant_types)/sizeof(*variant_types)) return variant_types[vt]; if (vt == VT_BSTR_BLOB)

1 0

Zebediah Figura : rpcrt4: Handle large arrays in EmbeddedComplexSize().
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: c94314085c4e7654f87172d9ad0a2b991d2b51ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c94314085c4e7654f87172d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 16 21:58:43 2018 -0600 rpcrt4: Handle large arrays in EmbeddedComplexSize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 82cc064..38ead96 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2765,6 +2765,9 @@ static ULONG EmbeddedComplexSize(MIDL_STUB_MESSAGE *pStubMsg, case FC_SMVARRAY: case FC_CSTRING: return *(const WORD*)&pFormat[2]; + case FC_LGFARRAY: + case FC_LGVARRAY: + return *(const ULONG*)&pFormat[2]; case FC_USER_MARSHAL: return *(const WORD*)&pFormat[4]; case FC_RANGE: {

1 0

Zebediah Figura : stdole2: Avoid defining Automation typedefs as part of the public library.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 247ae9838ff4ef575d329c8f8f47db01f341d03e URL: https://source.winehq.org/git/wine.git/?a=commit;h=247ae9838ff4ef575d329c8f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 18 14:35:51 2018 -0600 stdole2: Avoid defining Automation typedefs as part of the public library. This fixes a regression introduced by 70e5d5fd2e8501f36e4f3b2bccbdc55e25d31ee4. If the VARIANT struct is defined inside the library block, widl generates typeinfo for it at index 0. This confuses typelibs that import stdole2.tlb. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45949 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/stdole2.idl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index d372384..b659070 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -25,6 +25,17 @@ #include <olectl.h> +/* These typedefs need to have the same size as their real counterparts. */ +typedef short VARIANT_BOOL; +typedef void *BSTR; +typedef double CURRENCY; +typedef unsigned long HRESULT; +typedef struct { + short word1, word2, word3, word4; + void *ptr1, *ptr2; +} VARIANT; +typedef unsigned long SCODE; + [ uuid(00020430-0000-0000-C000-000000000046), version(2.0), @@ -32,17 +43,6 @@ ] library stdole { - /* These typedefs need to have the same size as their real counterparts. */ - typedef short VARIANT_BOOL; - typedef void *BSTR; - typedef double CURRENCY; - typedef unsigned long HRESULT; - typedef struct { - short word1, word2, word3, word4; - void *ptr1, *ptr2; - } VARIANT; - typedef unsigned long SCODE; - typedef struct GUID { unsigned long Data1; unsigned short Data2;

1 0

André Hentschel : kernel32: Add stub case for ARM64 in GetSystemInfo.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 014f9c09294dd3945dc4e943e697ae52c3f2c844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=014f9c09294dd3945dc4e943… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 16 22:51:18 2018 +0100 kernel32: Add stub case for ARM64 in GetSystemInfo. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46092 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 89482a6..84385c7 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -157,6 +157,9 @@ VOID WINAPI GetSystemInfo( default: si->dwProcessorType = PROCESSOR_ARM920; } break; + case PROCESSOR_ARCHITECTURE_ARM64: + si->dwProcessorType = 0; + break; default: FIXME("Unknown processor architecture %x\n", sci.Architecture); si->dwProcessorType = 0;

1 0

Zebediah Figura : ntdll/tests: Add more tests for NtRemoveIoCompletionEx() .
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 9badb7807f6f9d534c53a0952d10f5c855f45bc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9badb7807f6f9d534c53a095… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 17 20:06:18 2018 -0600 ntdll/tests: Add more tests for NtRemoveIoCompletionEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 56a438b..dcea45e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -955,6 +955,32 @@ static void test_set_io_completion(void) info[1].IoStatusBlock.Information ); ok( U(info[1].IoStatusBlock).Status == 56, "wrong status %#x\n", U(info[1].IoStatusBlock).Status); + res = pNtSetIoCompletion( h, 123, 456, 789, size ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res ); + + res = pNtSetIoCompletion( h, 12, 34, 56, size ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res ); + + count = 0xdeadbeef; + res = pNtRemoveIoCompletionEx( h, info, 1, &count, NULL, FALSE ); + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res ); + ok( count == 1, "wrong count %u\n", count ); + ok( info[0].CompletionKey == 123, "wrong key %#lx\n", info[0].CompletionKey ); + ok( info[0].CompletionValue == 456, "wrong value %#lx\n", info[0].CompletionValue ); + ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n", + info[0].IoStatusBlock.Information ); + ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#x\n", U(info[0].IoStatusBlock).Status); + + count = 0xdeadbeef; + res = pNtRemoveIoCompletionEx( h, info, 1, &count, NULL, FALSE ); + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res ); + ok( count == 1, "wrong count %u\n", count ); + ok( info[0].CompletionKey == 12, "wrong key %#lx\n", info[0].CompletionKey ); + ok( info[0].CompletionValue == 34, "wrong value %#lx\n", info[0].CompletionValue ); + ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n", + info[0].IoStatusBlock.Information ); + ok( U(info[0].IoStatusBlock).Status == 56, "wrong status %#x\n", U(info[0].IoStatusBlock).Status); + apc_count = 0; QueueUserAPC( user_apc_proc, GetCurrentThread(), (ULONG_PTR)&apc_count );

1 0

Alistair Leslie-Hughes : ws2_32: Ignore a SO_SNDBUF value of 0 on macOS.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: e7fd1ac3b265f2f86ec832268dbbc5425b78ecfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7fd1ac3b265f2f86ec83226… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 19 09:33:31 2018 +0100 ws2_32: Ignore a SO_SNDBUF value of 0 on macOS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40264 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df068fe..2ac6b9f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5808,6 +5808,17 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, optlen = sizeof(struct linger); break; + case WS_SO_SNDBUF: + if (!*(const int *)optval) + { + FIXME("SO_SNDBUF ignoring request to disable send buffering\n"); +#ifdef __APPLE__ + return 0; +#endif + } + convert_sockopt(&level, &optname); + break; + case WS_SO_RCVBUF: if (*(const int*)optval < 2048) { @@ -5828,7 +5839,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, * however, using it the BSD way fixes bug 8513 and seems to be what * most programmers assume, anyway */ case WS_SO_REUSEADDR: - case WS_SO_SNDBUF: case WS_SO_TYPE: convert_sockopt(&level, &optname); break;

1 0

Francois Gouget : testbot: Build VMs expect their missions to be a list of builds.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: tools Branch: master Commit: 6cab1726931dac09c043a5bd86e90209c15fc294 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6cab1726931dac09c043a5b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 19 16:36:55 2018 +0100 testbot: Build VMs expect their missions to be a list of builds. So replace 'build' with the actual builds that should be run. A consequence is that build VMs too may have more than one mission since they can build both exe32 and exe64 binaries in one go. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e7cd277..6a08bc1 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -315,7 +315,7 @@ sub PutColValue($$$) } my $_SupportedMissions = { - "build" => { "build" => 1 }, + "build" => { "exe32" => 1, "exe64" => 1 }, "win32" => { "exe32" => 1 }, "win64" => { "exe32" => 1, "exe64" => 1 }, "wine" => { "win32" => 1, "wow32" => 1, "wow64" => 1 }, @@ -336,9 +336,10 @@ sub Validate($) return ("Missions", $ErrMessage) if (defined $ErrMessage); foreach my $TaskMissions (@$Missions) { - if ($self->Type ne "wine" and @{$TaskMissions->{Missions}} > 1) + if ($self->Type !~ /^(?:build|wine)$/ and + @{$TaskMissions->{Missions}} > 1) { - return ("Missions", "Only wine VMs can handle more than one mission per task"); + return ("Missions", "Only the build and wine VMs can handle more than one mission per task"); } foreach my $Mission (@{$TaskMissions->{Missions}}) {

1 0