ntdll: Avoid truncating a nonzero exit code to zero in unix.

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@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Avoid truncating a nonzero exit code to zero in unix.
044461e8 · Martin Storsjo · Alexandre Julliard · 4872747b · 044461e8 · 044461e8
Commit 044461e8 authored May 14, 2019 by Martin Storsjo Committed by Alexandre Julliard May 15, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

loader.c dlls/ntdll/loader.c +1 -1

ntdll_misc.h dlls/ntdll/ntdll_misc.h +7 -0

process.c dlls/ntdll/process.c +1 -1

thread.c dlls/ntdll/thread.c +2 -2

No files found.
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -3264,7 +3264,7 @@ void WINAPI RtlExitUserProcess( DWORD status )
    NtTerminateProcess( 0, status );
    LdrShutdownProcess();
    NtTerminateProcess( GetCurrentProcess(), status );
-    exit( status );
+    exit( get_unix_exit_code( status ));
 }

 /******************************************************************

--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -247,6 +247,13 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void)
    return (struct ntdll_thread_data *)&NtCurrentTeb()->GdiTebBatch;
 }

+static inline int get_unix_exit_code( NTSTATUS status )
+{
+    /* prevent a nonzero exit code to end up truncated to zero in unix */
+    if (status && !(status & 0xff)) return 1;
+    return status;
+}
+
 extern mode_t FILE_umask DECLSPEC_HIDDEN;
 extern HANDLE keyed_event DECLSPEC_HIDDEN;
 extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;

--- a/dlls/ntdll/process.c
+++ b/dlls/ntdll/process.c
@@ -88,7 +88,7 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code )
        self = !ret && reply->self;
    }
    SERVER_END_REQ;
-    if (self && handle) _exit( exit_code );
+    if (self && handle) _exit( get_unix_exit_code( exit_code ));
    return ret;
 }


--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -291,7 +291,7 @@ 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) _exit( get_unix_exit_code( status ));
    signal_exit_thread( status );
 }

@@ -332,7 +332,7 @@ void WINAPI RtlExitUserThread( ULONG status )
    {
        LdrShutdownProcess();
        pthread_sigmask( SIG_BLOCK, &server_block_set, NULL );
-        signal_exit_process( status );
+        signal_exit_process( get_unix_exit_code( status ));
    }

    LdrShutdownThread();