wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Jinoh Kang : ntdll: Support both HP-UX-like libunwind and LLVM libunwind error codes.
by Alexandre Julliard 09 Dec '21

09 Dec '21

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

Dmitry Timoshkov : d3d11: Handle D3D11_FEATURE_D3D9_OPTIONS in d3d11_device_CheckFeatureSupport().
by Alexandre Julliard 09 Dec '21

09 Dec '21

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

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

09 Dec '21

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: Revert direction rotation for UDEV lnxev devices.
by Alexandre Julliard 09 Dec '21

09 Dec '21

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

Rémi Bernon : winebus.sys: Use an unsigned 16bit range for saturation and deadband values.
by Alexandre Julliard 09 Dec '21

09 Dec '21

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 0 for the infinity durations in the UDEV lnxev backend.
by Alexandre Julliard 09 Dec '21

09 Dec '21

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

Ivo Ivanov : winebus.sys: Use SDL_HAPTIC_INFINITY for the infinity durations in the SDL backend.
by Alexandre Julliard 09 Dec '21

09 Dec '21

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 09 Dec '21

09 Dec '21

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

Alexandre Julliard : configure: Remove some no longer used checks.
by Alexandre Julliard 09 Dec '21

09 Dec '21

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

Alexandre Julliard : configure: Assume that sys/wait.h is available on Unix.
by Alexandre Julliard 09 Dec '21

09 Dec '21

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

← Newer
1
...
26
27
28
29
30
31
32
...
57
Older →

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