December 2021 - Wine-Commits

Alexandre Julliard : configure: Assume that sys/mman.h is available on Unix.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: e3001b6a7c087da5a680b412d82da878e0149e8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3001b6a7c087da5a680b412… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:02:24 2021 +0100 configure: Assume that sys/mman.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 1 - dlls/ntdll/unix/loader.c | 4 +--- dlls/ntdll/unix/server.c | 4 +--- dlls/ntdll/unix/sync.c | 2 -- dlls/ntdll/unix/thread.c | 2 -- dlls/ntdll/unix/virtual.c | 4 +--- dlls/qcap/v4l.c | 2 -- dlls/win32u/freetype.c | 4 +--- include/config.h.in | 3 --- libs/wine/loader.c | 2 -- libs/wine/mmap.c | 2 -- loader/preloader.c | 4 +--- loader/preloader_mac.c | 4 +--- server/mapping.c | 4 +--- 15 files changed, 7 insertions(+), 41 deletions(-) diff --git a/configure b/configure index c1fdaef554a..7fdc83547f1 100755 --- a/configure +++ b/configure @@ -8539,12 +8539,6 @@ if test "x$ac_cv_header_sys_link_h" = xyes then : printf "%s\n" "#define HAVE_SYS_LINK_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_mman_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "sys/modem.h" "ac_cv_header_sys_modem_h" "$ac_includes_default" if test "x$ac_cv_header_sys_modem_h" = xyes diff --git a/configure.ac b/configure.ac index b8465cc7489..ef25cfe1d97 100644 --- a/configure.ac +++ b/configure.ac @@ -482,7 +482,6 @@ AC_CHECK_HEADERS(\ sys/ioctl.h \ sys/ipc.h \ sys/link.h \ - sys/mman.h \ sys/modem.h \ sys/mtio.h \ sys/param.h \ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ba56b5e20d5..cc365fd37d1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -34,6 +34,7 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/mman.h> #include <unistd.h> #include <dlfcn.h> #ifdef HAVE_PWD_H @@ -48,9 +49,6 @@ #ifdef HAVE_SYS_AUXV_H # include <sys/auxv.h> #endif -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 1dcd0792072..caee1f794db 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -43,6 +43,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#include <sys/mman.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -52,9 +53,6 @@ #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif #ifdef HAVE_SYS_PRCTL_H # include <sys/prctl.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index d5d92145503..51505082862 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -33,9 +33,7 @@ #include <limits.h> #include <signal.h> #include <sys/types.h> -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 00fe2b6fa1b..618ebb82bfb 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -35,9 +35,7 @@ #include <signal.h> #include <sys/types.h> #include <unistd.h> -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #ifdef HAVE_SYS_TIMES_H #include <sys/times.h> #endif diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index dea16623de7..2ed7a74b875 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -37,9 +37,7 @@ # include <sys/socket.h> #endif #include <sys/stat.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #ifdef HAVE_SYS_SYSINFO_H # include <sys/sysinfo.h> #endif diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 828113afa3c..9a66a50e31d 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -35,9 +35,7 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #include <errno.h> #ifdef HAVE_SYS_TIME_H #include <sys/time.h> diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 48fae25a87e..77f4ef8eab3 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -33,9 +33,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <dlfcn.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #include <string.h> #include <dirent.h> #include <stdio.h> diff --git a/include/config.h.in b/include/config.h.in index 9ff8a89f888..8ad37e3d479 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -637,9 +637,6 @@ /* Define to 1 if you have the <sys/link.h> header file. */ #undef HAVE_SYS_LINK_H -/* Define to 1 if you have the <sys/mman.h> header file. */ -#undef HAVE_SYS_MMAN_H - /* Define to 1 if you have the <sys/modem.h> header file. */ #undef HAVE_SYS_MODEM_H diff --git a/libs/wine/loader.c b/libs/wine/loader.c index edb6e37061d..ad72ec50904 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -28,9 +28,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 86b25b0a7ac..c8d1b59a4db 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -31,9 +31,7 @@ #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #include <unistd.h> #ifdef HAVE_STDINT_H # include <stdint.h> diff --git a/loader/preloader.c b/loader/preloader.c index 7bd6afaeb66..585be50624f 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -71,9 +71,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 23eee44975f..01a41f08d8c 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -33,9 +33,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif diff --git a/server/mapping.c b/server/mapping.c index 93dae94b7c4..bc9ed5bdcb9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -27,9 +27,7 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #include <unistd.h> #include "ntstatus.h"

