wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Alexandre Julliard : libwine: Avoid including wine/port.h.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 06f6637363295b6ac9ddd1718358968d09db88d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06f6637363295b6ac9ddd171… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 18:58:36 2021 +0200 libwine: Avoid including wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 7 +++---- libs/wine/debug.c | 7 +++---- libs/wine/ldt.c | 3 ++- libs/wine/loader.c | 6 ++---- libs/wine/mmap.c | 5 +---- libs/wine/port.c | 1 - 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index b8f1bd5f86d..cb42421c168 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wine/asm.h" #ifdef __ASM_OBSOLETE @@ -29,10 +28,10 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <sys/types.h> #include <sys/stat.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_PWD_H #include <pwd.h> #endif diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 95e6fe6e58c..9cb918d272d 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wine/asm.h" #ifdef __ASM_OBSOLETE @@ -29,9 +28,9 @@ #include <stdarg.h> #include <string.h> #include <ctype.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> #include "wine/debug.h" diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 18b0b9be9bf..3fc1c0cb3d8 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -20,14 +20,15 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <sys/types.h> #include <errno.h> +#include <unistd.h> #include "windef.h" #include "winbase.h" diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 4245beea94b..edb6e37061d 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> @@ -35,9 +34,8 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef __APPLE__ #include <crt_externs.h> diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index b72d2af20d3..86b25b0a7ac 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> @@ -35,9 +34,7 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_STDINT_H # include <stdint.h> #endif diff --git a/libs/wine/port.c b/libs/wine/port.c index ee804f414a0..b019e1d2fd4 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wine/asm.h" #ifdef __ASM_OBSOLETE

1 0

Alexandre Julliard : loader: Avoid including wine/port.h.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 28d7d5ba9348495eaccb22f934f27bc083e5f246 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d7d5ba9348495eaccb22f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 18:53:26 2021 +0200 loader: Avoid including wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/main.c | 7 ++++++- loader/preloader.c | 9 ++------- loader/preloader_mac.c | 10 +++------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/loader/main.c b/loader/main.c index 86c2b28263e..fdc77c56162 100644 --- a/loader/main.c +++ b/loader/main.c @@ -19,11 +19,16 @@ */ #include "config.h" -#include "wine/port.h" +#include <fcntl.h> #include <pthread.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <dlfcn.h> #include "main.h" diff --git a/loader/preloader.c b/loader/preloader.c index 86308484182..7bd6afaeb66 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -63,16 +63,13 @@ #ifdef __linux__ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #include <fcntl.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> @@ -80,9 +77,7 @@ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_ELF_H # include <elf.h> #endif diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index fc07b7da0ed..23eee44975f 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -25,16 +25,13 @@ #ifdef __APPLE__ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #include <fcntl.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> @@ -42,9 +39,8 @@ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_MACH_O_LOADER_H #include <mach/thread_status.h> #include <mach-o/loader.h>

1 0

