May 2019 - Wine-devel - list.winehq.org

[PATCH 2/4] kernel32: Simplify TIME_CompTimeZoneID() by passing time as LONGLONG.
by Huw Davies 15 May '19

15 May '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/time.c | 52 ++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index e7f5f0e326..8805c81aaa 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -146,7 +146,7 @@ static int TIME_DayLightCompareDate( const SYSTEMTIME *date, * * PARAMS * pTZinfo [in] The time zone data. - * lpFileTime [in] The system or local time. + * time [in] The system or local time. * islocal [in] it is local time. * * RETURNS @@ -156,14 +156,13 @@ static int TIME_DayLightCompareDate( const SYSTEMTIME *date, * TIME_ZONE_ID_DAYLIGHT Current time is daylight savings time */ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, - FILETIME *lpFileTime, BOOL islocal ) + LONGLONG time, BOOL islocal ) { int ret, year; BOOL beforeStandardDate, afterDaylightDate; DWORD retval = TIME_ZONE_ID_INVALID; - LONGLONG llTime = 0; /* initialized to prevent gcc complaining */ SYSTEMTIME SysTime; - FILETIME ftTemp; + FILETIME ft; if (pTZinfo->DaylightDate.wMonth != 0) { @@ -181,20 +180,17 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, return TIME_ZONE_ID_INVALID; } - if (!islocal) { - llTime = filetime_to_longlong( lpFileTime ); - llTime -= pTZinfo->Bias * (LONGLONG)600000000; - longlong_to_filetime( llTime, &ftTemp ); - lpFileTime = &ftTemp; - } + if (!islocal) + time -= pTZinfo->Bias * (LONGLONG)600000000; - FileTimeToSystemTime(lpFileTime, &SysTime); + longlong_to_filetime( time, &ft ); + FileTimeToSystemTime( &ft, &SysTime ); year = SysTime.wYear; if (!islocal) { - llTime -= pTZinfo->DaylightBias * (LONGLONG)600000000; - longlong_to_filetime( llTime, &ftTemp ); - FileTimeToSystemTime(lpFileTime, &SysTime); + time -= pTZinfo->DaylightBias * (LONGLONG)600000000; + longlong_to_filetime( time, &ft ); + FileTimeToSystemTime( &ft, &SysTime ); } /* check for daylight savings */ @@ -208,14 +204,13 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, beforeStandardDate = SysTime.wYear < year; if (!islocal) { - llTime -= ( pTZinfo->StandardBias - pTZinfo->DaylightBias ) - * (LONGLONG)600000000; - longlong_to_filetime( llTime, &ftTemp ); - FileTimeToSystemTime(lpFileTime, &SysTime); + time -= ( pTZinfo->StandardBias - pTZinfo->DaylightBias ) * (LONGLONG)600000000; + longlong_to_filetime( time, &ft ); + FileTimeToSystemTime( &ft, &SysTime ); } if(year == SysTime.wYear) { - ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate); + ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate ); if (ret == -2) return TIME_ZONE_ID_INVALID; @@ -224,7 +219,7 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, afterDaylightDate = SysTime.wYear > year; retval = TIME_ZONE_ID_STANDARD; - if( pTZinfo->DaylightDate.wMonth < pTZinfo->StandardDate.wMonth ) { + if( pTZinfo->DaylightDate.wMonth < pTZinfo->StandardDate.wMonth ) { /* Northern hemisphere */ if( beforeStandardDate && afterDaylightDate ) retval = TIME_ZONE_ID_DAYLIGHT; @@ -254,9 +249,10 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, */ static DWORD TIME_ZoneID( const TIME_ZONE_INFORMATION *pTzi ) { - FILETIME ftTime; - GetSystemTimeAsFileTime( &ftTime); - return TIME_CompTimeZoneID( pTzi, &ftTime, FALSE); + LARGE_INTEGER now; + + NtQuerySystemTime( &now ); + return TIME_CompTimeZoneID( pTzi, now.QuadPart, FALSE ); } /*********************************************************************** @@ -266,7 +262,7 @@ static DWORD TIME_ZoneID( const TIME_ZONE_INFORMATION *pTzi ) * * PARAMS * pTZinfo [in] The time zone data. - * lpFileTime [in] The system or local time. + * time [in] The system or local time. * islocal [in] It is local time. * pBias [out] The calculated bias in minutes. * @@ -274,10 +270,10 @@ static DWORD TIME_ZoneID( const TIME_ZONE_INFORMATION *pTzi ) * TRUE when the time zone bias was calculated. */ static BOOL TIME_GetTimezoneBias( const TIME_ZONE_INFORMATION *pTZinfo, - FILETIME *lpFileTime, BOOL islocal, LONG *pBias ) + LONGLONG time, BOOL islocal, LONG *pBias ) { LONG bias = pTZinfo->Bias; - DWORD tzid = TIME_CompTimeZoneID( pTZinfo, lpFileTime, islocal); + DWORD tzid = TIME_CompTimeZoneID( pTZinfo, time, islocal ); if( tzid == TIME_ZONE_ID_INVALID) return FALSE; @@ -700,7 +696,7 @@ BOOL WINAPI SystemTimeToTzSpecificLocalTime( if (!SystemTimeToFileTime(lpUniversalTime, &ft)) return FALSE; llTime = filetime_to_longlong( &ft ); - if (!TIME_GetTimezoneBias(&tzinfo, &ft, FALSE, &lBias)) + if (!TIME_GetTimezoneBias(&tzinfo, llTime, FALSE, &lBias)) return FALSE; /* convert minutes to 100-nanoseconds-ticks */ llTime -= (LONGLONG)lBias * 600000000; @@ -745,7 +741,7 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime( if (!SystemTimeToFileTime(lpLocalTime, &ft)) return FALSE; t = filetime_to_longlong( &ft ); - if (!TIME_GetTimezoneBias(&tzinfo, &ft, TRUE, &lBias)) + if (!TIME_GetTimezoneBias(&tzinfo, t, TRUE, &lBias)) return FALSE; /* convert minutes to 100-nanoseconds-ticks */ t += (LONGLONG)lBias * 600000000; -- 2.17.1

