October 2021 - Wine-commits

Alexandre Julliard : tools: Avoid using wine/port.h.
by Alexandre Julliard 07 Oct '21

07 Oct '21

1 0

Alexandre Julliard : server: Avoid using wine/port.h.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: c954e5b9e6a6ae47af515926ceebbdf46ca9f4bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c954e5b9e6a6ae47af515926… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 14:38:40 2021 +0200 server: Avoid using wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 1 - server/change.c | 2 +- server/class.c | 1 - server/clipboard.c | 1 - server/completion.c | 1 - server/console.c | 1 - server/debugger.c | 1 - server/device.c | 3 +-- server/directory.c | 1 - server/event.c | 1 - server/fd.c | 1 - server/file.c | 1 - server/handle.c | 1 - server/hook.c | 1 - server/mach.c | 1 - server/mailslot.c | 8 ++++---- server/mapping.c | 3 ++- server/mutex.c | 1 - server/named_pipe.c | 1 - server/object.c | 1 - server/process.c | 3 ++- server/ptrace.c | 1 - server/queue.c | 2 +- server/registry.c | 1 - server/request.c | 1 - server/semaphore.c | 1 - server/serial.c | 1 - server/symlink.c | 1 - server/thread.c | 2 +- server/timer.c | 1 - server/trace.c | 1 - server/unicode.c | 3 ++- server/window.c | 1 - server/winstation.c | 1 - 34 files changed, 14 insertions(+), 38 deletions(-) diff --git a/server/atom.c b/server/atom.c index 8d0ffbb05f3..ff0799f5880 100644 --- a/server/atom.c +++ b/server/atom.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/server/change.c b/server/change.c index 5edeebf89d3..4fdb0394922 100644 --- a/server/change.c +++ b/server/change.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <fcntl.h> @@ -32,6 +31,7 @@ #include <limits.h> #include <dirent.h> #include <errno.h> +#include <unistd.h> #ifdef HAVE_POLL_H # include <poll.h> #endif diff --git a/server/class.c b/server/class.c index 92cbfa2d7e3..e1e180bd97c 100644 --- a/server/class.c +++ b/server/class.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/server/clipboard.c b/server/clipboard.c index eb9bd4f7020..8118a467dd8 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/server/completion.c b/server/completion.c index eb0d256ad09..6933195e72d 100644 --- a/server/completion.c +++ b/server/completion.c @@ -27,7 +27,6 @@ */ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> diff --git a/server/console.c b/server/console.c index 3a5b1270116..977c428cf9f 100644 --- a/server/console.c +++ b/server/console.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <string.h> diff --git a/server/debugger.c b/server/debugger.c index ca84a88258f..48adb244b09 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <signal.h> diff --git a/server/device.c b/server/device.c index f61f24ea4ea..d6288920bf4 100644 --- a/server/device.c +++ b/server/device.c @@ -19,8 +19,6 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/rbtree.h" #include <assert.h> #include <fcntl.h> @@ -33,6 +31,7 @@ #include "windef.h" #include "winternl.h" #include "ddk/wdm.h" +#include "wine/rbtree.h" #include "object.h" #include "file.h" diff --git a/server/directory.c b/server/directory.c index ec8187b425a..70a34d3f1bb 100644 --- a/server/directory.c +++ b/server/directory.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/event.c b/server/event.c index ccdd465dd5b..c7424dfe8ff 100644 --- a/server/event.c +++ b/server/event.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/fd.c b/server/fd.c index ad1b7a1bd4a..37e2eddeaba 100644 --- a/server/fd.c +++ b/server/fd.c @@ -20,7 +20,6 @@ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <dirent.h> diff --git a/server/file.c b/server/file.c index 08b0b59beb0..7cf6f3c0472 100644 --- a/server/file.c +++ b/server/file.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <fcntl.h> diff --git a/server/handle.c b/server/handle.c index 15da701ee99..6a5416bcb84 100644 --- a/server/handle.c +++ b/server/handle.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <limits.h> diff --git a/server/hook.c b/server/hook.c index c048908c295..5abdf39ad37 100644 --- a/server/hook.c +++ b/server/hook.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/mach.c b/server/mach.c index 20bc3878560..77f1fdcdb86 100644 --- a/server/mach.c +++ b/server/mach.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> diff --git a/server/mailslot.c b/server/mailslot.c index 1f4cb87d0fc..4048461a58f 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -21,9 +21,6 @@ */ #include "config.h" -#include "wine/port.h" -#include "ntstatus.h" -#define WIN32_NO_STATUS #include <assert.h> #include <fcntl.h> @@ -33,7 +30,7 @@ #include <stdlib.h> #include <sys/time.h> #include <sys/types.h> - +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif @@ -43,6 +40,9 @@ #ifdef HAVE_SYS_FILIO_H #include <sys/filio.h> #endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" diff --git a/server/mapping.c b/server/mapping.c index 8a53c2d89d3..93dae94b7c4 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -19,12 +19,13 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> #include <sys/stat.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> diff --git a/server/mutex.c b/server/mutex.c index 75ff5117d3f..906e1c060e9 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/named_pipe.c b/server/named_pipe.c index f964ae19637..6964ab1b2ee 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <string.h> diff --git a/server/object.c b/server/object.c index b2779fd61fe..e438a6d41ba 100644 --- a/server/object.c +++ b/server/object.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <limits.h> diff --git a/server/process.c b/server/process.c index 8109fbe8de4..d8d09698558 100644 --- a/server/process.c +++ b/server/process.c @@ -19,16 +19,17 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <limits.h> #include <signal.h> #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> #include <sys/time.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> diff --git a/server/ptrace.c b/server/ptrace.c index b2d23d89aaf..bcd0fe48f16 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> diff --git a/server/queue.c b/server/queue.c index e4903bcb79f..f38c7e9fb17 100644 --- a/server/queue.c +++ b/server/queue.c @@ -19,12 +19,12 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #ifdef HAVE_POLL_H # include <poll.h> #endif diff --git a/server/registry.c b/server/registry.c index 427da8a5883..4ba5c86ae58 100644 --- a/server/registry.c +++ b/server/registry.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> diff --git a/server/request.c b/server/request.c index 29b63600f15..4733cef6511 100644 --- a/server/request.c +++ b/server/request.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> diff --git a/server/semaphore.c b/server/semaphore.c index 543d5883ec8..6a8b871940f 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/serial.c b/server/serial.c index bdc27de8e4f..81926f6d412 100644 --- a/server/serial.c +++ b/server/serial.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <fcntl.h> diff --git a/server/symlink.c b/server/symlink.c index 3879bb685f7..fa97d9155fa 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/thread.c b/server/thread.c index 9d412106809..90f3c5492f8 100644 --- a/server/thread.c +++ b/server/thread.c @@ -19,8 +19,8 @@ */ #include "config.h" -#include "wine/port.h" +#define _GNU_SOURCE /* sched_affinity */ #include <assert.h> #include <errno.h> #include <fcntl.h> diff --git a/server/timer.c b/server/timer.c index 5e265d2ddf6..96dc9d00ca1 100644 --- a/server/timer.c +++ b/server/timer.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/trace.c b/server/trace.c index 11e3eb25da6..a007cb280f0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> #include <stdarg.h> diff --git a/server/unicode.c b/server/unicode.c index 55f9954f4f4..67698d7639c 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -19,11 +19,12 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> +#include <fcntl.h> #include <stdio.h> #include <stdarg.h> +#include <unistd.h> #include "windef.h" #include "winternl.h" diff --git a/server/window.c b/server/window.c index 3a88b7f34fa..c94c745bd3c 100644 --- a/server/window.c +++ b/server/window.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/winstation.c b/server/winstation.c index 61f9f77c73f..6f2dfcf4e31 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h>