Alexandre Julliard : ntdll: Avoid including wine/port.h.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 832724282bc1bc4f59e06d4978ff807e433a1ac5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832724282bc1bc4f59e06d49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 18:39:13 2021 +0200 ntdll: Avoid including wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/cdrom.c | 10 +++------- dlls/ntdll/unix/debug.c | 8 ++++---- dlls/ntdll/unix/file.c | 8 ++------ dlls/ntdll/unix/loader.c | 11 +++++++---- dlls/ntdll/unix/process.c | 5 +---- dlls/ntdll/unix/serial.c | 9 ++------- dlls/ntdll/unix/server.c | 10 +++------- dlls/ntdll/unix/signal_arm.c | 6 ++---- dlls/ntdll/unix/signal_arm64.c | 6 ++---- dlls/ntdll/unix/signal_i386.c | 5 +---- dlls/ntdll/unix/signal_x86_64.c | 5 +---- dlls/ntdll/unix/sync.c | 7 +++---- dlls/ntdll/unix/system.c | 5 ++++- dlls/ntdll/unix/tape.c | 5 ++++- dlls/ntdll/unix/thread.c | 3 ++- dlls/ntdll/unix/virtual.c | 13 ++++++------- 16 files changed, 47 insertions(+), 69 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index 479d4058068..db3b9cd25c2 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -26,19 +26,15 @@ #endif #include "config.h" -#include "wine/port.h" #include <errno.h> #include <string.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <stdlib.h> +#include <unistd.h> #include <fcntl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> #elif defined(MAJOR_IN_SYSMACROS) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index a2a63b5a9f4..26e7decc059 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -23,16 +23,16 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 7e47e32bab9..1acd999a3c5 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -25,7 +25,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <sys/types.h> @@ -37,15 +36,12 @@ #include <stdlib.h> #include <stdio.h> #include <limits.h> +#include <unistd.h> #ifdef HAVE_MNTENT_H #include <mntent.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef HAVE_SYS_STATVFS_H # include <sys/statvfs.h> #endif diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index df309814c0c..4e807744862 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -23,17 +23,20 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <signal.h> #include <math.h> -#ifdef HAVE_LINK_H -# include <link.h> -#endif +#include <string.h> +#include <stdlib.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_PWD_H # include <pwd.h> #endif diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index b35765ba2fe..10a88db9291 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -24,7 +24,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <errno.h> #include <fcntl.h> @@ -47,9 +46,7 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_MACH_MACH_H # include <mach/mach.h> #endif diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index ab2ef9330a5..ece9966f12b 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -25,7 +25,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <errno.h> #include <string.h> @@ -35,13 +34,9 @@ #ifdef HAVE_TERMIOS_H #include <termios.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <fcntl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #include <sys/types.h> #ifdef HAVE_SYS_FILIO_H # include <sys/filio.h> diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 53d34e1858a..46d403df326 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -23,7 +23,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> @@ -41,6 +40,7 @@ #include <signal.h> #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -58,9 +58,7 @@ #ifdef HAVE_SYS_PRCTL_H # include <sys/prctl.h> #endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif @@ -70,9 +68,7 @@ #ifdef HAVE_SYS_THR_H #include <sys/thr.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef __APPLE__ #include <crt_externs.h> #include <spawn.h> diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 88f0f4ff76d..798d7b9cc87 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -26,7 +26,6 @@ #ifdef __arm__ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <pthread.h> @@ -34,9 +33,8 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index ce7e1689434..0f72bf3c89d 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -25,7 +25,6 @@ #ifdef __aarch64__ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <pthread.h> @@ -33,9 +32,8 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index c38c4d046d7..bf3abc1a587 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -25,7 +25,6 @@ #ifdef __i386__ #include "config.h" -#include "wine/port.h" #include <errno.h> #include <signal.h> @@ -34,9 +33,7 @@ #include <stdio.h> #include <sys/types.h> #include <assert.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index a99cf2ae9c1..0085bd42410 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -25,7 +25,6 @@ #ifdef __x86_64__ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <pthread.h> @@ -35,9 +34,7 @@ #include <stdio.h> #include <sys/types.h> #include <sys/mman.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_MACHINE_SYSARCH_H # include <machine/sysarch.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 86a836a908f..a246fc19618 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -26,12 +26,13 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <limits.h> #include <signal.h> +#include <sys/types.h> #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif @@ -44,9 +45,7 @@ #ifdef HAVE_SYS_POLL_H # include <sys/poll.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_SCHED_H # include <sched.h> #endif diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 82c9f0da492..c4853568599 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -23,12 +23,15 @@ #endif #include "config.h" -#include "wine/port.h" +#include <fcntl.h> #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <unistd.h> #include <errno.h> #ifdef HAVE_SYS_TIME_H # include <sys/time.h> diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 6824d42a745..741de2f6d95 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -23,11 +23,14 @@ #endif #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 384ac1d4119..38a03bd4b60 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -23,17 +23,18 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> #include <limits.h> #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <pthread.h> #include <signal.h> #include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6db08de6473..facecffcf37 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -23,29 +23,28 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> +#include <string.h> +#include <stdlib.h> #include <signal.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif #ifdef HAVE_SYS_SYSINFO_H # include <sys/sysinfo.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_VALGRIND_VALGRIND_H # include <valgrind/valgrind.h> #endif

1 0