1 0

[PATCH 1/4] kernel32: Replace macros with inline helpers.
by Huw Davies 15 May '19

15 May '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/time.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 41742894dd..e7f5f0e326 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -53,11 +53,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(time); #define CALINFO_MAX_YEAR 2029 -#define LL2FILETIME( ll, pft )\ - (pft)->dwLowDateTime = (UINT)(ll); \ - (pft)->dwHighDateTime = (UINT)((ll) >> 32); -#define FILETIME2LL( pft, ll) \ - ll = (((LONGLONG)((pft)->dwHighDateTime))<<32) + (pft)-> dwLowDateTime ; +static inline void longlong_to_filetime( LONGLONG t, FILETIME *ft ) +{ + ft->dwLowDateTime = (DWORD)t; + ft->dwHighDateTime = (DWORD)(t >> 32); +} + +static inline LONGLONG filetime_to_longlong( const FILETIME *ft ) +{ + return (((LONGLONG)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; +} static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; @@ -177,9 +182,9 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, } if (!islocal) { - FILETIME2LL( lpFileTime, llTime ); + llTime = filetime_to_longlong( lpFileTime ); llTime -= pTZinfo->Bias * (LONGLONG)600000000; - LL2FILETIME( llTime, &ftTemp) + longlong_to_filetime( llTime, &ftTemp ); lpFileTime = &ftTemp; } @@ -188,7 +193,7 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, if (!islocal) { llTime -= pTZinfo->DaylightBias * (LONGLONG)600000000; - LL2FILETIME( llTime, &ftTemp) + longlong_to_filetime( llTime, &ftTemp ); FileTimeToSystemTime(lpFileTime, &SysTime); } @@ -205,7 +210,7 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, if (!islocal) { llTime -= ( pTZinfo->StandardBias - pTZinfo->DaylightBias ) * (LONGLONG)600000000; - LL2FILETIME( llTime, &ftTemp) + longlong_to_filetime( llTime, &ftTemp ); FileTimeToSystemTime(lpFileTime, &SysTime); } @@ -694,12 +699,12 @@ BOOL WINAPI SystemTimeToTzSpecificLocalTime( if (!SystemTimeToFileTime(lpUniversalTime, &ft)) return FALSE; - FILETIME2LL( &ft, llTime) + llTime = filetime_to_longlong( &ft ); if (!TIME_GetTimezoneBias(&tzinfo, &ft, FALSE, &lBias)) return FALSE; /* convert minutes to 100-nanoseconds-ticks */ llTime -= (LONGLONG)lBias * 600000000; - LL2FILETIME( llTime, &ft) + longlong_to_filetime( llTime, &ft ); return FileTimeToSystemTime(&ft, lpLocalTime); } @@ -739,12 +744,12 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime( if (!SystemTimeToFileTime(lpLocalTime, &ft)) return FALSE; - FILETIME2LL( &ft, t) + t = filetime_to_longlong( &ft ); if (!TIME_GetTimezoneBias(&tzinfo, &ft, TRUE, &lBias)) return FALSE; /* convert minutes to 100-nanoseconds-ticks */ t += (LONGLONG)lBias * 600000000; - LL2FILETIME( t, &ft) + longlong_to_filetime( t, &ft ); return FileTimeToSystemTime(&ft, lpUniversalTime); } @@ -884,8 +889,8 @@ BOOL WINAPI GetProcessTimes( HANDLE hprocess, LPFILETIME lpCreationTime, TIME_ClockTimeToFileTime(tms.tms_stime,lpKernelTime); if (NtQueryInformationProcess( hprocess, ProcessTimes, &pti, sizeof(pti), NULL)) return FALSE; - LL2FILETIME( pti.CreateTime.QuadPart, lpCreationTime); - LL2FILETIME( pti.ExitTime.QuadPart, lpExitTime); + longlong_to_filetime( pti.CreateTime.QuadPart, lpCreationTime ); + longlong_to_filetime( pti.ExitTime.QuadPart, lpExitTime ); return TRUE; } -- 2.17.1

