Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 52809: Thanks to Timo Kreuzer for discovering what led to these: [KERNEL32]: BasepInitializeContext was not creating a correct CONTEXT record for fibers: the stack return address was not set ...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 16:26:03 2011 New Revision: 52809 URL: http://svn.reactos.org/svn/reactos?rev=52809&view=rev Log: Thanks to Timo Kreuzer for discovering what led to these: [KERNEL32]: BasepInitializeContext was not creating a correct CONTEXT record for fibers: the stack return address was not set (EIP was being used instead), and support for FPU-compatible Fibers was non-existent. [KERNEL32]: CreateFiberEx was not passing the correct context flags to BasepInitializeContext to notify it that this is an FPU-fiber. [KERNEL32]: SwitchToFiber was using some weird "FXSR" constant that maps to checking of PowerPC 64-bit Move instructions are available. We actually want to check for XMMI. Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c trunk/reactos/dll/win32/kernel32/client/i386/fiber.S trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Sat Jul 23 16:26:03 2011 @@ -223,11 +223,8 @@ Fiber->ActivationContextStack = ActivationContextStack; Fiber->Context.ContextFlags = CONTEXT_FULL; - /* Save FPU State if requsted */ - if (dwFlags & FIBER_FLAG_FLOAT_SWITCH) - { - Fiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; - } + /* Save FPU State if requested */ + Fiber->Context.ContextFlags = (dwFlags & FIBER_FLAG_FLOAT_SWITCH) ? CONTEXT_FLOATING_POINT : 0; /* initialize the context for the fiber */ BasepInitializeContext(&Fiber->Context, Modified: trunk/reactos/dll/win32/kernel32/client/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/i386/fiber.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/i386/fiber.S [iso-8859-1] Sat Jul 23 16:26:03 2011 @@ -35,7 +35,7 @@ fnstcw [eax+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] /* Check if the CPU supports SIMD MXCSR State Save */ - cmp byte ptr ds:[PROCESSOR_FEATURE_FXSR], 1 + cmp byte ptr ds:[PF_XMMI_INSTRUCTIONS_AVAILABLE], 1 jnz NoFpuStateSave stmxcsr [eax+FIBER_CONTEXT_DR6] @@ -99,7 +99,7 @@ ControlWordEqual: /* Load the new one */ - cmp byte ptr ds:[PROCESSOR_FEATURE_FXSR], 1 + cmp byte ptr ds:[PF_XMMI_INSTRUCTIONS_AVAILABLE], 1 jnz NoFpuStateRestore ldmxcsr [ecx+FIBER_CONTEXT_DR6] Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sat Jul 23 16:26:03 2011 @@ -336,8 +336,9 @@ IN ULONG ContextType) { #ifdef _M_IX86 + ULONG ContextFlags; DPRINT("BasepInitializeContext: %p\n", Context); - + /* Setup the Initial Win32 Thread Context */ Context->Eax = (ULONG)StartAddress; Context->Ebx = (ULONG)Parameter; @@ -352,30 +353,53 @@ Context->SegSs = KGDT_R3_DATA | RPL_MASK; Context->SegGs = 0; + /* Set the Context Flags */ + ContextFlags = Context->ContextFlags; + Context->ContextFlags = CONTEXT_FULL; + + /* Give it some room for the Parameter */ + Context->Esp -= sizeof(PVOID); + /* Set the EFLAGS */ Context->EFlags = 0x3000; /* IOPL 3 */ - if (ContextType == 1) /* For Threads */ - { + /* What kind of context is being created? */ + if (ContextType == 1) + { + /* For Threads */ Context->Eip = (ULONG)BaseThreadStartupThunk; } - else if (ContextType == 2) /* For Fibers */ - { - Context->Eip = (ULONG)BaseFiberStartup; - } - else /* For first thread in a Process */ - { + else if (ContextType == 2) + { + /* This is a fiber: make space for the return address */ + Context->Esp -= sizeof(PVOID); + *((PVOID*)Context->Esp) = BaseFiberStartup; + + /* Is FPU state required? */ + Context->ContextFlags |= ContextFlags; + if (ContextFlags == CONTEXT_FLOATING_POINT) + { + /* Set an initial state */ + Context->FloatSave.ControlWord = 0x27F; + Context->FloatSave.StatusWord = 0; + Context->FloatSave.TagWord = 0xFFFF; + Context->FloatSave.ErrorOffset = 0; + Context->FloatSave.ErrorSelector = 0; + Context->FloatSave.DataOffset = 0; + Context->FloatSave.DataSelector = 0; + if (SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE]) + Context->Dr6 = 0x1F80; + } + } + else + { + /* For first thread in a Process */ Context->Eip = (ULONG)BaseProcessStartThunk; } - - /* Set the Context Flags */ - Context->ContextFlags = CONTEXT_FULL; - - /* Give it some room for the Parameter */ - Context->Esp -= sizeof(PVOID); + #elif defined(_M_AMD64) DPRINT("BasepInitializeContext: %p\n", Context); - + /* Setup the Initial Win32 Thread Context */ Context->Rax = (ULONG_PTR)StartAddress; Context->Rbx = (ULONG_PTR)Parameter; @@ -405,10 +429,10 @@ { Context->Rip = (ULONG_PTR)BaseProcessStartThunk; } - + /* Set the Context Flags */ Context->ContextFlags = CONTEXT_FULL; - + /* Give it some room for the Parameter */ Context->Rsp -= sizeof(PVOID); #else

1 0

