Module: wine Branch: master Commit: 30816b0ca0e29449cc778af75b54c7561b4abdf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/30816b0ca0e29449cc778af75b54c75...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Jun 14 11:41:24 2024 +0200
ntdll: Move the error mode Rtl functions to thread.c.
---
dlls/ntdll/rtl.c | 41 ----------------------------------------- dlls/ntdll/thread.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 6253bb0a4a5..31c98424aca 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1536,47 +1536,6 @@ NTSTATUS WINAPI RtlDecompressBuffer(USHORT format, PUCHAR uncompressed, ULONG un compressed, compressed_size, 0, final_size, NULL); }
-/*********************************************************************** - * RtlSetThreadErrorMode [NTDLL.@] - * - * Set the thread local error mode. - * - * PARAMS - * mode [I] The new error mode - * oldmode [O] Destination of the old error mode (may be NULL) - * - * RETURNS - * Success: STATUS_SUCCESS - * Failure: STATUS_INVALID_PARAMETER_1 - */ -NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) -{ - if (mode & ~0x70) - return STATUS_INVALID_PARAMETER_1; - - if (oldmode) - *oldmode = NtCurrentTeb()->HardErrorMode; - - NtCurrentTeb()->HardErrorMode = mode; - return STATUS_SUCCESS; -} - -/*********************************************************************** - * RtlGetThreadErrorMode [NTDLL.@] - * - * Get the thread local error mode. - * - * PARAMS - * None. - * - * RETURNS - * The current thread local error mode. - */ -DWORD WINAPI RtlGetThreadErrorMode( void ) -{ - return NtCurrentTeb()->HardErrorMode; -} - /****************************************************************************** * RtlGetCurrentTransaction [NTDLL.@] */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1206d5b24b8..26cf99cdad0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -414,6 +414,31 @@ BOOLEAN WINAPI RtlIsCurrentThread( HANDLE handle ) }
+/*********************************************************************** + * RtlSetThreadErrorMode (NTDLL.@) + */ +NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) +{ + if (mode & ~0x70) + return STATUS_INVALID_PARAMETER_1; + + if (oldmode) + *oldmode = NtCurrentTeb()->HardErrorMode; + + NtCurrentTeb()->HardErrorMode = mode; + return STATUS_SUCCESS; +} + + +/*********************************************************************** + * RtlGetThreadErrorMode (NTDLL.@) + */ +DWORD WINAPI RtlGetThreadErrorMode( void ) +{ + return NtCurrentTeb()->HardErrorMode; +} + + /*********************************************************************** * _errno (NTDLL.@) */