1 0

[PATCH 1/2] winex11.drv: Activate window when restoring.
by Zhiyi Zhang 15 May '19

15 May '19

Some games, e.g., Mirror's Edge waits for WM_ACTIVATE when restoring from iconic state. Without this, the game remains black screen. Windows sends WM_ACTIVATE when you click on the taskbar to restore windows. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/event.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6054f645c4..a75bc61b60 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1255,6 +1255,7 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat { TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); release_win_data( data ); + SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); return; } @@ -1266,6 +1267,7 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); release_win_data( data ); + SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); return; } -- 2.20.1

2 1

[PATCH 1/5] strmbase: Use heap_alloc_zero() in enum_pins_create().
by Zebediah Figura 15 May '19

15 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/enumpins.c | 33 ++++++++++++++++---------------- dlls/strmbase/strmbase_private.h | 1 + 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 15d6cab8df..4503a4705e 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -39,36 +39,35 @@ static inline IEnumPinsImpl *impl_from_IEnumPins(IEnumPins *iface) static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; -HRESULT enum_pins_create(BaseFilter *base, IEnumPins **ppEnum) +HRESULT enum_pins_create(BaseFilter *base, IEnumPins **out) { - IEnumPinsImpl * pEnumPins; + IEnumPinsImpl *object; IPin *pin; - if (!ppEnum) + if (!out) return E_POINTER; - pEnumPins = CoTaskMemAlloc(sizeof(IEnumPinsImpl)); - if (!pEnumPins) + if (!(object = heap_alloc_zero(sizeof(*object)))) { - *ppEnum = NULL; + *out = NULL; return E_OUTOFMEMORY; } - pEnumPins->IEnumPins_iface.lpVtbl = &IEnumPinsImpl_Vtbl; - pEnumPins->refCount = 1; - pEnumPins->uIndex = 0; - pEnumPins->base = base; + + object->IEnumPins_iface.lpVtbl = &IEnumPinsImpl_Vtbl; + object->refCount = 1; + object->base = base; IBaseFilter_AddRef(&base->IBaseFilter_iface); - *ppEnum = &pEnumPins->IEnumPins_iface; - pEnumPins->Version = base->pin_version; - pEnumPins->count = 0; + object->Version = base->pin_version; - while ((pin = base->pFuncsTable->pfnGetPin(base, pEnumPins->count))) + while ((pin = base->pFuncsTable->pfnGetPin(base, object->count))) { IPin_Release(pin); - ++pEnumPins->count; + ++object->count; } - TRACE("Created new enumerator (%p)\n", *ppEnum); + TRACE("Created enumerator %p.\n", object); + *out = &object->IEnumPins_iface; + return S_OK; } @@ -114,7 +113,7 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) if (!ref) { IBaseFilter_Release(&This->base->IBaseFilter_iface); - CoTaskMemFree(This); + heap_free(This); } return ref; diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index de13a530c6..fc1e27dd72 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -28,6 +28,7 @@ #include "dshow.h" #include "uuids.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/strmbase.h" #include "wine/unicode.h" -- 2.21.0