[akhaldi] 52808: [KERNEL32] * Fix ConvertOpenWin32AnsiObjectApiToUnicodeApi and OpenNtObjectFromWin32Api macros always returning NULL. Spotted by Thomas Faber.
by akhaldi＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: akhaldi Date: Sat Jul 23 14:07:17 2011 New Revision: 52808 URL: http://svn.reactos.org/svn/reactos?rev=52808&view=rev Log: [KERNEL32] * Fix ConvertOpenWin32AnsiObjectApiToUnicodeApi and OpenNtObjectFromWin32Api macros always returning NULL. Spotted by Thomas Faber. Modified: trunk/reactos/dll/win32/kernel32/include/base_x.h Modified: trunk/reactos/dll/win32/kernel32/include/base_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/base_x.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/base_x.h [iso-8859-1] Sat Jul 23 14:07:17 2011 @@ -74,7 +74,11 @@ // #define ConvertOpenWin32AnsiObjectApiToUnicodeApi(obj, acc, inh, name) \ ConvertAnsiToUnicodePrologue \ - if (!name) SetLastError(ERROR_INVALID_PARAMETER); return NULL; \ + if (!name) \ + { \ + SetLastError(ERROR_INVALID_PARAMETER); \ + return NULL; \ + } \ ConvertAnsiToUnicodeBody(name) \ if (NT_SUCCESS(Status)) return Open##obj##W(acc, inh, UnicodeCache->Buffer);\ ConvertAnsiToUnicodeEpilogue @@ -132,7 +136,11 @@ // #define OpenNtObjectFromWin32Api(ntobj, acc, inh, name) \ CreateNtObjectFromWin32ApiPrologue \ - if (!name) SetLastErrorByStatus(STATUS_INVALID_PARAMETER); return NULL; \ + if (!name) \ + { \ + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); \ + return NULL; \ + } \ RtlInitUnicodeString(&ObjectName, name); \ InitializeObjectAttributes(ObjectAttributes, \ &ObjectName, \ @@ -140,7 +148,11 @@ hBaseDir, \ NULL); \ Status = NtOpen##ntobj(&Handle, acc, ObjectAttributes); \ - if (!NT_SUCCESS(Status)) SetLastErrorByStatus(Status); return NULL; \ + if (!NT_SUCCESS(Status)) \ + { \ + SetLastErrorByStatus(Status); \ + return NULL; \ + } \ return Handle; \ }

1 0

[ion] 52807: [KERNEL32]: Optimize SwitchToFiber to simply use "ret" to jump between fibers, instead of saving EIP and doing a JMP. Bug #50: SwitchToFiber needs to check if FXSR is *NOT* present in ...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 12:08:36 2011 New Revision: 52807 URL: http://svn.reactos.org/svn/reactos?rev=52807&view=rev Log: [KERNEL32]: Optimize SwitchToFiber to simply use "ret" to jump between fibers, instead of saving EIP and doing a JMP. Bug #50: SwitchToFiber needs to check if FXSR is *NOT* present in order to skip using ldmxcsr/stmxcsr. Previously, it would check if it's unsupported, and jump past the instruction if it was (resulting in invalid opcode instructions on older systems) 50 bugs. Penance has been paid. Modified: trunk/reactos/dll/win32/kernel32/client/i386/fiber.S Modified: trunk/reactos/dll/win32/kernel32/client/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/i386/fiber.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/i386/fiber.S [iso-8859-1] Sat Jul 23 12:08:36 2011 @@ -26,20 +26,16 @@ mov [eax+FIBER_CONTEXT_EDI], edi mov [eax+FIBER_CONTEXT_EBP], ebp - /* Save the return address */ - mov ebx, [esp] - mov [eax+FIBER_CONTEXT_EIP], ebx - /* Check if we're to save FPU State */ cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL OR CONTEXT_FLOATING_POINT jnz NoFpuStateSave /* Save the FPU State (Status and Control)*/ fstsw [eax+FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD] - fstcw [eax+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] + fnstcw [eax+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] /* Check if the CPU supports SIMD MXCSR State Save */ - cmp byte ptr ds:[PROCESSOR_FEATURE_FXSR], 0 + cmp byte ptr ds:[PROCESSOR_FEATURE_FXSR], 1 jnz NoFpuStateSave stmxcsr [eax+FIBER_CONTEXT_DR6] @@ -103,7 +99,7 @@ ControlWordEqual: /* Load the new one */ - cmp byte ptr ds:[PROCESSOR_FEATURE_FXSR], 0 + cmp byte ptr ds:[PROCESSOR_FEATURE_FXSR], 1 jnz NoFpuStateRestore ldmxcsr [ecx+FIBER_CONTEXT_DR6] @@ -121,7 +117,8 @@ mov [edx+TEB_FLS_DATA], eax /* Jump to new fiber */ - jmp dword ptr [ecx+FIBER_CONTEXT_EIP] + mov esp, [ecx+FIBER_CONTEXT_ESP] + ret 4 +END -END /* EOF */

1 0