Simon McVittie : winebus.sys: Add code path to bypass udevd and use inotify.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: ab3416c61fb17207e0831f7709da4d2911b07fb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab3416c61fb17207e0831f77… Author: Simon McVittie <smcv(a)collabora.com> Date: Wed Oct 20 11:07:27 2021 +0200 winebus.sys: Add code path to bypass udevd and use inotify. In a container with a non-trivial user namespace, we cannot rely on libudev communicating with udevd as a way to monitor device nodes, for the following reasons: * If uid 0 from the host is not mapped to uid 0 in the container, libudev cannot authenticate netlink messages from the host, because their sender uid appears to be the overflowuid. Resolving this by mapping uid 0 into the container is not allowed when creating user namespaces as an unprivileged user, and even when running as a privileged user, it might be desirable for the real uid 0 to not be mapped as a way to harden the security boundary between container and host. * Depending on the container configuration, initial enumeration might not be able to read /run/udev from the host system. If it can't, sysfs attributes will still work because those are read directly from the kernel via sysfs, but udev properties coming from user-space rules (in particular ID_INPUT_JOYSTICK and friends) will appear to be missing. * The protocols between udevd and libudev (netlink messages for monitoring, and /run/udev for initial enumeration) are considered to be private to a particular version of udev, and are not a stable API; but in a container, we cannot expect that our copy of libudev is at exactly the same version as udevd on the host system. Sidestep this by adding a code path that continues to use libudev for the parts that work regardless of whether udevd is running or can be communicated with. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 276 ++++++++++++++++++++++++++++++++++++++++++-- dlls/winebus.sys/main.c | 2 + dlls/winebus.sys/unixlib.h | 1 + 3 files changed, 268 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab3416c61fb17207e083…

1 0

Simon McVittie : winebus.sys: Treat udev actions other than "remove" as "add".
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 22dae167d326036ef3b91eb1d5c45acdaa89eb0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=22dae167d326036ef3b91eb1… Author: Simon McVittie <smcv(a)collabora.com> Date: Wed Oct 20 11:07:26 2021 +0200 winebus.sys: Treat udev actions other than "remove" as "add". As per https://github.com/systemd/systemd/blob/v247-rc1/NEWS#L5 there are more kernel uevent types than just "add" and "remove", and we should be treating everything other than "remove" as being potentially an "add". To cope with this, try_add_device() now checks whether the same device was already added. If so, we ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1dfce05e4bc..57e5a169a69 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1404,16 +1404,14 @@ static void process_monitor_event(struct udev_monitor *monitor) if (!action) WARN("No action received\n"); - else if (strcmp(action, "add") == 0) + else if (strcmp(action, "remove")) udev_add_device(dev); - else if (strcmp(action, "remove") == 0) + else { impl = find_device_from_udev(dev); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for udev device %p\n", dev); } - else - WARN("Unhandled action %s\n", debugstr_a(action)); udev_device_unref(dev); }

1 0