2 9

[PATCH] xaudio2: Fix 32-bit build.
by Nikolay Sivov 14 May '19

14 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index cbbedc4f7f..70ba24375f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -35,6 +35,7 @@ #include "ole2.h" #include "rpcproxy.h" +#include "wine/asm.h" #include "wine/debug.h" #include "wine/heap.h" -- 2.20.1

2 1

[PATCHv2] ntdll: Avoid truncating a nonzero exit code to zero in unix
by Martin Storsjo 14 May '19

14 May '19

On Windows, the exit codes can use the full 32 bit range, while on unix, they are truncated to the lowest 8 bits. If the intended exit code is nonzero, to indicate failure, but the lower 8 bits are zero (like when winedbg tries to exit with EXCEPTION_WINE_STUB, 80000100), the observed exit code used to be zero, indicating successful execution. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Moved fixing up of the return code to the caller of signal_exit_process. --- dlls/ntdll/loader.c | 3 +++ dlls/ntdll/process.c | 7 ++++++- dlls/ntdll/thread.c | 14 ++++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 994ff6f215..0279c81aa7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3264,6 +3264,9 @@ void WINAPI RtlExitUserProcess( DWORD status ) NtTerminateProcess( 0, status ); LdrShutdownProcess(); NtTerminateProcess( GetCurrentProcess(), status ); + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (status != 0 && (status & 0xff) == 0) + status = 1; exit( status ); } diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 573a7a771d..ea3565cb1c 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -88,7 +88,12 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) self = !ret && reply->self; } SERVER_END_REQ; - if (self && handle) _exit( exit_code ); + if (self && handle) { + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (exit_code != 0 && (exit_code & 0xff) == 0) + exit_code = 1; + _exit( exit_code ); + } return ret; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index be4621819b..b17ddda7b6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -291,7 +291,12 @@ static void free_thread_data( TEB *teb ) void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status ); + if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) { + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (status != 0 && (status & 0xff) == 0) + status = 1; + _exit( status ); + } signal_exit_thread( status ); } @@ -316,6 +321,7 @@ void WINAPI RtlExitUserThread( ULONG status ) { static void *prev_teb; TEB *teb; + int exit_code; if (status) /* send the exit code to the server (0 is already the default) */ { @@ -332,7 +338,11 @@ void WINAPI RtlExitUserThread( ULONG status ) { LdrShutdownProcess(); pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - signal_exit_process( status ); + exit_code = status; + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (status != 0 && (status & 0xff) == 0) + exit_code = 1; + signal_exit_process( exit_code ); } LdrShutdownThread(); -- 2.17.1

3 2

[PATCH] hidclass.sys: Limit written data to the actual report size.
by Piotr Caban 14 May '19

14 May '19

Linux hidraw devices are not accepting to large set feature ioctls. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

2 1

[PATCH] hid: Fix error handling in HidP_SetUsages.
by Piotr Caban 14 May '19

14 May '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/hid/hidp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

2 1

[PATCH] ntdll: Avoid truncating a nonzero exit code to zero in unix
by Martin Storsjo 14 May '19

14 May '19

On Windows, the exit codes can use the full 32 bit range, while on unix, they are truncated to the lowest 8 bits. If the intended exit code is nonzero, to indicate failure, but the lower 8 bits are zero (like when winedbg tries to exit with EXCEPTION_WINE_STUB, 80000100), the observed exit code used to be zero, indicating successful execution. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- This is an alternative to https://source.winehq.org/patches/data/164482 (fixing the same issue in winedbg), by keeping the full range of the winedbg exit code and just avoiding the issue right before calling exit/_exit. --- dlls/ntdll/loader.c | 3 +++ dlls/ntdll/process.c | 7 ++++++- dlls/ntdll/signal_arm.c | 3 +++ dlls/ntdll/signal_arm64.c | 3 +++ dlls/ntdll/signal_i386.c | 3 +++ dlls/ntdll/signal_powerpc.c | 3 +++ dlls/ntdll/signal_x86_64.c | 3 +++ dlls/ntdll/thread.c | 7 ++++++- 8 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 994ff6f215..0279c81aa7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3264,6 +3264,9 @@ void WINAPI RtlExitUserProcess( DWORD status ) NtTerminateProcess( 0, status ); LdrShutdownProcess(); NtTerminateProcess( GetCurrentProcess(), status ); + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (status != 0 && (status & 0xff) == 0) + status = 1; exit( status ); } diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 573a7a771d..ea3565cb1c 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -88,7 +88,12 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) self = !ret && reply->self; } SERVER_END_REQ; - if (self && handle) _exit( exit_code ); + if (self && handle) { + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (exit_code != 0 && (exit_code & 0xff) == 0) + exit_code = 1; + _exit( exit_code ); + } return ret; } diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e01c8ce219..4f4dcced05 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1396,6 +1396,9 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (status != 0 && (status & 0xff) == 0) + status = 1; call_thread_exit_func( status, exit, NtCurrentTeb() ); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8114d45fef..e56dd6b1ab 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1171,6 +1171,9 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (status != 0 && (status & 0xff) == 0) + status = 1; exit( status ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 053c87da83..a89ff20fd6 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2817,6 +2817,9 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (status != 0 && (status & 0xff) == 0) + status = 1; call_thread_exit_func( status, exit ); } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 86398d8f54..a5cce9bae3 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1240,6 +1240,9 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (status != 0 && (status & 0xff) == 0) + status = 1; exit( status ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 21e7098876..140e11b491 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4603,6 +4603,9 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (status != 0 && (status & 0xff) == 0) + status = 1; call_thread_exit_func( status, exit ); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index be4621819b..66a92eb3fc 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -291,7 +291,12 @@ static void free_thread_data( TEB *teb ) void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status ); + if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) { + /* Prevent a nonzero exit code to end up truncated to zero in unix. */ + if (status != 0 && (status & 0xff) == 0) + status = 1; + _exit( status ); + } signal_exit_thread( status ); } -- 2.17.1

3 2

[PATCH 1/3] server: Return successful select result separately from select request result.
by Jacek Caban 14 May '19

14 May '19

Allows returning to caller arbitrary status including values that would be otherwise have special meaning for client. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/server.c | 10 ++++++---- dlls/ntdll/sync.c | 9 ++++++--- server/protocol.def | 5 +++++ server/thread.c | 37 +++++++++++++++++++++---------------- server/trace.c | 2 +- 5 files changed, 39 insertions(+), 24 deletions(-)

3 3