[ion] 52806: [KERNEL32]: Implement BaseFiberStartup in ASM, just like the thread/process thunks, so we get a "naked" thunk without any compiler-generated crap.
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 12:05:38 2011 New Revision: 52806 URL: http://svn.reactos.org/svn/reactos?rev=52806&view=rev Log: [KERNEL32]: Implement BaseFiberStartup in ASM, just like the thread/process thunks, so we get a "naked" thunk without any compiler-generated crap. Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c trunk/reactos/dll/win32/kernel32/client/i386/thread.S Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Sat Jul 23 12:05:38 2011 @@ -36,32 +36,6 @@ } -__declspec(noreturn) -VOID -WINAPI -BaseFiberStartup(VOID) -{ -#ifdef _M_IX86 - PFIBER Fiber = GetCurrentFiber(); - - /* Call the Thread Startup Routine */ - DPRINT("Starting Fiber\n"); - BaseThreadStartup((LPTHREAD_START_ROUTINE)Fiber->Context.Eax, - (LPVOID)Fiber->Context.Ebx); -#elif defined(_M_AMD64) - PFIBER Fiber = GetFiberData(); - - /* Call the Thread Startup Routine */ - DPRINT1("Starting Fiber\n"); - BaseThreadStartup((LPTHREAD_START_ROUTINE)Fiber->Context.Rax, - (LPVOID)Fiber->Context.Rbx); -#else -#warning Unknown architecture - UNIMPLEMENTED; - DbgBreakPoint(); -#endif -} - /* PUBLIC FUNCTIONS ***********************************************************/ /* Modified: trunk/reactos/dll/win32/kernel32/client/i386/thread.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/i386/thread.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/i386/thread.S [iso-8859-1] Sat Jul 23 12:05:38 2011 @@ -7,6 +7,7 @@ */ #include <asm.inc> +#include <ks386.inc> .code @@ -14,8 +15,6 @@ EXTERN _BaseProcessStartup@4:PROC PUBLIC _BaseThreadStartupThunk@0 -PUBLIC _BaseProcessStartThunk@0 - _BaseThreadStartupThunk@0: /* Start out fresh */ @@ -25,9 +24,10 @@ push eax /* lpStartAddress */ push 0 /* Return EIP */ jmp _BaseThreadStartup@8 +END +PUBLIC _BaseProcessStartThunk@0 _BaseProcessStartThunk@0: - /* Start out fresh */ xor ebp, ebp @@ -36,4 +36,15 @@ jmp _BaseProcessStartup@4 END + +PUBLIC _BaseFiberStartup@0 +_BaseFiberStartup@0: + /* Get the fiber data */ + mov eax, fs:[TEB_FIBER_DATA] + + push dword ptr [eax+FIBER_CONTEXT_EBX] /* Parameter */ + push dword ptr [eax+FIBER_CONTEXT_EAX] /* Start Address */ + call _BaseThreadStartup@8 +END + /* EOF */

1 0