1 0

Alexandre Julliard : configure: Use CROSSLDFLAGS as flags for cross-compiler tests.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: c7bd6865e7e9149aea3dfe56a407f6c5bcfcb0a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7bd6865e7e9149aea3dfe56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 17:08:51 2021 +0200 configure: Use CROSSLDFLAGS as flags for cross-compiler tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51849 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure b/configure index 7fdd2085ad1..2ef854b50a9 100755 --- a/configure +++ b/configure @@ -9621,6 +9621,7 @@ test -n "$CROSSCC" || CROSSCC="false" then ac_save_CC="$CC" saved_CFLAGS=$CFLAGS + saved_LDFLAGS=$LDFLAGS CROSSCFLAGS=${CROSSCFLAGS:-"-g -O2"} EXTRACROSSCFLAGS="-DWINE_CROSS_PE -Wall" @@ -9629,6 +9630,7 @@ test -n "$CROSSCC" || CROSSCC="false" CC="$CROSSCC" CFLAGS=$CROSSCFLAGS + LDFLAGS=$CROSSLDFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CROSSCC works" >&5 $as_echo_n "checking whether $CROSSCC works... " >&6; } if ${wine_cv_crosscc+:} false; then : @@ -10676,6 +10678,7 @@ fi fi CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS CC="$ac_save_CC" fi fi diff --git a/configure.ac b/configure.ac index d9935f63c3a..b17d1ab4c3d 100644 --- a/configure.ac +++ b/configure.ac @@ -951,12 +951,14 @@ then then ac_save_CC="$CC" saved_CFLAGS=$CFLAGS + saved_LDFLAGS=$LDFLAGS AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-"-g -O2"}) AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSS_PE -Wall") AC_SUBST(CROSSLDFLAGS) CC="$CROSSCC" CFLAGS=$CROSSCFLAGS + LDFLAGS=$CROSSLDFLAGS AC_CACHE_CHECK([whether $CROSSCC works], wine_cv_crosscc, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],[wine_cv_crosscc=yes],[wine_cv_crosscc=no])]) if test $wine_cv_crosscc = yes @@ -1051,6 +1053,7 @@ then fi CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS CC="$ac_save_CC" fi fi