Michael Stefaniuc : dinput: Avoid negating FAILED().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 1431608e6121cc437f265d8d606f2cd94e848a7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1431608e6121cc437f265d8d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 19 22:54:33 2021 +0200 dinput: Avoid negating FAILED(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3dc43c450e4..24d00bf2c11 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2619,7 +2619,7 @@ static HRESULT WINAPI hid_joystick_effect_Start( IDirectInputEffect *iface, DWOR hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((flags & DIES_NODOWNLOAD) && !impl->index) hr = DIERR_NOTDOWNLOADED; - else if ((flags & DIES_NODOWNLOAD) || !FAILED(hr = IDirectInputEffect_Download( iface ))) + else if ((flags & DIES_NODOWNLOAD) || SUCCEEDED(hr = IDirectInputEffect_Download( iface ))) { count = 1; status = HidP_InitializeReportForID( HidP_Output, effect_control->id, preparsed, @@ -2764,7 +2764,7 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((impl->flags & complete_mask) != complete_mask) hr = DIERR_INCOMPLETEEFFECT; - else if (!impl->index && !FAILED(hr = find_next_effect_id( impl->joystick, &impl->index ))) + else if (!impl->index && SUCCEEDED(hr = find_next_effect_id( impl->joystick, &impl->index ))) { if (!impl->type_specific_buf[0][0]) status = HIDP_STATUS_SUCCESS; else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, @@ -2929,7 +2929,7 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) EnterCriticalSection( &joystick->base.crit ); if (!impl->index) hr = DI_NOEFFECT; - else if (!FAILED(hr = IDirectInputEffect_Stop( iface ))) + else if (SUCCEEDED(hr = IDirectInputEffect_Stop( iface ))) { impl->joystick->effect_inuse[impl->index - 1] = FALSE; impl->index = 0;

1 0

Zhiyi Zhang : user32: Change the position and size of layered windows before flushing their surfaces.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 8892b79118fde5f2307ecbbdb03a8d0c489c8b3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8892b79118fde5f2307ecbbd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:07:59 2021 +0800 user32: Change the position and size of layered windows before flushing their surfaces. When UpdateLayeredWindow() is called to paint a window and update its size, USER_Driver->pUpdateLayeredWindow() needs to be called after the window position and size are updated. Otherwise, UpdateLayeredWindow() may flush the painted content to a smaller window and then enlarge it, losing the painted result. Fix Word 2016 window frame corruption after restoring from maximized state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e07b7d39e4b..4d0240f21a8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4134,10 +4134,8 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF TRACE( "window %p win %s client %s\n", hwnd, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); - if (!USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect )) return FALSE; - set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); - return TRUE; + return USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect ); }

1 0

Zhiyi Zhang : winefile: Set size before calling RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: e45d51fddabfa9e5f5d2a19bb8df2e12134dcf45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e45d51fddabfa9e5f5d2a19b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:07:14 2021 +0800 winefile: Set size before calling RegQueryValueExW(). The value in size may be invalid if previous RegQueryValueExW() calls failed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index fa78237cccf..8ad785b924a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1220,20 +1220,22 @@ static windowOptions load_registry_settings(void) RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hKey ); - size = sizeof(DWORD); - + size = sizeof(opts.start_x); if( RegQueryValueExW( hKey, reg_start_x, NULL, &type, (LPBYTE) &opts.start_x, &size ) != ERROR_SUCCESS ) opts.start_x = CW_USEDEFAULT; + size = sizeof(opts.start_y); if( RegQueryValueExW( hKey, reg_start_y, NULL, &type, (LPBYTE) &opts.start_y, &size ) != ERROR_SUCCESS ) opts.start_y = CW_USEDEFAULT; + size = sizeof(opts.width); if( RegQueryValueExW( hKey, reg_width, NULL, &type, (LPBYTE) &opts.width, &size ) != ERROR_SUCCESS ) opts.width = CW_USEDEFAULT; + size = sizeof(opts.height); if( RegQueryValueExW( hKey, reg_height, NULL, &type, (LPBYTE) &opts.height, &size ) != ERROR_SUCCESS ) opts.height = CW_USEDEFAULT;

1 0

Zhiyi Zhang : winecfg: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: b2099bce9bf35697bbb522aede21faf39be21baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2099bce9bf35697bbb522ae… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:07:06 2021 +0800 winecfg: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/drive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index bee5be3af34..b4b4239c003 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -140,7 +140,7 @@ static DWORD get_drive_type( char letter ) else { WCHAR buffer[80]; - DWORD size = ARRAY_SIZE(buffer); + DWORD size = sizeof(buffer); if (!RegQueryValueExW( hKey, driveValue, NULL, NULL, (LPBYTE)buffer, &size )) {

1 0

Zhiyi Zhang : cmd: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: efd98caef1908a05a38201c666218171b5eed765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efd98caef1908a05a38201c6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:06:56 2021 +0800 cmd: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 5 +++-- programs/cmd/wcmdmain.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a55ce6e0244..d0a954d90fa 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4763,7 +4763,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { WCHAR *newValue; LONG rc = ERROR_SUCCESS; WCHAR keyValue[MAXSTRING]; - DWORD valueLen = MAXSTRING; + DWORD valueLen; HKEY readKey; /* See if parameter includes '=' */ @@ -4803,7 +4803,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { - valueLen = ARRAY_SIZE(keyValue); + valueLen = sizeof(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(keyName); WCMD_output_asis(L"="); @@ -4836,6 +4836,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { + valueLen = sizeof(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(args); WCMD_output_asis(L"="); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8c6ed1c057c..4ed1c96a9c2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2700,7 +2700,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) size = sizeof(DWORD); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)&value, &size); } else if (type == REG_SZ) { - size = ARRAY_SIZE(strvalue); + size = sizeof(strvalue); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)strvalue, &size); value = wcstoul(strvalue, NULL, 10); } @@ -2719,7 +2719,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) size = sizeof(DWORD); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)&value, &size); } else if (type == REG_SZ) { - size = ARRAY_SIZE(strvalue); + size = sizeof(strvalue); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)strvalue, &size); value = wcstoul(strvalue, NULL, 10); }

1 0

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 October 2021