[ion] 52805: [KERNEL32]: Bug #47: CreateFiberEx should return ERROR_INVALID_PARAMETER for invalid flags. Bug #48: DeleteFiber should also check if HasFiberData is TRUE in TEB before calling ExitThr...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 11:55:41 2011 New Revision: 52805 URL: http://svn.reactos.org/svn/reactos?rev=52805&view=rev Log: [KERNEL32]: Bug #47: CreateFiberEx should return ERROR_INVALID_PARAMETER for invalid flags. Bug #48: DeleteFiber should also check if HasFiberData is TRUE in TEB before calling ExitThread. Bug #49: DeleteFiber should only delete the FIBER data structure after cleanup is complete, not before. Also, enable the calls to RtlAllocateActivationContextStack since SxS kind-of exists now. However, we leak the context since RtlFreeActivationContextStack is not implemented. Also, add a call to BaseRundownFls so we don't forget to cleanup FLS data once FLS is implemented. Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Sat Jul 23 11:55:41 2011 @@ -26,6 +26,16 @@ PVOID ActivationContextStack; /* 0x2E8 */ } FIBER, *PFIBER; +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +WINAPI +BaseRundownFls(IN PVOID FlsData) +{ + /* No FLS support yet */ + +} + __declspec(noreturn) VOID WINAPI @@ -52,6 +62,8 @@ #endif } +/* PUBLIC FUNCTIONS ***********************************************************/ + /* * @implemented */ @@ -93,58 +105,48 @@ ConvertThreadToFiberEx(LPVOID lpParameter, DWORD dwFlags) { - PTEB Teb; - PFIBER Fiber; + PTEB pTeb = NtCurrentTeb(); + PFIBER pfCurFiber; DPRINT1("Converting Thread to Fiber\n"); - /* Check for invalid flags */ - if (dwFlags &~ FIBER_FLAG_FLOAT_SWITCH) - { - /* Fail */ - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - /* Are we already a fiber? */ - Teb = NtCurrentTeb(); - if (Teb->HasFiberData) - { - /* Fail */ - SetLastError(ERROR_ALREADY_FIBER); - return NULL; - } - - /* Allocate the fiber */ - Fiber = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(FIBER)); - if (!Fiber) + /* the current thread is already a fiber */ + if(pTeb->HasFiberData && pTeb->NtTib.FiberData) return pTeb->NtTib.FiberData; + + /* allocate the fiber */ + pfCurFiber = (PFIBER)RtlAllocateHeap(GetProcessHeap(), + 0, + sizeof(FIBER)); + + /* failure */ + if (pfCurFiber == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - /* Copy some contextual data from the thread to the fiber */ - Fiber->Parameter = lpParameter; - Fiber->ExceptionList = Teb->NtTib.ExceptionList; - Fiber->StackBase = Teb->NtTib.StackBase; - Fiber->StackLimit = Teb->NtTib.StackLimit; - Fiber->DeallocationStack = Teb->DeallocationStack; - Fiber->FlsData = Teb->FlsData; - Fiber->GuaranteedStackBytes = Teb->GuaranteedStackBytes; - Fiber->ActivationContextStack = Teb->ActivationContextStackPointer; - Fiber->Context.ContextFlags = CONTEXT_FULL; - - /* Save FPU State if requested */ + /* copy some contextual data from the thread to the fiber */ + pfCurFiber->Parameter = lpParameter; + pfCurFiber->ExceptionList = pTeb->NtTib.ExceptionList; + pfCurFiber->StackBase = pTeb->NtTib.StackBase; + pfCurFiber->StackLimit = pTeb->NtTib.StackLimit; + pfCurFiber->DeallocationStack = pTeb->DeallocationStack; + pfCurFiber->FlsData = pTeb->FlsData; + pfCurFiber->GuaranteedStackBytes = pTeb->GuaranteedStackBytes; + pfCurFiber->ActivationContextStack = pTeb->ActivationContextStackPointer; + pfCurFiber->Context.ContextFlags = CONTEXT_FULL; + + /* Save FPU State if requsted */ if (dwFlags & FIBER_FLAG_FLOAT_SWITCH) { - Fiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; - } - - /* Associate the fiber to the current thread */ - Teb->NtTib.FiberData = Fiber; - Teb->HasFiberData = TRUE; - - /* Return opaque fiber data */ - return (LPVOID)Fiber; + pfCurFiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; + } + + /* associate the fiber to the current thread */ + pTeb->NtTib.FiberData = pfCurFiber; + pTeb->HasFiberData = TRUE; + + /* success */ + return (LPVOID)pfCurFiber; } /* @@ -182,73 +184,86 @@ LPFIBER_START_ROUTINE lpStartAddress, LPVOID lpParameter) { - PFIBER pfCurFiber; - NTSTATUS nErrCode; - INITIAL_TEB usFiberInitialTeb; + PFIBER Fiber; + NTSTATUS Status; + INITIAL_TEB InitialTeb; PVOID ActivationContextStack = NULL; DPRINT("Creating Fiber\n"); -#ifdef SXS_SUPPORT_ENABLED + /* Check for invalid flags */ + if (dwFlags &~ FIBER_FLAG_FLOAT_SWITCH) + { + /* Fail */ + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + /* Allocate the Activation Context Stack */ - nErrCode = RtlAllocateActivationContextStack(&ActivationContextStack); -#endif + Status = RtlAllocateActivationContextStack(&ActivationContextStack); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + SetLastErrorByStatus(Status); + return NULL; + } /* Allocate the fiber */ - pfCurFiber = (PFIBER)RtlAllocateHeap(GetProcessHeap(), - 0, - sizeof(FIBER)); - /* Failure */ - if (pfCurFiber == NULL) - { + Fiber = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(FIBER)); + if (!Fiber) + { + /* Fail */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } /* Create the stack for the fiber */ - nErrCode = BasepCreateStack(NtCurrentProcess(), - dwStackCommitSize, - dwStackReserveSize, - &usFiberInitialTeb); - /* Failure */ - if(!NT_SUCCESS(nErrCode)) + Status = BasepCreateStack(NtCurrentProcess(), + dwStackCommitSize, + dwStackReserveSize, + &InitialTeb); + if (!NT_SUCCESS(Status)) { /* Free the fiber */ - RtlFreeHeap(GetProcessHeap(), 0, pfCurFiber); + RtlFreeHeap(GetProcessHeap(), 0, Fiber); + + /* Free the activation context */ + DPRINT1("Leaking activation stack because nobody implemented free"); + //RtlFreeActivationContextStack(&ActivationContextStack); /* Failure */ - SetLastErrorByStatus(nErrCode); + SetLastErrorByStatus(Status); return NULL; } /* Clear the context */ - RtlZeroMemory(&pfCurFiber->Context, sizeof(CONTEXT)); - - /* copy the data into the fiber */ - pfCurFiber->StackBase = usFiberInitialTeb.StackBase; - pfCurFiber->StackLimit = usFiberInitialTeb.StackLimit; - pfCurFiber->DeallocationStack = usFiberInitialTeb.AllocatedStackBase; - pfCurFiber->Parameter = lpParameter; - pfCurFiber->ExceptionList = (struct _EXCEPTION_REGISTRATION_RECORD *)-1; - pfCurFiber->GuaranteedStackBytes = 0; - pfCurFiber->FlsData = NULL; - pfCurFiber->ActivationContextStack = ActivationContextStack; - pfCurFiber->Context.ContextFlags = CONTEXT_FULL; + RtlZeroMemory(&Fiber->Context, sizeof(CONTEXT)); + + /* Copy the data into the fiber */ + Fiber->StackBase = InitialTeb.StackBase; + Fiber->StackLimit = InitialTeb.StackLimit; + Fiber->DeallocationStack = InitialTeb.AllocatedStackBase; + Fiber->Parameter = lpParameter; + Fiber->ExceptionList = EXCEPTION_CHAIN_END; + Fiber->GuaranteedStackBytes = 0; + Fiber->FlsData = NULL; + Fiber->ActivationContextStack = ActivationContextStack; + Fiber->Context.ContextFlags = CONTEXT_FULL; /* Save FPU State if requsted */ if (dwFlags & FIBER_FLAG_FLOAT_SWITCH) { - pfCurFiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; + Fiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; } /* initialize the context for the fiber */ - BasepInitializeContext(&pfCurFiber->Context, + BasepInitializeContext(&Fiber->Context, lpParameter, lpStartAddress, - usFiberInitialTeb.StackBase, + InitialTeb.StackBase, 2); - /* Return the Fiber */ - return pfCurFiber; + /* Return the Fiber */ + return Fiber; } /* @@ -258,20 +273,29 @@ WINAPI DeleteFiber(LPVOID lpFiber) { - SIZE_T nSize = 0; - PVOID pStackAllocBase = ((PFIBER)lpFiber)->DeallocationStack; - - /* free the fiber */ + SIZE_T Size = 0; + PFIBER Fiber = (PFIBER)lpFiber; + PTEB Teb; + + /* First, exit the thread */ + Teb = NtCurrentTeb(); + if ((Teb->HasFiberData) && (Teb->NtTib.FiberData == Fiber)) ExitThread(1); + + /* Now de-allocate the stack */ + NtFreeVirtualMemory(NtCurrentProcess(), + &Fiber->DeallocationStack, + &Size, + MEM_RELEASE); + + /* Get rid of FLS */ + if (Fiber->FlsData) BaseRundownFls(Fiber->FlsData); + + /* Get rid of the activation stack */ + DPRINT1("Leaking activation stack because nobody implemented free"); + //RtlFreeActivationContextStack(Fiber->ActivationContextStack); + + /* Free the fiber data */ RtlFreeHeap(GetProcessHeap(), 0, lpFiber); - - /* the fiber is deleting itself: let the system deallocate the stack */ - if(NtCurrentTeb()->NtTib.FiberData == lpFiber) ExitThread(1); - - /* deallocate the stack */ - NtFreeVirtualMemory(NtCurrentProcess(), - &pStackAllocBase, - &nSize, - MEM_RELEASE); } /*

