December 2021 - Wine-Commits

Jinoh Kang : ntdll: Support both HP-UX-like libunwind and LLVM libunwind error codes.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: f37b953e07f67a3d3c3bd800193d4dbbce635cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f37b953e07f67a3d3c3bd800… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Dec 10 01:26:53 2021 +0900 ntdll: Support both HP-UX-like libunwind and LLVM libunwind error codes. HP-UX libunwind uses the sign of error code to indicate whether the operation was successful; however, LLVM always returns positive error codes. Normalise the sign of the error code so that it handles all flavours of libunwind. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 5 +++-- dlls/ntdll/unix/signal_arm64.c | 5 +++-- dlls/ntdll/unix/signal_x86_64.c | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 2b25fb11caa..6389fdde058 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -248,12 +248,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { NTSTATUS status = context->Pc != context->Lr ? STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 3f62927e482..01deb9ef8dd 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -212,12 +212,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", ip, info.start_ip, info.end_ip ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 46dfa0c94c1..f3e6f8335d6 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1415,6 +1415,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG64 ip, ULONG64 *frame, CONTEXT *c *frame = context->Rsp; rc = unw_get_proc_info(&cursor, &info); + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc );

1 0

Henri Verbeet : wined3d: Use the access flags used to create the bo for persistent maps in wined3d_bo_gl_map().
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 194b47b4fd92dda8ebf24e88ca7a14fc926c84ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=194b47b4fd92dda8ebf24e88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 9 17:45:15 2021 +0100 wined3d: Use the access flags used to create the bo for persistent maps in wined3d_bo_gl_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 6391f6788e9..c08e44ce372 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2711,14 +2711,24 @@ map: gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (gl_info->supported[ARB_BUFFER_STORAGE]) - { - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, - GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | wined3d_resource_gl_map_flags(bo, flags))))) - { - if (wined3d_map_persistent()) - bo->b.map_ptr = map_ptr; - } + if (gl_info->supported[ARB_BUFFER_STORAGE] && wined3d_map_persistent()) + { + GLbitfield gl_flags; + + /* When mapping the bo persistently, we need to use the access flags + * used to create the bo, instead of the access flags passed to the + * map call. Otherwise, if for example the initial map call that + * caused the bo to be persistently mapped was a read-only map, + * subsequent write access to the bo would be undefined. */ + gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; + gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + if (!(gl_flags & GL_MAP_READ_BIT)) + gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; + if (gl_flags & GL_MAP_WRITE_BIT) + gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; + + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)))) + bo->b.map_ptr = map_ptr; } else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) {

1 0

Rémi Bernon : winebus.sys: Use an unsigned 16bit range for saturation and deadband values.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 4b1f9daad5e1f4f8556a0ac55330dcb82cd695d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b1f9daad5e1f4f8556a0ac5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 9 14:44:14 2021 +0100 winebus.sys: Use an unsigned 16bit range for saturation and deadband values. 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/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 8680f8a088c..32628f1f2fd 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -641,7 +641,7 @@ static BOOL hid_descriptor_add_set_condition(struct unix_device *iface) USAGE(1, PID_USAGE_NEGATIVE_SATURATION), USAGE(1, PID_USAGE_DEAD_BAND), LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(2, 0x7fff), + LOGICAL_MAXIMUM(4, 0xffff), PHYSICAL_MINIMUM(1, 0), PHYSICAL_MAXIMUM(2, +10000), REPORT_SIZE(1, 16),

1 0

Ivo Ivanov : winebus.sys: Use SDL_HAPTIC_INFINITY for the infinity durations in the SDL backend.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: b3faad66cf2973adc769e76b8022de26090d9756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3faad66cf2973adc769e76b… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Dec 9 14:44:12 2021 +0100 winebus.sys: Use SDL_HAPTIC_INFINITY for the infinity durations in the SDL backend. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 76d90ab7912..37d75d0bc95 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -515,7 +515,7 @@ static NTSTATUS sdl_device_physical_effect_control(struct unix_device *iface, BY pSDL_HapticStopAll(impl->sdl_haptic); /* fallthrough */ case PID_USAGE_OP_EFFECT_START: - pSDL_HapticRunEffect(impl->sdl_haptic, id, iterations); + pSDL_HapticRunEffect(impl->sdl_haptic, id, (iterations == 0xff ? SDL_HAPTIC_INFINITY : iterations)); break; case PID_USAGE_OP_EFFECT_STOP: pSDL_HapticStopEffect(impl->sdl_haptic, id); @@ -592,7 +592,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT case PID_USAGE_ET_TRIANGLE: case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: - effect.periodic.length = params->duration; + effect.periodic.length = (params->duration == 0xffff ? SDL_HAPTIC_INFINITY : params->duration); effect.periodic.delay = params->start_delay; effect.periodic.button = params->trigger_button; effect.periodic.interval = params->trigger_repeat_interval; @@ -613,7 +613,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT case PID_USAGE_ET_DAMPER: case PID_USAGE_ET_INERTIA: case PID_USAGE_ET_FRICTION: - effect.condition.length = params->duration; + effect.condition.length = (params->duration == 0xffff ? SDL_HAPTIC_INFINITY : params->duration); effect.condition.delay = params->start_delay; effect.condition.button = params->trigger_button; effect.condition.interval = params->trigger_repeat_interval; @@ -641,7 +641,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT break; case PID_USAGE_ET_CONSTANT_FORCE: - effect.constant.length = params->duration; + effect.constant.length = (params->duration == 0xffff ? SDL_HAPTIC_INFINITY : params->duration); effect.constant.delay = params->start_delay; effect.constant.button = params->trigger_button; effect.constant.interval = params->trigger_repeat_interval; @@ -655,6 +655,8 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.constant.fade_level = params->envelope.fade_level; break; + /* According to the SDL documentation, ramp effect doesn't + * support SDL_HAPTIC_INFINITY. */ case PID_USAGE_ET_RAMP: effect.ramp.length = params->duration; effect.ramp.delay = params->start_delay;

1 0

Ivo Ivanov : winebus.sys: Scale the force feedback gain value to the Linux FF_GAIN range.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: bc36b50c070bafa9c17a3406d248e3720580c697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc36b50c070bafa9c17a3406… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Dec 9 14:44:11 2021 +0100 winebus.sys: Scale the force feedback gain value to the Linux FF_GAIN range. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 53dca8fce56..56260f9ed61 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -945,7 +945,7 @@ static NTSTATUS lnxev_device_physical_device_set_gain(struct unix_device *iface, { .type = EV_FF, .code = FF_GAIN, - .value = percent, + .value = 0xffff * percent / 100, }; TRACE("iface %p, percent %#x.\n", iface, percent);

1 0

Ivo Ivanov : winebus.sys: Use 0 for the infinity durations in the UDEV lnxev backend.
by Alexandre Julliard Dec. 9, 2021

Dec. 9, 2021

Module: wine Branch: master Commit: 1cab62f1a0db009b142d538c1e0ff4a41eb59ecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cab62f1a0db009b142d538c… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Dec 9 14:44:13 2021 +0100 winebus.sys: Use 0 for the infinity durations in the UDEV lnxev backend. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 56260f9ed61..dec8435555c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1041,7 +1041,7 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B if (params->effect_type == PID_USAGE_UNDEFINED) return STATUS_SUCCESS; if ((status = set_effect_type_from_usage(&effect, params->effect_type))) return status; - effect.replay.length = params->duration; + effect.replay.length = (params->duration == 0xffff ? 0 : params->duration); effect.replay.delay = params->start_delay; effect.trigger.button = params->trigger_button; effect.trigger.interval = params->trigger_repeat_interval;

1 0

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

Dec. 9, 2021

Module: wine Branch: master Commit: a7ac3de3b36e96c556873d1c7dd68f681c48ffbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7ac3de3b36e96c556873d1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:04:40 2021 +0100 configure: Assume that sys/socket.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 116 ++++++++++-------------------------------- configure.ac | 35 +++---------- dlls/nsiproxy.sys/icmp_echo.c | 3 -- dlls/nsiproxy.sys/ip.c | 6 --- dlls/nsiproxy.sys/ndis.c | 6 +-- dlls/nsiproxy.sys/tcp.c | 5 +- dlls/nsiproxy.sys/udp.c | 10 +--- dlls/ntdll/unix/file.c | 2 - dlls/ntdll/unix/process.c | 2 - dlls/ntdll/unix/server.c | 4 +- dlls/ntdll/unix/socket.c | 4 +- dlls/ntdll/unix/virtual.c | 4 +- dlls/winex11.drv/opengl.c | 2 - dlls/ws2_32/unixlib.c | 4 +- include/config.h.in | 3 -- server/mailslot.c | 2 - server/process.c | 4 +- server/request.c | 4 +- server/sock.c | 4 +- 19 files changed, 47 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7ac3de3b36e96c55687…

1 0

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

Dec. 9, 2021

Module: wine Branch: master Commit: 411592bf45ef73543a68618432c295a1d279e574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=411592bf45ef73543a686184… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:10:43 2021 +0100 configure: Assume that sys/wait.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/process.c | 4 +--- dlls/ntdll/unix/server.c | 2 -- include/config.h.in | 3 --- libs/wine/mmap.c | 2 -- server/ptrace.c | 4 +--- server/request.c | 4 +--- 9 files changed, 4 insertions(+), 26 deletions(-) diff --git a/configure b/configure index 00e3e7844a1..09e8530446a 100755 --- a/configure +++ b/configure @@ -8677,12 +8677,6 @@ if test "x$ac_cv_header_sys_vnode_h" = xyes then : printf "%s\n" "#define HAVE_SYS_VNODE_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_wait_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "syscall.h" "ac_cv_header_syscall_h" "$ac_includes_default" if test "x$ac_cv_header_syscall_h" = xyes diff --git a/configure.ac b/configure.ac index 760e4f0ed04..8ef1fbbd694 100644 --- a/configure.ac +++ b/configure.ac @@ -505,7 +505,6 @@ AC_CHECK_HEADERS(\ sys/user.h \ sys/utsname.h \ sys/vnode.h \ - sys/wait.h \ syscall.h \ utime.h \ valgrind/memcheck.h \ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index cc365fd37d1..8f20da7eece 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -35,6 +35,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/mman.h> +#include <sys/wait.h> #include <unistd.h> #include <dlfcn.h> #ifdef HAVE_PWD_H @@ -52,9 +53,6 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif #include <limits.h> #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index a07bbf43a6e..23aa340359e 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -39,9 +39,7 @@ # include <sys/times.h> #endif #include <sys/types.h> -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif +#include <sys/wait.h> #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 8c8dcf24477..a388247beb2 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -45,9 +45,7 @@ #include <sys/types.h> #include <sys/mman.h> #include <sys/socket.h> -#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif diff --git a/include/config.h.in b/include/config.h.in index 7f57ce10a7d..2bd8d2fa1ae 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -733,9 +733,6 @@ /* Define to 1 if you have the <sys/vnode.h> header file. */ #undef HAVE_SYS_VNODE_H -/* Define to 1 if you have the <sys/wait.h> header file. */ -#undef HAVE_SYS_WAIT_H - /* Define to 1 if you have the `tcdrain' function. */ #undef HAVE_TCDRAIN diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index c8d1b59a4db..ad51153d039 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -28,9 +28,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -#endif #include <sys/mman.h> #include <unistd.h> #ifdef HAVE_STDINT_H diff --git a/server/ptrace.c b/server/ptrace.c index 1875e1dfd56..976d3a3778e 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -27,15 +27,13 @@ #include <signal.h> #include <stdarg.h> #include <sys/types.h> +#include <sys/wait.h> #ifdef HAVE_SYS_PTRACE_H # include <sys/ptrace.h> #endif #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif diff --git a/server/request.c b/server/request.c index 086e5f63919..7021741c765 100644 --- a/server/request.c +++ b/server/request.c @@ -35,9 +35,7 @@ #include <sys/time.h> #include <sys/types.h> #include <sys/socket.h> -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif +#include <sys/wait.h> #ifdef HAVE_SYS_UIO_H #include <sys/uio.h> #endif

1 0

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

Dec. 9, 2021

Module: wine Branch: master Commit: e5d69d9ee6b01e359abe0ea326c5e13bf81e3042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5d69d9ee6b01e359abe0ea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:09:50 2021 +0100 configure: Assume that sys/ioctl.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 1 - dlls/avicap32/v4l.c | 8 ++------ dlls/mountmgr.sys/diskarb.c | 4 +--- dlls/nsiproxy.sys/ndis.c | 5 +---- dlls/ntdll/unix/cdrom.c | 3 --- dlls/ntdll/unix/file.c | 4 +--- dlls/ntdll/unix/serial.c | 4 +--- dlls/ntdll/unix/socket.c | 4 +--- dlls/ntdll/unix/tape.c | 2 -- dlls/qcap/v4l.c | 2 -- dlls/winebus.sys/bus_udev.c | 4 +--- dlls/winejoystick.drv/joystick_linux.c | 2 -- dlls/wineoss.drv/midi.c | 4 +--- dlls/wineoss.drv/mmaux.c | 4 +--- include/config.h.in | 3 --- server/mailslot.c | 2 -- server/serial.c | 4 +--- server/sock.c | 2 -- 19 files changed, 11 insertions(+), 57 deletions(-) diff --git a/configure b/configure index cc4bf14c3cc..00e3e7844a1 100755 --- a/configure +++ b/configure @@ -8521,12 +8521,6 @@ if test "x$ac_cv_header_sys_filio_h" = xyes then : printf "%s\n" "#define HAVE_SYS_FILIO_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_ioctl_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default" if test "x$ac_cv_header_sys_ipc_h" = xyes diff --git a/configure.ac b/configure.ac index f6cf66661d5..760e4f0ed04 100644 --- a/configure.ac +++ b/configure.ac @@ -479,7 +479,6 @@ AC_CHECK_HEADERS(\ sys/epoll.h \ sys/event.h \ sys/filio.h \ - sys/ioctl.h \ sys/ipc.h \ sys/link.h \ sys/modem.h \ diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index 4b285d94c3c..4f3a162c838 100644 --- a/dlls/avicap32/v4l.c +++ b/dlls/avicap32/v4l.c @@ -28,12 +28,8 @@ #include <stdarg.h> #include <stdio.h> #include <unistd.h> -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> +#include <sys/ioctl.h> #ifdef HAVE_LINUX_VIDEODEV2_H # include <linux/videodev2.h> #endif diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index e034a4c1c5b..50a32bef079 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -30,9 +30,7 @@ #include <stdarg.h> #include <stdio.h> #include <unistd.h> -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif +#include <sys/ioctl.h> #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H #include <DiskArbitration/DiskArbitration.h> #endif diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index bb69c852253..86c4248c9ec 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -27,6 +27,7 @@ #include <stdarg.h> #include <sys/types.h> #include <sys/socket.h> +#include <sys/ioctl.h> #include <unistd.h> #ifdef HAVE_NET_IF_H @@ -49,10 +50,6 @@ #include <net/route.h> #endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif - #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> #endif diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index db3b9cd25c2..a9385daf099 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -41,10 +41,7 @@ # include <sys/sysmacros.h> #endif #include <sys/types.h> - -#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> -#endif #ifdef HAVE_SCSI_SG_H # include <scsi/sg.h> #endif diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d4271fda2a8..e459087af76 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -50,6 +50,7 @@ #endif #include <sys/socket.h> #include <sys/time.h> +#include <sys/ioctl.h> #ifdef HAVE_SYS_ATTR_H #include <sys/attr.h> #endif @@ -79,9 +80,6 @@ #undef list_move_tail #undef list_remove #endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif #ifdef HAVE_LINUX_IOCTL_H #include <linux/ioctl.h> #endif diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index ff2786ada70..16c5964b77b 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -36,12 +36,10 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> +#include <sys/ioctl.h> #ifdef HAVE_SYS_FILIO_H # include <sys/filio.h> #endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif #ifdef HAVE_SYS_MODEM_H # include <sys/modem.h> #endif diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index ee27912a3e8..59551aa51e8 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -26,6 +26,7 @@ #include <errno.h> #include <sys/types.h> #include <sys/socket.h> +#include <sys/ioctl.h> #include <unistd.h> #ifdef HAVE_IFADDRS_H # include <ifaddrs.h> @@ -33,9 +34,6 @@ #ifdef HAVE_NET_IF_H # include <net/if.h> #endif -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif #ifdef HAVE_NETINET_IN_H # define __APPLE_USE_RFC_3542 # include <netinet/in.h> diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 741de2f6d95..40ac307a632 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -31,9 +31,7 @@ #include <string.h> #include <sys/types.h> #include <unistd.h> -#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> -#endif #ifdef HAVE_SYS_MTIO_H #include <sys/mtio.h> #endif diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index aa4d725939a..ae663389d14 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -32,9 +32,7 @@ #include <stdlib.h> #include <fcntl.h> #include <dlfcn.h> -#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> -#endif #include <sys/mman.h> #include <errno.h> #include <sys/time.h> diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 2c23c81b9ef..53dca8fce56 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -33,15 +33,13 @@ #include <dirent.h> #include <unistd.h> #include <poll.h> +#include <sys/ioctl.h> #ifdef HAVE_LIBUDEV_H # include <libudev.h> #endif #ifdef HAVE_LINUX_HIDRAW_H # include <linux/hidraw.h> #endif -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif #ifdef HAVE_SYS_INOTIFY_H # include <sys/inotify.h> #endif diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 0280fa2534c..50f06bc7331 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -44,9 +44,7 @@ #include <stdlib.h> #include <string.h> #include <fcntl.h> -#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> -#endif #ifdef HAVE_LINUX_IOCTL_H #include <linux/ioctl.h> #endif diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 7128d07ec50..439bc9e442c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -49,9 +49,7 @@ #include <unistd.h> #include <fcntl.h> #include <errno.h> -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif +#include <sys/ioctl.h> #include <poll.h> #include <sys/soundcard.h> diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 26fea510eae..7d0b8ed53cc 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -26,9 +26,7 @@ #include <sys/types.h> #include <unistd.h> #include <fcntl.h> -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif +#include <sys/ioctl.h> #include <sys/soundcard.h> #include "windef.h" diff --git a/include/config.h.in b/include/config.h.in index 768f36143d6..7f57ce10a7d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -628,9 +628,6 @@ /* Define to 1 if you have the <sys/inotify.h> header file. */ #undef HAVE_SYS_INOTIFY_H -/* Define to 1 if you have the <sys/ioctl.h> header file. */ -#undef HAVE_SYS_IOCTL_H - /* Define to 1 if you have the <sys/ipc.h> header file. */ #undef HAVE_SYS_IPC_H diff --git a/server/mailslot.c b/server/mailslot.c index 5878ba1408a..2d8697ec9bd 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -31,9 +31,7 @@ #include <sys/time.h> #include <sys/types.h> #include <unistd.h> -#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> -#endif #include <sys/socket.h> #ifdef HAVE_SYS_FILIO_H #include <sys/filio.h> diff --git a/server/serial.c b/server/serial.c index 905bde4d69a..d665eb7fa35 100644 --- a/server/serial.c +++ b/server/serial.c @@ -30,6 +30,7 @@ #include <stdlib.h> #include <sys/time.h> #include <sys/types.h> +#include <sys/ioctl.h> #include <time.h> #include <termios.h> #include <unistd.h> @@ -37,9 +38,6 @@ #ifdef HAVE_UTIME_H #include <utime.h> #endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/sock.c b/server/sock.c index 9a686325b27..8521e34ed7e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -43,9 +43,7 @@ #include <sys/time.h> #include <sys/types.h> #include <sys/socket.h> -#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> -#endif #ifdef HAVE_SYS_FILIO_H # include <sys/filio.h> #endif

1 0

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

Dec. 9, 2021

Module: wine Branch: master Commit: b3ca48f39ce822c197193ffc419771f1869f3c83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3ca48f39ce822c197193ffc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:07:29 2021 +0100 configure: Assume that sys/time.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 10 +--------- configure.ac | 5 +---- dlls/ntdll/unix/file.c | 4 +--- dlls/ntdll/unix/process.c | 4 +--- dlls/ntdll/unix/sync.c | 4 +--- dlls/ntdll/unix/system.c | 4 +--- dlls/qcap/v4l.c | 2 -- dlls/winex11.drv/x11drv_main.c | 4 +--- dlls/ws2_32/unixlib.c | 4 +--- include/config.h.in | 3 --- 10 files changed, 8 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 2584c750317..cc4bf14c3cc 100755 --- a/configure +++ b/configure @@ -8647,12 +8647,6 @@ if test "x$ac_cv_header_sys_sysinfo_h" = xyes then : printf "%s\n" "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_time_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "sys/timeout.h" "ac_cv_header_sys_timeout_h" "$ac_includes_default" if test "x$ac_cv_header_sys_timeout_h" = xyes @@ -9485,9 +9479,7 @@ then : fi -ac_fn_c_check_header_compile "$LINENO" "linux/videodev2.h" "ac_cv_header_linux_videodev2_h" "#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif +ac_fn_c_check_header_compile "$LINENO" "linux/videodev2.h" "ac_cv_header_linux_videodev2_h" "#include <sys/time.h> #include <sys/types.h> #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> diff --git a/configure.ac b/configure.ac index e08c9861a2b..f6cf66661d5 100644 --- a/configure.ac +++ b/configure.ac @@ -500,7 +500,6 @@ AC_CHECK_HEADERS(\ sys/strtio.h \ sys/syscall.h \ sys/sysinfo.h \ - sys/time.h \ sys/timeout.h \ sys/times.h \ sys/uio.h \ @@ -643,9 +642,7 @@ AC_CHECK_HEADERS([pthread_np.h],,, #endif]) AC_CHECK_HEADERS([linux/videodev2.h],,, -[#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif +[#include <sys/time.h> #include <sys/types.h> #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 3124147c94d..d4271fda2a8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -49,9 +49,7 @@ # include <sys/syscall.h> #endif #include <sys/socket.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +#include <sys/time.h> #ifdef HAVE_SYS_ATTR_H #include <sys/attr.h> #endif diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 256f43750db..a07bbf43a6e 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -34,9 +34,7 @@ #include <string.h> #include <time.h> #include <sys/socket.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +#include <sys/time.h> #ifdef HAVE_SYS_TIMES_H # include <sys/times.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 51505082862..442243d8bcf 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -37,9 +37,7 @@ #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +#include <sys/time.h> #include <poll.h> #include <unistd.h> #ifdef HAVE_SCHED_H diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index d1a40e47bbf..c2f1ee11eca 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -33,9 +33,7 @@ #include <sys/types.h> #include <unistd.h> #include <errno.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +#include <sys/time.h> #include <time.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 9a66a50e31d..aa4d725939a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -37,9 +37,7 @@ #endif #include <sys/mman.h> #include <errno.h> -#ifdef HAVE_SYS_TIME_H #include <sys/time.h> -#endif #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> #endif diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index ab2af7a9e38..32beb84a009 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -26,9 +26,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +#include <sys/time.h> #include <unistd.h> #include <dlfcn.h> #include <X11/cursorfont.h> diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index ea16d1844a1..e89ebe35248 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -33,6 +33,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/socket.h> +#include <sys/time.h> #ifdef HAVE_NETDB_H # include <netdb.h> #endif @@ -62,9 +63,6 @@ # include <ifaddrs.h> #endif #include <poll.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> diff --git a/include/config.h.in b/include/config.h.in index b36b109287d..768f36143d6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -712,9 +712,6 @@ /* Define to 1 if you have the <sys/times.h> header file. */ #undef HAVE_SYS_TIMES_H -/* Define to 1 if you have the <sys/time.h> header file. */ -#undef HAVE_SYS_TIME_H - /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H

1 0