From b088cc578146d393423f24193e8ac2545f47cb13 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 28 Sep 2009 19:58:45 +0200 Subject: [PATCH] kernel32: Moved GetThreadSelectorEntry to thread.c. --- dlls/kernel32/selector.c | 28 ++-------------------------- dlls/kernel32/thread.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c index 4a642c04ca2..d505982d4b9 100644 --- a/dlls/kernel32/selector.c +++ b/dlls/kernel32/selector.c @@ -559,38 +559,14 @@ LPVOID WINAPI MapSLFix( SEGPTR sptr ) return MapSL(sptr); } +#ifdef __i386__ + /*********************************************************************** * UnMapSLFixArray (KERNEL32.@) * * Must not change EAX, hence defined as asm function. */ -#ifdef __i386__ __ASM_STDCALL_FUNC( UnMapSLFixArray, 8, "ret $8" ) -#endif - - -/*********************************************************************** - * GetThreadSelectorEntry (KERNEL32.@) - */ -BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent ) -{ - THREAD_DESCRIPTOR_INFORMATION tdi; - NTSTATUS status; - - tdi.Selector = sel; - status = NtQueryInformationThread( hthread, ThreadDescriptorTableEntry, - &tdi, sizeof(tdi), NULL); - if (status) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - *ldtent = tdi.Entry; - return TRUE; -} - - -#ifdef __i386__ /*********************************************************************** * SMapLS (KERNEL32.@) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 0029e1179bc..3115a609c85 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -422,6 +422,26 @@ DWORD WINAPI SetThreadIdealProcessor( } +/*********************************************************************** + * GetThreadSelectorEntry (KERNEL32.@) + */ +BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent ) +{ + THREAD_DESCRIPTOR_INFORMATION tdi; + NTSTATUS status; + + tdi.Selector = sel; + status = NtQueryInformationThread( hthread, ThreadDescriptorTableEntry, &tdi, sizeof(tdi), NULL); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + *ldtent = tdi.Entry; + return TRUE; +} + + /* callback for QueueUserAPC */ static void CALLBACK call_user_apc( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3 ) {