1 0

[ion] 52804: [KERNEL32]: Bug #45: ConvertThreadToFiberEx should return ERROR_INVALID_PARAMETER if an invalid flag is passed. Bug #46: ConvertThreadToFiberEx should return ERROR_ALREADY_FIBER if the...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 11:48:42 2011 New Revision: 52804 URL: http://svn.reactos.org/svn/reactos?rev=52804&view=rev Log: [KERNEL32]: Bug #45: ConvertThreadToFiberEx should return ERROR_INVALID_PARAMETER if an invalid flag is passed. Bug #46: ConvertThreadToFiberEx should return ERROR_ALREADY_FIBER if the thread is already a fiber, not return the current fiber data. Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Sat Jul 23 11:48:42 2011 @@ -93,48 +93,58 @@ ConvertThreadToFiberEx(LPVOID lpParameter, DWORD dwFlags) { - PTEB pTeb = NtCurrentTeb(); - PFIBER pfCurFiber; + PTEB Teb; + PFIBER Fiber; DPRINT1("Converting Thread to Fiber\n"); - /* the current thread is already a fiber */ - if(pTeb->HasFiberData && pTeb->NtTib.FiberData) return pTeb->NtTib.FiberData; - - /* allocate the fiber */ - pfCurFiber = (PFIBER)RtlAllocateHeap(GetProcessHeap(), - 0, - sizeof(FIBER)); - - /* failure */ - if (pfCurFiber == NULL) + /* Check for invalid flags */ + if (dwFlags &~ FIBER_FLAG_FLOAT_SWITCH) + { + /* Fail */ + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Are we already a fiber? */ + Teb = NtCurrentTeb(); + if (Teb->HasFiberData) + { + /* Fail */ + SetLastError(ERROR_ALREADY_FIBER); + return NULL; + } + + /* Allocate the fiber */ + Fiber = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(FIBER)); + if (!Fiber) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - /* copy some contextual data from the thread to the fiber */ - pfCurFiber->Parameter = lpParameter; - pfCurFiber->ExceptionList = pTeb->NtTib.ExceptionList; - pfCurFiber->StackBase = pTeb->NtTib.StackBase; - pfCurFiber->StackLimit = pTeb->NtTib.StackLimit; - pfCurFiber->DeallocationStack = pTeb->DeallocationStack; - pfCurFiber->FlsData = pTeb->FlsData; - pfCurFiber->GuaranteedStackBytes = pTeb->GuaranteedStackBytes; - pfCurFiber->ActivationContextStack = pTeb->ActivationContextStackPointer; - pfCurFiber->Context.ContextFlags = CONTEXT_FULL; - - /* Save FPU State if requsted */ + /* Copy some contextual data from the thread to the fiber */ + Fiber->Parameter = lpParameter; + Fiber->ExceptionList = Teb->NtTib.ExceptionList; + Fiber->StackBase = Teb->NtTib.StackBase; + Fiber->StackLimit = Teb->NtTib.StackLimit; + Fiber->DeallocationStack = Teb->DeallocationStack; + Fiber->FlsData = Teb->FlsData; + Fiber->GuaranteedStackBytes = Teb->GuaranteedStackBytes; + Fiber->ActivationContextStack = Teb->ActivationContextStackPointer; + Fiber->Context.ContextFlags = CONTEXT_FULL; + + /* Save FPU State if requested */ if (dwFlags & FIBER_FLAG_FLOAT_SWITCH) { - pfCurFiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; - } - - /* associate the fiber to the current thread */ - pTeb->NtTib.FiberData = pfCurFiber; - pTeb->HasFiberData = TRUE; - - /* success */ - return (LPVOID)pfCurFiber; + Fiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; + } + + /* Associate the fiber to the current thread */ + Teb->NtTib.FiberData = Fiber; + Teb->HasFiberData = TRUE; + + /* Return opaque fiber data */ + return (LPVOID)Fiber; } /*

1 0

[ion] 52803: [KERNEL32] Bug #43: ConvertFiberToThread should return ERROR_ALREADY_THREAD, not ERROR_INVALID_PARAMETER in case of failure. Bug #44: ConvertFiberToThread should set FiberData to NULL ...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 11:46:57 2011 New Revision: 52803 URL: http://svn.reactos.org/svn/reactos?rev=52803&view=rev Log: [KERNEL32] Bug #43: ConvertFiberToThread should return ERROR_ALREADY_THREAD, not ERROR_INVALID_PARAMETER in case of failure. Bug #44: ConvertFiberToThread should set FiberData to NULL in the TEB, after doing the conversion. Thanks, Winetests, for saying "0 failures", when this API was broken. Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Sat Jul 23 11:46:57 2011 @@ -59,24 +59,27 @@ WINAPI ConvertFiberToThread(VOID) { - PTEB pTeb = NtCurrentTeb(); + PTEB Teb; + PFIBER FiberData; DPRINT1("Converting Fiber to Thread\n"); - /* the current thread isn't running a fiber: failure */ - if (!pTeb->HasFiberData) - { - SetLastError(ERROR_INVALID_PARAMETER); + /* Check if the thread is already not a fiber */ + Teb = NtCurrentTeb(); + if (!Teb->HasFiberData) + { + /* Fail */ + SetLastError(ERROR_ALREADY_THREAD); return FALSE; } /* this thread won't run a fiber anymore */ - pTeb->HasFiberData = FALSE; - - /* free the fiber */ - if(pTeb->NtTib.FiberData != NULL) - { - RtlFreeHeap(GetProcessHeap(), 0, pTeb->NtTib.FiberData); - } + Teb->HasFiberData = FALSE; + FiberData = Teb->NtTib.FiberData; + Teb->NtTib.FiberData = NULL; + + /* Free the fiber */ + ASSERT(FiberData != NULL); + RtlFreeHeap(GetProcessHeap(), 0, FiberData); /* success */ return TRUE;