1 0

Matteo Bruni : d3dcompiler/tests: Also accept broken HRESULT with d3dcompiler_46.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: ae1f9899bb06ff0998dcf6b446f6ea3354f14804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae1f9899bb06ff0998dcf6b4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 18:49:38 2021 +0200 d3dcompiler/tests: Also accept broken HRESULT with d3dcompiler_46. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 75f30e45dce..6d6173824a2 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -164,8 +164,8 @@ static void test_reflection_interfaces(void) expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); - /* Broken with older d3dcompiler_47. */ - ok(hr == expected_hr || broken(expected_hr == S_OK && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + /* Broken with older d3dcompiler_46, d3dcompiler_47. */ + ok(hr == expected_hr || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); if (hr != S_OK) return;

1 0

Matteo Bruni : ntdll: Implement NtYieldExecution() as usleep().
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: b1a79c6b9c3ada0c34b1411b60879962f1815e4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a79c6b9c3ada0c34b1411b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 15:53:57 2021 +0200 ntdll: Implement NtYieldExecution() as usleep(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/ntdll/unix/sync.c | 6 +----- include/config.h.in | 3 --- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configure b/configure index 2ef854b50a9..877c62d9647 100755 --- a/configure +++ b/configure @@ -17913,7 +17913,6 @@ for ac_func in \ posix_fallocate \ prctl \ proc_pidinfo \ - sched_yield \ setproctitle \ setprogname \ sigprocmask \ diff --git a/configure.ac b/configure.ac index b17d1ab4c3d..1928a6503ea 100644 --- a/configure.ac +++ b/configure.ac @@ -2145,7 +2145,6 @@ AC_CHECK_FUNCS(\ posix_fallocate \ prctl \ proc_pidinfo \ - sched_yield \ setproctitle \ setprogname \ sigprocmask \ diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index bbe7d53cba3..86a836a908f 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1505,12 +1505,8 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, */ NTSTATUS WINAPI NtYieldExecution(void) { -#ifdef HAVE_SCHED_YIELD - sched_yield(); + usleep(0); return STATUS_SUCCESS; -#else - return STATUS_NO_YIELD_PERFORMED; -#endif } diff --git a/include/config.h.in b/include/config.h.in index f262f8a0a12..e975ca8a55d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -519,9 +519,6 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY -/* Define to 1 if you have the `sched_yield' function. */ -#undef HAVE_SCHED_YIELD - /* Define to 1 if `cmd' is a member of `scsireq_t'. */ #undef HAVE_SCSIREQ_T_CMD

1 0

Brendan Shanks : api-ms-win-core-realtime-l1-1-1: Add stub DLL.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 54d51df66828d159fb6eb7cb9030581559dd9321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d51df66828d159fb6eb7cb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 6 15:39:01 2021 -0700 api-ms-win-core-realtime-l1-1-1: Add stub DLL. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-realtime-l1-1-1.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index 877c62d9647..ec425d91f63 100755 --- a/configure +++ b/configure @@ -1021,6 +1021,7 @@ enable_api_ms_win_core_psapi_obsolete_l1_1_0 enable_api_ms_win_core_psm_appnotify_l1_1_0 enable_api_ms_win_core_quirks_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 +enable_api_ms_win_core_realtime_l1_1_1 enable_api_ms_win_core_registry_l1_1_0 enable_api_ms_win_core_registry_l2_1_0 enable_api_ms_win_core_registry_l2_2_0 @@ -19850,6 +19851,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-psapi-obsolete-l1-1-0 enable_api_ms wine_fn_config_makefile dlls/api-ms-win-core-psm-appnotify-l1-1-0 enable_api_ms_win_core_psm_appnotify_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_core_quirks_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-realtime-l1-1-1 enable_api_ms_win_core_realtime_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l2-1-0 enable_api_ms_win_core_registry_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l2-2-0 enable_api_ms_win_core_registry_l2_2_0 diff --git a/configure.ac b/configure.ac index 1928a6503ea..530785c0033 100644 --- a/configure.ac +++ b/configure.ac @@ -2739,6 +2739,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psm-appnotify-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-2-0) diff --git a/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in b/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in new file mode 100644 index 00000000000..88ebedfb236 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-realtime-l1-1-1.dll diff --git a/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec b/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec new file mode 100644 index 00000000000..6cffa1f0b08 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec @@ -0,0 +1,3 @@ +@ stub QueryInterruptTime +@ stub QueryInterruptTimePrecise +@ stub QueryUnbiasedInterruptTimePrecise diff --git a/tools/make_specfiles b/tools/make_specfiles index a7ee7e7f4db..ecfc6d0e8f2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -219,6 +219,7 @@ my @dll_groups = "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-realtime-l1-1-0", + "api-ms-win-core-realtime-l1-1-1", "api-ms-win-core-sidebyside-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-string-obsolete-l1-1-0",

1 0

Alistair Leslie-Hughes : wininet: Allow up to 4K for response headers.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 42920ad653db4514532ee713467856e5abc5b126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42920ad653db4514532ee713… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 7 13:58:05 2021 +0200 wininet: Allow up to 4K for response headers. LevelHead includes a Header value that is > 3K in length which causes a crash after linking your account. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47505 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/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..b361c0d1b4d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -462,7 +462,7 @@ void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; -#define MAX_REPLY_LEN 0x5B4 +#define MAX_REPLY_LEN 0x1000 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */ typedef struct diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ae95b4399e0..d1d7e678853 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2410,6 +2410,17 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; send(c, headmsg, sizeof(headmsg)-1, 0); } + if (strstr(buffer, "GET /test_large_header")) + { + static const char allokmsg[] = "HTTP/1.1 200 OK\r\nServer: winetest\r\n"; + char header[4000 + sizeof("wine-header: ") - 1]; + + memset(header, 'A', sizeof(header)); + memcpy(header, "wine-header: ", sizeof("wine-header: ") - 1); + send(c, allokmsg, sizeof(allokmsg) - 1, 0); + send(c, header, sizeof(header), 0); + send(c, "\r\n\r\n", 4, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3616,6 +3627,41 @@ static void test_not_modified(int port) InternetCloseHandle(ses); } +static void test_large_header(int port) +{ + HINTERNET ses, con, req; + BOOL ret; + DWORD size, index, error; + char buffer[13]; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_large_header", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + index = 0; + size = sizeof(buffer); + strcpy(buffer, "wine-header"); + ret = HttpQueryInfoA(req, HTTP_QUERY_CUSTOM, buffer, &size, &index); + error = GetLastError(); + ok(!ret, "HttpQueryInfoA succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size == 4001, "got %u\n", size); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6190,6 +6236,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_not_modified(si.port); + test_large_header(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port);

1 0

Hans Leidekker : wpcap: Map Unix interfaces to Windows adapters.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 622b0e29a6efae8f45dd00a1d728512987252c9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=622b0e29a6efae8f45dd00a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 7 14:39:47 2021 +0200 wpcap: Map Unix interfaces to Windows adapters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37167 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/Makefile.in | 1 + dlls/wpcap/unixlib.c | 4 +- dlls/wpcap/unixlib.h | 25 +++- dlls/wpcap/wpcap.c | 307 ++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 318 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=622b0e29a6efae8f45dd…

1 0

Jacek Caban : include: Use __builtin_offsetof on Clang.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: de9982f069e576b6aaebd96383af263584eedb03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9982f069e576b6aaebd963… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 7 16:27:22 2021 +0200 include: Use __builtin_offsetof on Clang. Fixes a number of warning on MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stddef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h index 8d946e5aedf..b3fdaf0c052 100644 --- a/include/msvcrt/stddef.h +++ b/include/msvcrt/stddef.h @@ -20,7 +20,7 @@ #include <corecrt.h> -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) #define offsetof(s,m) __builtin_offsetof(s,m) #elif defined(_WIN64) #define offsetof(s,m) (size_t)((ptrdiff_t)&(((s*)NULL)->m))

1 0

Piotr Caban : user32/tests: Print context in window style tests.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 0483e2b4afbb289c900367fd4b8296c9f6a8e762 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0483e2b4afbb289c900367fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:41 2021 +0200 user32/tests: Print context in window style tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 93 ++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 39 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e23ab8137f8..744f7781439 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4546,48 +4546,63 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle /* tests what window styles the window manager automatically adds */ static void test_window_styles(void) { - register_style_check_class(); + static const struct + { + DWORD style_in; + DWORD exstyle_in; + DWORD style_out; + DWORD exstyle_out; + } tests[] = { + {0, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_DLGFRAME, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_THICKFRAME, 0, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_DLGFRAME, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE}, + {WS_THICKFRAME, WS_EX_STATICEDGE, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE}, + {WS_OVERLAPPEDWINDOW, 0, WS_CLIPSIBLINGS|WS_OVERLAPPEDWINDOW, WS_EX_WINDOWEDGE}, + {WS_CHILD, 0, WS_CHILD, 0}, + {WS_CHILD|WS_DLGFRAME, 0, WS_CHILD|WS_DLGFRAME, WS_EX_WINDOWEDGE}, + {WS_CHILD|WS_THICKFRAME, 0, WS_CHILD|WS_THICKFRAME, WS_EX_WINDOWEDGE}, + {WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE}, + {WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE}, + {WS_CHILD|WS_CAPTION, 0, WS_CHILD|WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_CHILD|WS_CAPTION|WS_SYSMENU, 0, WS_CHILD|WS_CAPTION|WS_SYSMENU, WS_EX_WINDOWEDGE}, + {WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0}, + {WS_CHILD, WS_EX_DLGMODALFRAME, WS_CHILD, WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME}, + {WS_CHILD, WS_EX_DLGMODALFRAME|WS_EX_STATICEDGE, WS_CHILD, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME}, + {WS_CHILD|WS_POPUP, 0, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0}, + {WS_CHILD|WS_POPUP|WS_DLGFRAME, 0, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE}, + {WS_CHILD|WS_POPUP|WS_THICKFRAME, 0, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE}, + {WS_CHILD|WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE}, + {WS_CHILD|WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE}, + {WS_CHILD|WS_POPUP, WS_EX_APPWINDOW, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, WS_EX_APPWINDOW}, + {WS_CHILD|WS_POPUP, WS_EX_WINDOWEDGE, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0}, + {WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0}, + {0, WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW}, + {WS_POPUP, 0, WS_POPUP|WS_CLIPSIBLINGS, 0}, + {WS_POPUP, WS_EX_WINDOWEDGE, WS_POPUP|WS_CLIPSIBLINGS, 0}, + {WS_POPUP|WS_DLGFRAME, 0, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE}, + {WS_POPUP|WS_THICKFRAME, 0, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE}, + {WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE}, + {WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE}, + {WS_CAPTION, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE}, + {0, WS_EX_APPWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_APPWINDOW|WS_EX_WINDOWEDGE}, + {0, WS_EX_LAYERED, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_WINDOWEDGE}, + {0, WS_EX_LAYERED|WS_EX_TRANSPARENT, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_WINDOWEDGE}, + {0, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, + WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW|WS_EX_WINDOWEDGE}, + }; + int i; - check_window_style(0, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); - check_window_style(WS_DLGFRAME, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); - check_window_style(WS_THICKFRAME, 0, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); - check_window_style(WS_DLGFRAME, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE); - check_window_style(WS_THICKFRAME, WS_EX_STATICEDGE, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE); - check_window_style(WS_OVERLAPPEDWINDOW, 0, WS_CLIPSIBLINGS|WS_OVERLAPPEDWINDOW, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD, 0, WS_CHILD, 0); - check_window_style(WS_CHILD|WS_DLGFRAME, 0, WS_CHILD|WS_DLGFRAME, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD|WS_THICKFRAME, 0, WS_CHILD|WS_THICKFRAME, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE); - check_window_style(WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE); - check_window_style(WS_CHILD|WS_CAPTION, 0, WS_CHILD|WS_CAPTION, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD|WS_CAPTION|WS_SYSMENU, 0, WS_CHILD|WS_CAPTION|WS_SYSMENU, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); - check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME, WS_CHILD, WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); - check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME|WS_EX_STATICEDGE, WS_CHILD, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); - check_window_style(WS_CHILD|WS_POPUP, 0, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); - check_window_style(WS_CHILD|WS_POPUP|WS_DLGFRAME, 0, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD|WS_POPUP|WS_THICKFRAME, 0, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD|WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); - check_window_style(WS_CHILD|WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); - check_window_style(WS_CHILD|WS_POPUP, WS_EX_APPWINDOW, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, WS_EX_APPWINDOW); - check_window_style(WS_CHILD|WS_POPUP, WS_EX_WINDOWEDGE, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); - check_window_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); - check_window_style(0, WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW); - check_window_style(WS_POPUP, 0, WS_POPUP|WS_CLIPSIBLINGS, 0); - check_window_style(WS_POPUP, WS_EX_WINDOWEDGE, WS_POPUP|WS_CLIPSIBLINGS, 0); - check_window_style(WS_POPUP|WS_DLGFRAME, 0, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); - check_window_style(WS_POPUP|WS_THICKFRAME, 0, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); - check_window_style(WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); - check_window_style(WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); - check_window_style(WS_CAPTION, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE); - check_window_style(0, WS_EX_APPWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_APPWINDOW|WS_EX_WINDOWEDGE); + register_style_check_class(); - if (pGetLayeredWindowAttributes) + for (i = 0; i < ARRAY_SIZE(tests); i++) { - check_window_style(0, WS_EX_LAYERED, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_WINDOWEDGE); - check_window_style(0, WS_EX_LAYERED|WS_EX_TRANSPARENT, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_WINDOWEDGE); - check_window_style(0, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, - WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW|WS_EX_WINDOWEDGE); + if ((tests[i].exstyle_in & WS_EX_LAYERED) && !pGetLayeredWindowAttributes) + continue; + + winetest_push_context("style %#x exstyle %#x", tests[i].style_in, tests[i].exstyle_in); + check_window_style(tests[i].style_in, tests[i].exstyle_in, tests[i].style_out, tests[i].exstyle_out); + winetest_pop_context(); } }

1 0