1 0

Alexandre Julliard : configure: Assume that unistd.h is available on Unix.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 13ec7952e09882846e424e1f42a00de79602ad95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13ec7952e09882846e424e1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:58:13 2021 +0100 configure: Assume that unistd.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 1 - dlls/nsiproxy.sys/ndis.c | 3 --- dlls/nsiproxy.sys/tcp.c | 5 +---- dlls/ntdll/unix/env.c | 8 ++------ dlls/ntdll/unix/file.c | 4 +--- dlls/qcap/v4l.c | 2 -- dlls/winealsa.drv/midi.c | 4 +--- dlls/wineandroid.drv/window.c | 4 +--- dlls/winebus.sys/bus_udev.c | 4 +--- dlls/winejoystick.drv/joystick_linux.c | 4 +--- dlls/winex11.drv/clipboard.c | 4 +--- dlls/winex11.drv/systray.c | 4 +--- dlls/winex11.drv/window.c | 4 +--- dlls/winex11.drv/x11drv_main.c | 4 +--- dlls/winex11.drv/xdnd.c | 4 +--- tools/tools.h | 3 --- tools/widl/parser.l | 5 ----- tools/wrc/parser.l | 5 ----- tools/wrc/ppl.l | 2 -- 20 files changed, 13 insertions(+), 67 deletions(-) diff --git a/configure b/configure index d1a52a116f4..c1fdaef554a 100755 --- a/configure +++ b/configure @@ -8713,12 +8713,6 @@ if test "x$ac_cv_header_syscall_h" = xyes then : printf "%s\n" "#define HAVE_SYSCALL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" -if test "x$ac_cv_header_unistd_h" = xyes -then : - printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "$ac_includes_default" if test "x$ac_cv_header_utime_h" = xyes diff --git a/configure.ac b/configure.ac index d032c60e5c3..b8465cc7489 100644 --- a/configure.ac +++ b/configure.ac @@ -511,7 +511,6 @@ AC_CHECK_HEADERS(\ sys/vnode.h \ sys/wait.h \ syscall.h \ - unistd.h \ utime.h \ valgrind/memcheck.h \ valgrind/valgrind.h diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 3e37bcecc78..a7820832d9a 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -25,10 +25,7 @@ #include "config.h" #include <stdarg.h> - -#ifdef HAVE_UNISTD_H #include <unistd.h> -#endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 9a089ba3de2..c9d3d293229 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -27,15 +27,12 @@ #include <stdarg.h> #include <sys/types.h> #include <dirent.h> +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 30d8ac1553c..c7e0674e083 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -33,18 +33,14 @@ #include <stdarg.h> #include <sys/types.h> #include <sys/ioctl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> +#include <unistd.h> #ifdef HAVE_SYS_PRCTL_H # include <sys/prctl.h> #endif #ifdef HAVE_PWD_H # include <pwd.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #ifdef __APPLE__ # include <CoreFoundation/CFLocale.h> # include <CoreFoundation/CFString.h> diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 10d8f3de4a3..5c76a57a48b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -105,9 +105,7 @@ #include <sys/statfs.h> #endif #include <time.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b8f6254e251..828113afa3c 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -48,9 +48,7 @@ #ifdef HAVE_LINUX_VIDEODEV2_H #include <linux/videodev2.h> #endif -#ifdef HAVE_UNISTD_H #include <unistd.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index f2fe6307bb2..073c0a6e3f3 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -36,9 +36,7 @@ #include <string.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <fcntl.h> #include <errno.h> diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index c907001c159..fb1b1420227 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -32,9 +32,7 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #define OEMRESOURCE #include "windef.h" diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 540a4da508f..2c23c81b9ef 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -31,9 +31,7 @@ #include <stdint.h> #include <sys/types.h> #include <dirent.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <poll.h> #ifdef HAVE_LIBUDEV_H # include <libudev.h> diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 7fd2c95aff1..0280fa2534c 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -39,9 +39,7 @@ #ifdef HAVE_LINUX_22_JOYSTICK_API -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 4e3320f8ed5..a13d0a55b76 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -69,9 +69,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <fcntl.h> #include <dlfcn.h> #include <limits.h> diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 5522b229836..c6d12b21c28 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -26,9 +26,7 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <X11/Xlib.h> diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a9fcfb0e295..29473ceba06 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -25,9 +25,7 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <X11/Xlib.h> #include <X11/Xresource.h> diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e5592184337..ab2af7a9e38 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -29,9 +29,7 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <dlfcn.h> #include <X11/cursorfont.h> #include <X11/Xlib.h> diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b72a168adce..eb685613b7b 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -22,9 +22,7 @@ #include "config.h" #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <stdarg.h> #include <stdio.h> diff --git a/tools/tools.h b/tools/tools.h index 751580d68cb..93a7b3c5b09 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -30,9 +30,6 @@ #include <fcntl.h> #include <time.h> #include <errno.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #ifdef _WIN32 # include <direct.h> diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6070d7e7a1f..fb6aa93e390 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -51,12 +51,7 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* #include <assert.h> #include <errno.h> #include <limits.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#else #define YY_NO_UNISTD_H -#endif #include "widl.h" #include "utils.h" diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index c5d9db1488f..3c3cf973da5 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -104,12 +104,7 @@ ws [ \f\t\r] #include <assert.h> #include <errno.h> #include <limits.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#else #define YY_NO_UNISTD_H -#endif #include "../tools.h" #include "wrc.h" diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index 632bb61a665..f27a2b48476 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -168,9 +168,7 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] # define ULLONG_MAX ((__int64)0xffffffff << 32 | 0xffffffff) #endif -#ifndef HAVE_UNISTD_H #define YY_NO_UNISTD_H -#endif #include "../tools.h" #include "utils.h"

1 0

Dmitry Timoshkov : d3d11: Handle D3D11_FEATURE_D3D9_OPTIONS in d3d11_device_CheckFeatureSupport().
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: d8ba4732086c9ecdd975e6bc21cc59909318805c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ba4732086c9ecdd975e6bc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 9 17:45:16 2021 +0100 d3d11: Handle D3D11_FEATURE_D3D9_OPTIONS in d3d11_device_CheckFeatureSupport(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 417638bf314..546449037ce 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3941,6 +3941,28 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 return S_OK; } + case D3D11_FEATURE_D3D9_OPTIONS: + { + D3D11_FEATURE_DATA_D3D9_OPTIONS *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to get device caps, hr %#x.\n", hr); + return hr; + } + + options->FullNonPow2TextureSupport = !(wined3d_caps.TextureCaps & WINED3DPTEXTURECAPS_POW2); + return S_OK; + } + case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS: { D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS *options = feature_support_data;

1 0

Rémi Bernon : winebus.sys: Revert direction rotation for UDEV lnxev devices.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: cbd324124ce2a5ddb241f0ff920660aa55b0b5c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd324124ce2a5ddb241f0ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 9 14:44:15 2021 +0100 winebus.sys: Revert direction rotation for UDEV lnxev devices. This partially reverts b431dceeca9aa0d4229c3597b833bcaf04de7110, which followed some misleading SDL comment, as well as the original dinput evdev backend code, and resulted in inverted directions instead. On the Linux drivers side, both in the PID driver or the I-Force driver, the evdev direction is simply rescaled and passed to the device. It is then very likely that we should pass through the PID reports direction. In some other drivers, the sine of the angle is used to modulate the force magnitude, although that doesn't really tell anything about the orientation of the direction itself. The SDL comment is incorrect, and its code isn't actually doing any kind of conversion other than the rescaling. We now do the same here, and end up with identical values being sent to evdev, whether we use it directly or through the SDL library. It's also been confirmed with hidraw PID capable devices, that with this change, the direction values in the hardware PID reports are consistent between the three backends (SDL, evdev, and hidraw). If some devices are expecting inverted directions then it probably is something that will need to be solved on the Linux driver level. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 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 | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index dec8435555c..2269f5b904e 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1046,14 +1046,9 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B effect.trigger.button = params->trigger_button; effect.trigger.interval = params->trigger_repeat_interval; - /* Linux FF only supports polar direction, and uses an inverted convention compared - * to SDL or dinput (see SDL src/haptic/linux/SDL_syshaptic.c), where the force pulls - * into the specified direction, instead of coming from it. - * - * The first direction we get from PID is in polar coordinate space, so we need to - * add 180° to make it match Linux coordinates. */ - effect.direction = (params->direction[0] + 18000) % 36000; - effect.direction = effect.direction * 0x800 / 1125; + /* Linux FF only supports polar direction, and the first direction we get from PID + * is in polar coordinate space already. */ + effect.direction = params->direction[0] * 0x800 / 1125; switch (params->effect_type) {

1 0

Alexandre Julliard : configure: Remove some no longer used checks.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 6613e6bb79b5d18d3b2905e4ba58bc40a935023d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6613e6bb79b5d18d3b2905e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:51:49 2021 +0100 configure: Remove some no longer used checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 280 +--------------------------------------------------- configure.ac | 114 ++------------------- include/config.h.in | 51 ---------- 3 files changed, 12 insertions(+), 433 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6613e6bb79b5d18d3b29…

1 0

Rémi Bernon : winmm: Correctly check parameters in joyGetDevCaps(A|W).
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 86249a3b8371d86a83db3faf902d90f76b7f3cce URL: https://source.winehq.org/git/wine.git/?a=commit;h=86249a3b8371d86a83db3faf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 12:19:01 2021 +0100 winmm: Correctly check parameters in joyGetDevCaps(A|W). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 105 ++++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 2b1811d3778..bb8142a29a9 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -167,64 +167,77 @@ UINT WINAPI DECLSPEC_HOTPATCH joyGetNumDevs(void) /************************************************************************** * joyGetDevCapsW [WINMM.@] */ -MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, UINT size ) { - if (wID >= MAXJOYSTICK) return JOYERR_PARMS; - if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; + TRACE( "id %d, caps %p, size %u.\n", (int)id, caps, size ); + + if (!caps) return MMSYSERR_INVALPARAM; + if (size != sizeof(JOYCAPSW) && size != sizeof(JOYCAPS2W)) return JOYERR_PARMS; - lpCaps->wPeriodMin = JOY_PERIOD_MIN; /* FIXME */ - lpCaps->wPeriodMax = JOY_PERIOD_MAX; /* FIXME (same as MS Joystick Driver) */ + if (id >= MAXJOYSTICK) return JOYERR_PARMS; + if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; - return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETDEVCAPS, (LPARAM)lpCaps, wSize); + caps->wPeriodMin = JOY_PERIOD_MIN; /* FIXME */ + caps->wPeriodMax = JOY_PERIOD_MAX; /* FIXME (same as MS Joystick Driver) */ + + return SendDriverMessage( JOY_Sticks[id].hDriver, JDD_GETDEVCAPS, (LPARAM)caps, size ); } /************************************************************************** * joyGetDevCapsA [WINMM.@] */ -MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA( UINT_PTR id, JOYCAPSA *caps, UINT size ) { - JOYCAPSW jcw; - MMRESULT ret; - - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - - ret = joyGetDevCapsW(wID, &jcw, sizeof(jcw)); - - if (ret == JOYERR_NOERROR) + UINT size_w = sizeof(JOYCAPS2W); + JOYCAPS2W caps_w; + MMRESULT res; + + TRACE( "id %d, caps %p, size %u.\n", (int)id, caps, size ); + + if (!caps) return MMSYSERR_INVALPARAM; + if (size != sizeof(JOYCAPSA) && size != sizeof(JOYCAPS2A)) return JOYERR_PARMS; + + if (size == sizeof(JOYCAPSA)) size_w = sizeof(JOYCAPSW); + res = joyGetDevCapsW( id, (JOYCAPSW *)&caps_w, size_w ); + if (res) return res; + + caps->wMid = caps_w.wMid; + caps->wPid = caps_w.wPid; + WideCharToMultiByte( CP_ACP, 0, caps_w.szPname, -1, caps->szPname, + sizeof(caps->szPname), NULL, NULL ); + caps->wXmin = caps_w.wXmin; + caps->wXmax = caps_w.wXmax; + caps->wYmin = caps_w.wYmin; + caps->wYmax = caps_w.wYmax; + caps->wZmin = caps_w.wZmin; + caps->wZmax = caps_w.wZmax; + caps->wNumButtons = caps_w.wNumButtons; + caps->wPeriodMin = caps_w.wPeriodMin; + caps->wPeriodMax = caps_w.wPeriodMax; + caps->wRmin = caps_w.wRmin; + caps->wRmax = caps_w.wRmax; + caps->wUmin = caps_w.wUmin; + caps->wUmax = caps_w.wUmax; + caps->wVmin = caps_w.wVmin; + caps->wVmax = caps_w.wVmax; + caps->wCaps = caps_w.wCaps; + caps->wMaxAxes = caps_w.wMaxAxes; + caps->wNumAxes = caps_w.wNumAxes; + caps->wMaxButtons = caps_w.wMaxButtons; + WideCharToMultiByte( CP_ACP, 0, caps_w.szRegKey, -1, caps->szRegKey, + sizeof(caps->szRegKey), NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, caps_w.szOEMVxD, -1, caps->szOEMVxD, + sizeof(caps->szOEMVxD), NULL, NULL ); + + if (size == sizeof(JOYCAPS2A)) { - lpCaps->wMid = jcw.wMid; - lpCaps->wPid = jcw.wPid; - WideCharToMultiByte( CP_ACP, 0, jcw.szPname, -1, lpCaps->szPname, - sizeof(lpCaps->szPname), NULL, NULL ); - lpCaps->wXmin = jcw.wXmin; - lpCaps->wXmax = jcw.wXmax; - lpCaps->wYmin = jcw.wYmin; - lpCaps->wYmax = jcw.wYmax; - lpCaps->wZmin = jcw.wZmin; - lpCaps->wZmax = jcw.wZmax; - lpCaps->wNumButtons = jcw.wNumButtons; - lpCaps->wPeriodMin = jcw.wPeriodMin; - lpCaps->wPeriodMax = jcw.wPeriodMax; - - if (wSize >= sizeof(JOYCAPSA)) { /* Win95 extensions ? */ - lpCaps->wRmin = jcw.wRmin; - lpCaps->wRmax = jcw.wRmax; - lpCaps->wUmin = jcw.wUmin; - lpCaps->wUmax = jcw.wUmax; - lpCaps->wVmin = jcw.wVmin; - lpCaps->wVmax = jcw.wVmax; - lpCaps->wCaps = jcw.wCaps; - lpCaps->wMaxAxes = jcw.wMaxAxes; - lpCaps->wNumAxes = jcw.wNumAxes; - lpCaps->wMaxButtons = jcw.wMaxButtons; - WideCharToMultiByte( CP_ACP, 0, jcw.szRegKey, -1, lpCaps->szRegKey, - sizeof(lpCaps->szRegKey), NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, jcw.szOEMVxD, -1, lpCaps->szOEMVxD, - sizeof(lpCaps->szOEMVxD), NULL, NULL ); - } + JOYCAPS2A *caps2_a = (JOYCAPS2A *)caps; + caps2_a->ManufacturerGuid = caps_w.ManufacturerGuid; + caps2_a->ProductGuid = caps_w.ProductGuid; + caps2_a->NameGuid = caps_w.NameGuid; } - return ret; + return JOYERR_NOERROR; } /**************************************************************************

1 0

Rémi Bernon : dinput8/tests: Add some winmm joystick caps tests.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 0160a1a94ce12962f519f60d2d931db8d98dc044 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0160a1a94ce12962f519f60d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 12:19:02 2021 +0100 dinput8/tests: Add some winmm joystick caps tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/Makefile.in | 2 +- dlls/dinput8/tests/hid.c | 337 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 338 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0160a1a94ce12962f519…

1 0

Rémi Bernon : winmm: Return the joysticks array size in joyGetNumDevs.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 2aa9c52196e28c87f9591847225d81fb6e609c11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aa9c52196e28c87f9591847… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 12:19:05 2021 +0100 winmm: Return the joysticks array size in joyGetNumDevs. And rename the array from JOY_Sticks to joysticks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 2 -- dlls/winmm/joystick.c | 79 ++++++++++++++++++++---------------------------- 2 files changed, 32 insertions(+), 49 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index e53afd26337..31703601b6b 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -9753,7 +9753,6 @@ static void test_winmm_joystick(void) cleanup_registry_keys(); ret = joyGetNumDevs(); - todo_wine ok( ret == 16, "joyGetNumDevs returned %u\n", ret ); ret = joyGetDevCapsW( 0, (JOYCAPSW *)&caps, sizeof(JOYCAPSW) ); @@ -9797,7 +9796,6 @@ static void test_winmm_joystick(void) if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; ret = joyGetNumDevs(); - todo_wine ok( ret == 16, "joyGetNumDevs returned %u\n", ret ); ret = joyGetPosEx( 1, &infoex ); diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 234dd4db594..604b0d7c0ba 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -40,7 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); -#define MAXJOYSTICK (JOYSTICKID2 + 30) #define JOY_PERIOD_MIN (10) /* min Capture time period */ #define JOY_PERIOD_MAX (1000) /* max Capture time period */ @@ -53,7 +52,7 @@ typedef struct tagWINE_JOYSTICK { HDRVR hDriver; } WINE_JOYSTICK; -static WINE_JOYSTICK JOY_Sticks[MAXJOYSTICK]; +static WINE_JOYSTICK joysticks[16]; static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) { @@ -68,14 +67,12 @@ static BOOL JOY_LoadDriver(DWORD dwJoyID) { static BOOL winejoystick_missing = FALSE; - if (dwJoyID >= MAXJOYSTICK || winejoystick_missing) - return FALSE; - if (JOY_Sticks[dwJoyID].hDriver) - return TRUE; + if (dwJoyID >= ARRAY_SIZE(joysticks) || winejoystick_missing) return FALSE; + if (joysticks[dwJoyID].hDriver) return TRUE; - JOY_Sticks[dwJoyID].hDriver = OpenDriverA("winejoystick.drv", 0, dwJoyID); + joysticks[dwJoyID].hDriver = OpenDriverA( "winejoystick.drv", 0, dwJoyID ); - if (!JOY_Sticks[dwJoyID].hDriver) + if (!joysticks[dwJoyID].hDriver) { WARN("OpenDriverA(\"winejoystick.drv\") failed\n"); @@ -83,7 +80,7 @@ static BOOL JOY_LoadDriver(DWORD dwJoyID) winejoystick_missing = TRUE; } - return (JOY_Sticks[dwJoyID].hDriver != 0); + return (joysticks[dwJoyID].hDriver != 0); } /************************************************************************** @@ -98,10 +95,11 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi LONG pos; unsigned buttonChange; - for (i = 0; i < MAXJOYSTICK; i++) { - joy = &JOY_Sticks[i]; + for (i = 0; i < ARRAY_SIZE(joysticks); i++) + { + joy = &joysticks[i]; - if (joy->hCapture != hWnd) continue; + if (joy->hCapture != hWnd) continue; res = joyGetPos(i, &ji); if (res != JOYERR_NOERROR) { @@ -153,15 +151,7 @@ MMRESULT WINAPI joyConfigChanged(DWORD flags) */ UINT WINAPI DECLSPEC_HOTPATCH joyGetNumDevs(void) { - UINT ret = 0; - int i; - - for (i = 0; i < MAXJOYSTICK; i++) { - if (JOY_LoadDriver(i)) { - ret += SendDriverMessage(JOY_Sticks[i].hDriver, JDD_GETNUMDEVS, 0, 0); - } - } - return ret; + return ARRAY_SIZE(joysticks); } /************************************************************************** @@ -178,13 +168,13 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, U wcscpy( caps->szRegKey, L"DINPUT.DLL" ); if (id == ~(UINT_PTR)0) return JOYERR_NOERROR; - if (id >= MAXJOYSTICK) return JOYERR_PARMS; + if (id >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; caps->wPeriodMin = JOY_PERIOD_MIN; /* FIXME */ caps->wPeriodMax = JOY_PERIOD_MAX; /* FIXME (same as MS Joystick Driver) */ - return SendDriverMessage( JOY_Sticks[id].hDriver, JDD_GETDEVCAPS, (LPARAM)caps, size ); + return SendDriverMessage( joysticks[id].hDriver, JDD_GETDEVCAPS, (LPARAM)caps, size ); } /************************************************************************** @@ -252,7 +242,7 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo) TRACE("(%d, %p);\n", wID, lpInfo); if (!lpInfo) return MMSYSERR_INVALPARAM; - if (wID >= MAXJOYSTICK || lpInfo->dwSize < sizeof(JOYINFOEX)) return JOYERR_PARMS; + if (wID >= ARRAY_SIZE(joysticks) || lpInfo->dwSize < sizeof(JOYINFOEX)) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; lpInfo->dwXpos = 0; @@ -267,7 +257,7 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo) lpInfo->dwReserved1 = 0; lpInfo->dwReserved2 = 0; - return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETPOSEX, (LPARAM)lpInfo, 0); + return SendDriverMessage( joysticks[wID].hDriver, JDD_GETPOSEX, (LPARAM)lpInfo, 0 ); } /************************************************************************** @@ -278,7 +268,7 @@ MMRESULT WINAPI joyGetPos(UINT wID, LPJOYINFO lpInfo) TRACE("(%d, %p);\n", wID, lpInfo); if (!lpInfo) return MMSYSERR_INVALPARAM; - if (wID >= MAXJOYSTICK) return JOYERR_PARMS; + if (wID >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; lpInfo->wXpos = 0; @@ -286,7 +276,7 @@ MMRESULT WINAPI joyGetPos(UINT wID, LPJOYINFO lpInfo) lpInfo->wZpos = 0; lpInfo->wButtons = 0; - return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETPOS, (LPARAM)lpInfo, 0); + return SendDriverMessage( joysticks[wID].hDriver, JDD_GETPOS, (LPARAM)lpInfo, 0 ); } /************************************************************************** @@ -296,9 +286,9 @@ MMRESULT WINAPI joyGetThreshold(UINT wID, LPUINT lpThreshold) { TRACE("(%04X, %p);\n", wID, lpThreshold); - if (wID >= MAXJOYSTICK) return JOYERR_PARMS; + if (wID >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; - *lpThreshold = JOY_Sticks[wID].threshold; + *lpThreshold = joysticks[wID].threshold; return JOYERR_NOERROR; } @@ -309,13 +299,13 @@ MMRESULT WINAPI joyReleaseCapture(UINT wID) { TRACE("(%04X);\n", wID); - if (wID >= MAXJOYSTICK) return JOYERR_PARMS; + if (wID >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; - if (JOY_Sticks[wID].hCapture) + if (joysticks[wID].hCapture) { - KillTimer(JOY_Sticks[wID].hCapture, JOY_Sticks[wID].wTimer); - JOY_Sticks[wID].hCapture = 0; - JOY_Sticks[wID].wTimer = 0; + KillTimer( joysticks[wID].hCapture, joysticks[wID].wTimer ); + joysticks[wID].hCapture = 0; + joysticks[wID].wTimer = 0; } else TRACE("Joystick is not captured, ignoring request.\n"); @@ -330,22 +320,17 @@ MMRESULT WINAPI joySetCapture(HWND hWnd, UINT wID, UINT wPeriod, BOOL bChanged) { TRACE("(%p, %04X, %d, %d);\n", hWnd, wID, wPeriod, bChanged); - if (wID >= MAXJOYSTICK || hWnd == 0) return JOYERR_PARMS; + if (wID >= ARRAY_SIZE(joysticks) || hWnd == 0) return JOYERR_PARMS; if (wPeriod<JOY_PERIOD_MIN) wPeriod = JOY_PERIOD_MIN; else if(wPeriod>JOY_PERIOD_MAX) wPeriod = JOY_PERIOD_MAX; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; - if (JOY_Sticks[wID].hCapture || !IsWindow(hWnd)) - return JOYERR_NOCANDO; /* FIXME: what should be returned ? */ - - if (joyGetPos(wID, &JOY_Sticks[wID].ji) != JOYERR_NOERROR) - return JOYERR_UNPLUGGED; - - if ((JOY_Sticks[wID].wTimer = SetTimer(hWnd, 0, wPeriod, JOY_Timer)) == 0) - return JOYERR_NOCANDO; + if (joysticks[wID].hCapture || !IsWindow( hWnd )) return JOYERR_NOCANDO; /* FIXME: what should be returned ? */ + if (joyGetPos( wID, &joysticks[wID].ji ) != JOYERR_NOERROR) return JOYERR_UNPLUGGED; + if ((joysticks[wID].wTimer = SetTimer( hWnd, 0, wPeriod, JOY_Timer )) == 0) return JOYERR_NOCANDO; - JOY_Sticks[wID].hCapture = hWnd; - JOY_Sticks[wID].bChanged = bChanged; + joysticks[wID].hCapture = hWnd; + joysticks[wID].bChanged = bChanged; return JOYERR_NOERROR; } @@ -357,9 +342,9 @@ MMRESULT WINAPI joySetThreshold(UINT wID, UINT wThreshold) { TRACE("(%04X, %d);\n", wID, wThreshold); - if (wID >= MAXJOYSTICK || wThreshold > 65535) return MMSYSERR_INVALPARAM; + if (wID >= ARRAY_SIZE(joysticks) || wThreshold > 65535) return MMSYSERR_INVALPARAM; - JOY_Sticks[wID].threshold = wThreshold; + joysticks[wID].threshold = wThreshold; return JOYERR_NOERROR; }

1 0

Alexandre Julliard : mpg123: Disable the large file wrappers.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 338af407076e3dde82342e441571e8a64b98c1e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=338af407076e3dde82342e44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 18:41:52 2021 +0100 mpg123: Disable the large file wrappers. off_t and long are the same thing in msvcrt. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52191 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/mpg123/Makefile.in | 3 +- libs/mpg123/src/libmpg123/lfs_wrap.c | 781 ----------------------------------- 2 files changed, 1 insertion(+), 783 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=338af407076e3dde8234…

1 0

Jinoh Kang : ntdll: Fix valid frame address range in ARM/ARM64.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 1886b3d322749c40aa91f8058d9a1d6385e7f3f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1886b3d322749c40aa91f805… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Dec 9 18:03:13 2021 +0900 ntdll: Fix valid frame address range in ARM/ARM64. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 72f3b023e45..12ffbb3663a 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -89,7 +89,7 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) { if (frame & 3) return FALSE; return ((void *)frame >= NtCurrentTeb()->Tib.StackLimit && - (void **)frame < (void **)NtCurrentTeb()->Tib.StackBase - 1); + (void *)frame <= NtCurrentTeb()->Tib.StackBase); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 290639b676b..034c78f6b4d 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -96,7 +96,7 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) { if (frame & 7) return FALSE; return ((void *)frame >= NtCurrentTeb()->Tib.StackLimit && - (void **)frame < (void **)NtCurrentTeb()->Tib.StackBase - 1); + (void *)frame <= NtCurrentTeb()->Tib.StackBase); }

1 0