1 0

[ion] 52802: [KERNEL32]: Bug #42: GetThreadPriority was only returning -2, -1, 0, 1, 2 or 15 and -15. For realtime threads, priorities of 3, 4, 5, 6, 7, and their negatives, are also valid. Also, G...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 11:43:57 2011 New Revision: 52802 URL: http://svn.reactos.org/svn/reactos?rev=52802&view=rev Log: [KERNEL32]: Bug #42: GetThreadPriority was only returning -2, -1, 0, 1, 2 or 15 and -15. For realtime threads, priorities of 3, 4, 5, 6, 7, and their negatives, are also valid. Also, GetThreadPriority was returning -15/15 for any priorty outside the -2/2 range, instead of just the special saturation values (I should count this as a separate bug, really...) Modified: trunk/reactos/dll/win32/kernel32/client/thread.c Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Sat Jul 23 11:43:57 2011 @@ -621,13 +621,15 @@ return THREAD_PRIORITY_ERROR_RETURN; } - /* Do some conversions for out of boundary values */ - if (ThreadBasic.BasePriority > THREAD_BASE_PRIORITY_MAX) - { + /* Do some conversions for saturation values */ + if (ThreadBasic.BasePriority == ((HIGH_PRIORITY + 1) / 2)) + { + /* Win32 calls this "time critical" */ ThreadBasic.BasePriority = THREAD_PRIORITY_TIME_CRITICAL; } - else if (ThreadBasic.BasePriority < THREAD_BASE_PRIORITY_MIN) - { + else if (ThreadBasic.BasePriority == -((HIGH_PRIORITY + 1) / 2)) + { + /* Win32 calls this "idle" */ ThreadBasic.BasePriority = THREAD_PRIORITY_IDLE; }

1 0

[ion] 52801: [KERNEL32]: Bug #39: BaseThreadStartup needs to call CsrNewThread (which registers the termination port with CSRSS) for Win32 threads. Bug #40: If a crash happens during thread executi...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 11:38:58 2011 New Revision: 52801 URL: http://svn.reactos.org/svn/reactos?rev=52801&view=rev Log: [KERNEL32]: Bug #39: BaseThreadStartup needs to call CsrNewThread (which registers the termination port with CSRSS) for Win32 threads. Bug #40: If a crash happens during thread execution, ExitProcess should be called instead of ExitThread (unless this is a CSR thread). Bug #41: The ExitThread/Process APIs should be called still from within the context of the SEH frame, not outside of it. Use BaseRunningInServerProcess global instead of local IsServer local when connecting to CSRSS. This is needed for things such as the above. Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/client/thread.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Sat Jul 23 11:38:58 2011 @@ -21,6 +21,8 @@ extern UNICODE_STRING SystemDirectory; extern UNICODE_STRING WindowsDirectory; + +BOOLEAN BaseRunningInServerProcess; WCHAR BaseDefaultPathBuffer[6140]; @@ -258,7 +260,6 @@ LPVOID lpReserved) { NTSTATUS Status; - BOOLEAN IsServer; ULONG Dummy; ULONG DummySize = sizeof(Dummy); WCHAR SessionDir[256]; @@ -304,7 +305,7 @@ InWindows ? 1 : 0, &Dummy, &DummySize, - &IsServer); + &BaseRunningInServerProcess); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to connect to CSR (Status %lx)\n", Status); @@ -313,7 +314,7 @@ } /* Check if we are running a CSR Server */ - if (!IsServer) + if (!BaseRunningInServerProcess) { /* Set the termination port for the thread */ DPRINT("Creating new thread for CSR\n"); Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Sat Jul 23 11:38:58 2011 @@ -52,22 +52,34 @@ BaseThreadStartup(LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter) { - volatile UINT uExitCode = 0; - /* Attempt to call the Thread Start Address */ _SEH2_TRY { + /* Legacy check which is still used today for Win32 threads */ + if (NtCurrentTeb()->NtTib.Version == (30 << 8)) // OS/2 V3.0 ("Cruiser") + { + /* This registers the termination port with CSRSS */ + if (!BaseRunningInServerProcess) CsrNewThread(); + } + /* Get the exit code from the Thread Start */ - uExitCode = (lpStartAddress)((PVOID)lpParameter); + ExitThread((lpStartAddress)((PVOID)lpParameter)); } _SEH2_EXCEPT(BaseThreadExceptionFilter(_SEH2_GetExceptionInformation())) { /* Get the Exit code from the SEH Handler */ - uExitCode = _SEH2_GetExceptionCode(); - } _SEH2_END; - - /* Exit the Thread */ - ExitThread(uExitCode); + if (!BaseRunningInServerProcess) + { + /* Kill the whole process, usually */ + ExitProcess(_SEH2_GetExceptionCode()); + } + else + { + /* If running inside CSRSS, kill just this thread */ + ExitThread(_SEH2_GetExceptionCode()); + } + } + _SEH2_END; } /* Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sat Jul 23 11:38:58 2011 @@ -106,6 +106,8 @@ extern SYSTEM_BASIC_INFORMATION BaseCachedSysInfo; +extern BOOLEAN BaseRunningInServerProcess; + /* FUNCTION PROTOTYPES *******************************************************/ BOOL WINAPI VerifyConsoleIoHandle(HANDLE Handle);

1 0

[ion] 52800: [KERNEL32]: Bug #35: TlsSetValue should allocate the TlsExpansionSlots under the PEB Lock. Bug #36: TlsGetValue needs to set the last error to ERROR_SUCCESS when the index is valid (am...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 11:28:35 2011 New Revision: 52800 URL: http://svn.reactos.org/svn/reactos?rev=52800&view=rev Log: [KERNEL32]: Bug #35: TlsSetValue should allocate the TlsExpansionSlots under the PEB Lock. Bug #36: TlsGetValue needs to set the last error to ERROR_SUCCESS when the index is valid (amd even if no expansion slots exist!). Bug #37: TlsFree did not check the return of NtSetInformationThread(ThreadZeroTlsCell). Bug #38: TlsAlloc was setting error to ERROR_NO_MORE_ITEMS instead of STATUS_NO_MEMORY. In principle the former is more accurate, but that's not how API compatibility works. Optimize TLS functions not to call NtQueryTeb/Peb all the time. Cache the TEB/PEB value instead. Modified: trunk/reactos/dll/win32/kernel32/client/synch.c trunk/reactos/dll/win32/kernel32/client/thread.c Modified: trunk/reactos/dll/win32/kernel32/client/synch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] Sat Jul 23 11:28:35 2011 @@ -39,7 +39,7 @@ LARGE_INTEGER Time; NTSTATUS Status; RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME ActCtx; - + /* APCs must execute with the default activation context */ if (bAlertable) { @@ -75,7 +75,7 @@ Status = WAIT_FAILED; } } while ((Status == STATUS_ALERTED) && (bAlertable)); - + /* Cleanup the activation context */ if (bAlertable) RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -119,7 +119,7 @@ DWORD i; NTSTATUS Status; RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME ActCtx; - + /* APCs must execute with the default activation context */ if (bAlertable) { @@ -196,7 +196,7 @@ /* Cleanup the activation context */ if (bAlertable) RtlDeactivateActivationContextUnsafeFast(&ActCtx); - + /* Return wait status */ return Status; } @@ -215,7 +215,7 @@ LARGE_INTEGER Time; NTSTATUS Status; RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME ActCtx; - + /* APCs must execute with the default activation context */ if (bAlertable) { @@ -225,7 +225,7 @@ ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; RtlActivateActivationContextUnsafeFast(&ActCtx, NULL); } - + /* Get real handle */ hObjectToWaitOn = TranslateStdHandle(hObjectToWaitOn); @@ -258,7 +258,7 @@ /* Cleanup the activation context */ if (bAlertable) RtlDeactivateActivationContextUnsafeFast(&ActCtx); - + /* Return wait status */ return Status; } @@ -674,7 +674,7 @@ PLARGE_INTEGER TimePtr; NTSTATUS errCode; RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME ActCtx; - + /* APCs must execute with the default activation context */ if (bAlertable) { @@ -702,7 +702,7 @@ errCode = NtDelayExecution((BOOLEAN)bAlertable, TimePtr); } while ((bAlertable) && (errCode == STATUS_ALERTED)); - + /* Return the correct code */ return (errCode == STATUS_USER_APC) ? WAIT_IO_COMPLETION : 0; } Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Sat Jul 23 11:28:35 2011 @@ -230,7 +230,7 @@ { ASSERT(FALSE); } - + /* Success */ if(lpThreadId) *lpThreadId = HandleToUlong(ClientId.UniqueThread); @@ -939,51 +939,61 @@ TlsAlloc(VOID) { ULONG Index; - + PTEB Teb; + PPEB Peb; + + /* Get the PEB and TEB, lock the PEB */ + Teb = NtCurrentTeb(); + Peb = Teb->ProcessEnvironmentBlock; RtlAcquirePebLock(); - /* Try to get regular TEB slot. */ - Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsBitmap, 1, 0); - if (Index == ~0U) - { - /* If it fails, try to find expansion TEB slot. */ - Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsExpansionBitmap, 1, 0); - if (Index != ~0U) + /* Try to get regular TEB slot */ + Index = RtlFindClearBitsAndSet(Peb->TlsBitmap, 1, 0); + if (Index != 0xFFFFFFFF) + { + /* Clear the value. */ + Teb->TlsSlots[Index] = 0; + RtlReleasePebLock(); + return Index; + } + + /* If it fails, try to find expansion TEB slot. */ + Index = RtlFindClearBitsAndSet(Peb->TlsExpansionBitmap, 1, 0); + if (Index != 0xFFFFFFFF) + { + /* Is there no expansion slot yet? */ + if (!Teb->TlsExpansionSlots) { - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - { - NtCurrentTeb()->TlsExpansionSlots = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - TLS_EXPANSION_SLOTS * - sizeof(PVOID)); - } - - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - { - RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, Index, 1); - Index = ~0; - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - } - else - { - /* Clear the value. */ - NtCurrentTeb()->TlsExpansionSlots[Index] = 0; - Index += TLS_MINIMUM_AVAILABLE; - } + /* Allocate an array */ + Teb->TlsExpansionSlots = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + TLS_EXPANSION_SLOTS * + sizeof(PVOID)); + } + + /* Did we get an array? */ + if (!Teb->TlsExpansionSlots) + { + /* Fail */ + RtlClearBits(Peb->TlsExpansionBitmap, Index, 1); + Index = 0xFFFFFFFF; + SetLastErrorByStatus(STATUS_NO_MEMORY); } else { - SetLastError(ERROR_NO_MORE_ITEMS); + /* Clear the value. */ + Teb->TlsExpansionSlots[Index] = 0; + Index += TLS_MINIMUM_AVAILABLE; } } else { - /* Clear the value. */ - NtCurrentTeb()->TlsSlots[Index] = 0; - } - + /* Fail */ + SetLastErrorByStatus(STATUS_NO_MEMORY); + } + + /* Release the lock and return */ RtlReleasePebLock(); - return Index; } @@ -992,52 +1002,70 @@ */ BOOL WINAPI -TlsFree(DWORD Index) +TlsFree(IN DWORD Index) { BOOL BitSet; - - if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) - { + PPEB Peb; + ULONG TlsIndex; + PVOID TlsBitmap; + NTSTATUS Status; + + /* Acquire the PEB lock and grab the PEB */ + Peb = NtCurrentPeb(); + RtlAcquirePebLock(); + + /* Check if the index is too high */ + if (Index >= TLS_MINIMUM_AVAILABLE) + { + /* Check if it can fit in the expansion slots */ + TlsIndex = Index - TLS_MINIMUM_AVAILABLE; + if (TlsIndex >= TLS_EXPANSION_SLOTS) + { + /* It's invalid */ + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + RtlReleasePebLock(); + return FALSE; + } + else + { + /* Use the expansion bitmap */ + TlsBitmap = Peb->TlsExpansionBitmap; + Index = TlsIndex; + } + } + else + { + /* Use the normal bitmap */ + TlsBitmap = Peb->TlsBitmap; + } + + /* Check if the index was set */ + BitSet = RtlAreBitsSet(TlsBitmap, Index, 1); + if (BitSet) + { + /* Tell the kernel to free the TLS cells */ + Status = NtSetInformationThread(NtCurrentThread(), + ThreadZeroTlsCell, + &Index, + sizeof(DWORD)); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return FALSE; + } + + /* Clear the bit */ + RtlClearBits(TlsBitmap, Index, 1); + } + else + { + /* Fail */ SetLastErrorByStatus(STATUS_INVALID_PARAMETER); return FALSE; } - RtlAcquirePebLock(); - - if (Index >= TLS_MINIMUM_AVAILABLE) - { - BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsExpansionBitmap, - Index - TLS_MINIMUM_AVAILABLE, - 1); - - if (BitSet) - RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, - Index - TLS_MINIMUM_AVAILABLE, - 1); - } - else - { - BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsBitmap, Index, 1); - if (BitSet) - RtlClearBits(NtCurrentPeb()->TlsBitmap, Index, 1); - } - - if (BitSet) - { - /* Clear the TLS cells (slots) in all threads of the current process. */ - NtSetInformationThread(NtCurrentThread(), - ThreadZeroTlsCell, - &Index, - sizeof(DWORD)); - } - else - { - SetLastError(ERROR_INVALID_PARAMETER); - } - - RtlReleasePebLock(); - - return BitSet; + /* Done! */ + return TRUE; } /* @@ -1045,67 +1073,96 @@ */ LPVOID WINAPI -TlsGetValue(DWORD Index) -{ +TlsGetValue(IN DWORD Index) +{ + PTEB Teb; + + /* Get the TEB and clear the last error */ + Teb = NtCurrentTeb(); + Teb->LastErrorValue = 0; + + /* Check for simple TLS index */ + if (Index < TLS_MINIMUM_AVAILABLE) + { + /* Return it */ + return Teb->TlsSlots[Index]; + } + + /* Check for valid index */ if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) { + /* Fail */ SetLastErrorByStatus(STATUS_INVALID_PARAMETER); return NULL; } - SetLastError(NO_ERROR); - - if (Index >= TLS_MINIMUM_AVAILABLE) - { - /* The expansion slots are allocated on demand, so check for it. */ - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - return NULL; - return NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE]; - } - else - { - return NtCurrentTeb()->TlsSlots[Index]; - } -} - -/* - * @implemented - */ -BOOL -WINAPI -TlsSetValue(DWORD Index, - LPVOID Value) -{ - if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) - { + /* The expansion slots are allocated on demand, so check for it. */ + Teb->LastErrorValue = 0; + if (!Teb->TlsExpansionSlots) return NULL; + + /* Return the value from the expansion slots */ + return Teb->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE]; +} + +/* + * @implemented + */ +BOOL +WINAPI +TlsSetValue(IN DWORD Index, + IN LPVOID Value) +{ + DWORD TlsIndex; + PTEB Teb = NtCurrentTeb(); + + /* Check for simple TLS index */ + if (Index < TLS_MINIMUM_AVAILABLE) + { + /* Return it */ + Teb->TlsSlots[Index] = Value; + return TRUE; + } + + /* Check if this is an expansion slot */ + TlsIndex = Index - TLS_MINIMUM_AVAILABLE; + if (TlsIndex >= TLS_EXPANSION_SLOTS) + { + /* Fail */ SetLastErrorByStatus(STATUS_INVALID_PARAMETER); return FALSE; } - if (Index >= TLS_MINIMUM_AVAILABLE) - { - if (NtCurrentTeb()->TlsExpansionSlots == NULL) + /* Do we not have expansion slots? */ + if (!Teb->TlsExpansionSlots) + { + /* Get the PEB lock to see if we still need them */ + RtlAcquirePebLock(); + if (!Teb->TlsExpansionSlots) { - NtCurrentTeb()->TlsExpansionSlots = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - TLS_EXPANSION_SLOTS * - sizeof(PVOID)); - - if (NtCurrentTeb()->TlsExpansionSlots == NULL) + /* Allocate them */ + Teb->TlsExpansionSlots = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + TLS_EXPANSION_SLOTS * + sizeof(PVOID)); + if (!Teb->TlsExpansionSlots) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + /* Fail */ + RtlReleasePebLock(); + SetLastErrorByStatus(STATUS_NO_MEMORY); return FALSE; } } - NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE] = Value; - } - else - { - NtCurrentTeb()->TlsSlots[Index] = Value; - } - - return TRUE; -} + /* Release the lock */ + RtlReleasePebLock(); + } + + /* Write the value */ + Teb->TlsExpansionSlots[TlsIndex] = Value; + + /* Success */ + return TRUE; +} + /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs