Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[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

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;

13 years, 5 months

[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

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; }

13 years, 5 months

[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

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);

13 years, 5 months

[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

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 */

13 years, 5 months

[ion] 52799: [KERNEL32]: Fix Bugs #30, #31, #32, #33: WaitForSingleObjectEx, WaitForMultipleObjectsEx, SignalObjectAndWait, SleepEx need to set the default activation context active so that APCs ca...

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 23 11:17:36 2011 New Revision: 52799 URL: http://svn.reactos.org/svn/reactos?rev=52799&view=rev Log: [KERNEL32]: Fix Bugs #30, #31, #32, #33: WaitForSingleObjectEx, WaitForMultipleObjectsEx, SignalObjectAndWait, SleepEx need to set the default activation context active so that APCs can execute under it in the case of alertable wait. [KERNEL32]: Fix Bug #34: WaitForMultipleObjectsEx was leaking the wait block array in case of a wait failure. Modified: trunk/reactos/dll/win32/kernel32/client/synch.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:17:36 2011 @@ -38,6 +38,17 @@ PLARGE_INTEGER TimePtr; LARGE_INTEGER Time; NTSTATUS Status; + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME ActCtx; + + /* APCs must execute with the default activation context */ + if (bAlertable) + { + /* Setup the frame */ + RtlZeroMemory(&ActCtx, sizeof(ActCtx)); + ActCtx.Size = sizeof(ActCtx); + ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; + RtlActivateActivationContextUnsafeFast(&ActCtx, NULL); + } /* Get real handle */ hHandle = TranslateStdHandle(hHandle); @@ -60,10 +71,13 @@ if (!NT_SUCCESS(Status)) { /* The wait failed */ - SetLastErrorByStatus (Status); - return WAIT_FAILED; + SetLastErrorByStatus(Status); + Status = WAIT_FAILED; } } while ((Status == STATUS_ALERTED) && (bAlertable)); + + /* Cleanup the activation context */ + if (bAlertable) RtlDeactivateActivationContextUnsafeFast(&ActCtx); /* Return wait status */ return Status; @@ -104,6 +118,17 @@ HANDLE Handle[8]; DWORD i; NTSTATUS Status; + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME ActCtx; + + /* APCs must execute with the default activation context */ + if (bAlertable) + { + /* Setup the frame */ + RtlZeroMemory(&ActCtx, sizeof(ActCtx)); + ActCtx.Size = sizeof(ActCtx); + ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; + RtlActivateActivationContextUnsafeFast(&ActCtx, NULL); + } /* Check if we have more handles then we locally optimize */ if (nCount > 8) @@ -116,6 +141,7 @@ { /* No buffer, fail the wait */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); + if (bAlertable) RtlDeactivateActivationContextUnsafeFast(&ActCtx); return WAIT_FAILED; } } @@ -156,8 +182,8 @@ if (!NT_SUCCESS(Status)) { /* Wait failed */ - SetLastErrorByStatus (Status); - return WAIT_FAILED; + SetLastErrorByStatus(Status); + Status = WAIT_FAILED; } } while ((Status == STATUS_ALERTED) && (bAlertable)); @@ -168,6 +194,9 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, HandleBuffer); } + /* Cleanup the activation context */ + if (bAlertable) RtlDeactivateActivationContextUnsafeFast(&ActCtx); + /* Return wait status */ return Status; } @@ -185,7 +214,18 @@ PLARGE_INTEGER TimePtr; LARGE_INTEGER Time; NTSTATUS Status; - + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME ActCtx; + + /* APCs must execute with the default activation context */ + if (bAlertable) + { + /* Setup the frame */ + RtlZeroMemory(&ActCtx, sizeof(ActCtx)); + ActCtx.Size = sizeof(ActCtx); + ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; + RtlActivateActivationContextUnsafeFast(&ActCtx, NULL); + } + /* Get real handle */ hObjectToWaitOn = TranslateStdHandle(hObjectToWaitOn); @@ -211,11 +251,14 @@ if (!NT_SUCCESS(Status)) { /* The wait failed */ - SetLastErrorByStatus (Status); - return WAIT_FAILED; + SetLastErrorByStatus(Status); + Status = WAIT_FAILED; } } while ((Status == STATUS_ALERTED) && (bAlertable)); + /* Cleanup the activation context */ + if (bAlertable) RtlDeactivateActivationContextUnsafeFast(&ActCtx); + /* Return wait status */ return Status; } @@ -630,6 +673,17 @@ LARGE_INTEGER Time; PLARGE_INTEGER TimePtr; NTSTATUS errCode; + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME ActCtx; + + /* APCs must execute with the default activation context */ + if (bAlertable) + { + /* Setup the frame */ + RtlZeroMemory(&ActCtx, sizeof(ActCtx)); + ActCtx.Size = sizeof(ActCtx); + ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; + RtlActivateActivationContextUnsafeFast(&ActCtx, NULL); + } /* Convert the timeout */ TimePtr = BaseFormatTimeOut(&Time, dwMilliseconds);

13 years, 5 months

[ion] 52798: [KERNEL32]: Implement a BaseFormatTimeOut helper function to take care of dwMillisecond->LARGE_INTEGER timeout conversion instead of duplicating 3 different versions of the code requir...

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 23 11:05:00 2011 New Revision: 52798 URL: http://svn.reactos.org/svn/reactos?rev=52798&view=rev Log: [KERNEL32]: Implement a BaseFormatTimeOut helper function to take care of dwMillisecond->LARGE_INTEGER timeout conversion instead of duplicating 3 different versions of the code required to do so. Modified: trunk/reactos/dll/win32/kernel32/client/debugger.c trunk/reactos/dll/win32/kernel32/client/file/iocompl.c trunk/reactos/dll/win32/kernel32/client/synch.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/debugger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/debugger.c [iso-8859-1] Sat Jul 23 11:05:00 2011 @@ -654,18 +654,8 @@ DBGUI_WAIT_STATE_CHANGE WaitStateChange; NTSTATUS Status; - /* Check if this is an infinite wait */ - if (dwMilliseconds == INFINITE) - { - /* Under NT, this means no timer argument */ - Timeout = NULL; - } - else - { - /* Otherwise, convert the time to NT Format */ - WaitTime.QuadPart = UInt32x32To64(-10000, dwMilliseconds); - Timeout = &WaitTime; - } + /* Convert to NT Timeout */ + Timeout = BaseFormatTimeOut(&WaitTime, dwMilliseconds); /* Loop while we keep getting interrupted */ do Modified: trunk/reactos/dll/win32/kernel32/client/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] Sat Jul 23 11:05:00 2011 @@ -103,24 +103,23 @@ NTSTATUS errCode; IO_STATUS_BLOCK IoStatus; ULONG_PTR CompletionKey; - LARGE_INTEGER Interval; + LARGE_INTEGER Time; + PLARGE_INTEGER TimePtr; if (!lpNumberOfBytesTransferred || !lpCompletionKey || !lpOverlapped) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - if (dwMilliseconds != INFINITE) - { - Interval.QuadPart = (-(MILLIS_TO_100NS(dwMilliseconds))); - } + + /* Convert the timeout */ + TimePtr = BaseFormatTimeOut(&Time, dwMilliseconds); errCode = NtRemoveIoCompletion(CompletionHandle, (PVOID*)&CompletionKey, (PVOID*)lpOverlapped, &IoStatus, - dwMilliseconds == INFINITE ? NULL : &Interval); + TimePtr); if (!NT_SUCCESS(errCode) || errCode == STATUS_TIMEOUT) { *lpOverlapped = NULL; 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:05:00 2011 @@ -49,18 +49,8 @@ hHandle = GetConsoleInputWaitHandle(); } - /* Check if this is an infinite wait */ - if (dwMilliseconds == INFINITE) - { - /* Under NT, this means no timer argument */ - TimePtr = NULL; - } - else - { - /* Otherwise, convert the time to NT Format */ - Time.QuadPart = UInt32x32To64(-10000, dwMilliseconds); - TimePtr = &Time; - } + /* Convert the timeout */ + TimePtr = BaseFormatTimeOut(&Time, dwMilliseconds); /* Start wait loop */ do @@ -151,18 +141,8 @@ } } - /* Check if this is an infinite wait */ - if (dwMilliseconds == INFINITE) - { - /* Under NT, this means no timer argument */ - TimePtr = NULL; - } - else - { - /* Otherwise, convert the time to NT Format */ - Time.QuadPart = UInt32x32To64(-10000, dwMilliseconds); - TimePtr = &Time; - } + /* Convert the timeout */ + TimePtr = BaseFormatTimeOut(&Time, dwMilliseconds); /* Start wait loop */ do @@ -217,18 +197,8 @@ hObjectToWaitOn = GetConsoleInputWaitHandle(); } - /* Check if this is an infinite wait */ - if (dwMilliseconds == INFINITE) - { - /* Under NT, this means no timer argument */ - TimePtr = NULL; - } - else - { - /* Otherwise, convert the time to NT Format */ - Time.QuadPart = UInt32x32To64(-10000, dwMilliseconds); - TimePtr = &Time; - } + /* Convert the timeout */ + TimePtr = BaseFormatTimeOut(&Time, dwMilliseconds); /* Start wait loop */ do @@ -637,48 +607,51 @@ return TRUE; } - -/* - * @implemented - */ -VOID WINAPI -Sleep(DWORD dwMilliseconds) -{ - SleepEx(dwMilliseconds, FALSE); - return; -} - - -/* - * @implemented - */ -DWORD WINAPI -SleepEx(DWORD dwMilliseconds, - BOOL bAlertable) -{ - LARGE_INTEGER Interval; - NTSTATUS errCode; - - if (dwMilliseconds != INFINITE) - { - /* - * System time units are 100 nanoseconds (a nanosecond is a billionth of - * a second). - */ - Interval.QuadPart = -((LONGLONG)dwMilliseconds * 10000); - } - else - { - /* Approximately 292000 years hence */ - Interval.QuadPart = -0x7FFFFFFFFFFFFFFFLL; - } - -dowait: - errCode = NtDelayExecution ((BOOLEAN)bAlertable, &Interval); - if ((bAlertable) && (errCode == STATUS_ALERTED)) goto dowait; - return (errCode == STATUS_USER_APC) ? WAIT_IO_COMPLETION : 0; -} - +/* + * @implemented + */ +VOID +WINAPI +Sleep(IN DWORD dwMilliseconds) +{ + /* Call the new API */ + SleepEx(dwMilliseconds, FALSE); +} + + +/* + * @implemented + */ +DWORD +WINAPI +SleepEx(IN DWORD dwMilliseconds, + IN BOOL bAlertable) +{ + LARGE_INTEGER Time; + PLARGE_INTEGER TimePtr; + NTSTATUS errCode; + + /* Convert the timeout */ + TimePtr = BaseFormatTimeOut(&Time, dwMilliseconds); + if (!TimePtr) + { + /* Turn an infinite wait into a really long wait */ + Time.LowPart = 0; + Time.HighPart = 0x80000000; + TimePtr = &Time; + } + + /* Loop the delay while APCs are alerting us */ + do + { + /* Do the delay */ + errCode = NtDelayExecution((BOOLEAN)bAlertable, TimePtr); + } + while ((bAlertable) && (errCode == STATUS_ALERTED)); + + /* Return the correct code */ + return (errCode == STATUS_USER_APC) ? WAIT_IO_COMPLETION : 0; +} /* * @implemented 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 11:05:00 2011 @@ -115,6 +115,19 @@ { *UnicodeString = NULL; } +} + +PLARGE_INTEGER +WINAPI +BaseFormatTimeOut(OUT PLARGE_INTEGER Timeout, + IN DWORD dwMilliseconds) +{ + /* Check if this is an infinite wait, which means no timeout argument */ + if (dwMilliseconds == INFINITE) return NULL; + + /* Otherwise, convert the time to NT Format */ + Timeout->QuadPart = UInt32x32To64(dwMilliseconds, -10000); + return Timeout; } /* 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:05:00 2011 @@ -137,6 +137,11 @@ #define HeapFree RtlFreeHeap #define _lread (_readfun)_hread +PLARGE_INTEGER +WINAPI +BaseFormatTimeOut(OUT PLARGE_INTEGER Timeout, + IN DWORD dwMilliseconds); + POBJECT_ATTRIBUTES WINAPI BasepConvertObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes,

13 years, 5 months

[ion] 52797: [KERNEL32]: Fix bugs #22, #23, #24, #25: (Un)RegisterWait(Ex) APIs were not checking for an invalid wait handle. [KERNEL32]: Fix bugs #26, #27: RegisterWait(Ex) was not calling GetCons...

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 23 10:16:10 2011 New Revision: 52797 URL: http://svn.reactos.org/svn/reactos?rev=52797&view=rev Log: [KERNEL32]: Fix bugs #22, #23, #24, #25: (Un)RegisterWait(Ex) APIs were not checking for an invalid wait handle. [KERNEL32]: Fix bugs #26, #27: RegisterWait(Ex) was not calling GetConsoleInputWaitHandle, so waits on console handles were given straight to the kernel (which obvioulsy doesn't grok them). [KERNEL32]: Fix bugs #28, #29: UnRegisterWait(Ex) was not checking for STATUS_PENDING, which is a "warning" in NT, but an error as far as this API is concerned, so FALSE should be returned. Modified: trunk/reactos/dll/win32/kernel32/client/synch.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 10:16:10 2011 @@ -7,8 +7,6 @@ */ /* INCLUDES *****************************************************************/ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x600 #include <k32.h> #define NDEBUG @@ -687,103 +685,144 @@ */ BOOL WINAPI -RegisterWaitForSingleObject( - PHANDLE phNewWaitObject, - HANDLE hObject, - WAITORTIMERCALLBACK Callback, - PVOID Context, - ULONG dwMilliseconds, - ULONG dwFlags - ) -{ - NTSTATUS Status = RtlRegisterWait(phNewWaitObject, - hObject, - Callback, - Context, - dwMilliseconds, - dwFlags); - +RegisterWaitForSingleObject(OUT PHANDLE phNewWaitObject, + IN HANDLE hObject, + IN WAITORTIMERCALLBACK Callback, + IN PVOID Context, + IN ULONG dwMilliseconds, + IN ULONG dwFlags) +{ + NTSTATUS Status; + + /* Get real handle */ + hObject = TranslateStdHandle(hObject); + + /* Check for console handle */ + if ((IsConsoleHandle(hObject)) && (VerifyConsoleIoHandle(hObject))) + { + /* Get the real wait handle */ + hObject = GetConsoleInputWaitHandle(); + } + + /* Register the wait now */ + Status = RtlRegisterWait(phNewWaitObject, + hObject, + Callback, + Context, + dwMilliseconds, + dwFlags); if (!NT_SUCCESS(Status)) { + /* Return failure */ SetLastErrorByStatus(Status); return FALSE; } + + /* All good */ return TRUE; } - -/* - * @implemented - */ -HANDLE -WINAPI -RegisterWaitForSingleObjectEx( - HANDLE hObject, - WAITORTIMERCALLBACK Callback, - PVOID Context, - ULONG dwMilliseconds, - ULONG dwFlags - ) +/* + * @implemented + */ +HANDLE +WINAPI +RegisterWaitForSingleObjectEx(IN HANDLE hObject, + IN WAITORTIMERCALLBACK Callback, + IN PVOID Context, + IN ULONG dwMilliseconds, + IN ULONG dwFlags) { NTSTATUS Status; HANDLE hNewWaitObject; + /* Get real handle */ + hObject = TranslateStdHandle(hObject); + + /* Check for console handle */ + if ((IsConsoleHandle(hObject)) && (VerifyConsoleIoHandle(hObject))) + { + /* Get the real wait handle */ + hObject = GetConsoleInputWaitHandle(); + } + + /* Register the wait */ Status = RtlRegisterWait(&hNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags); - if (!NT_SUCCESS(Status)) { + /* Return failure */ SetLastErrorByStatus(Status); return NULL; } + /* Return the object */ return hNewWaitObject; } - -/* - * @implemented - */ -BOOL -WINAPI -UnregisterWait( - HANDLE WaitHandle - ) -{ - NTSTATUS Status = RtlDeregisterWaitEx(WaitHandle, NULL); - - if (!NT_SUCCESS(Status)) - { +/* + * @implemented + */ +BOOL +WINAPI +UnregisterWait(IN HANDLE WaitHandle) +{ + NTSTATUS Status; + + /* Check for invalid handle */ + if (!WaitHandle) + { + /* Fail */ + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + /* Deregister the wait and check status */ + Status = RtlDeregisterWaitEx(WaitHandle, NULL); + if (!(NT_SUCCESS(Status)) || (Status == STATUS_PENDING)) + { + /* Failure or non-blocking call */ SetLastErrorByStatus(Status); return FALSE; } + /* All good */ return TRUE; } - -/* - * @implemented - */ -BOOL -WINAPI -UnregisterWaitEx( - HANDLE WaitHandle, - HANDLE CompletionEvent - ) -{ - NTSTATUS Status = RtlDeregisterWaitEx(WaitHandle, CompletionEvent); - - if (!NT_SUCCESS(Status)) - { +/* + * @implemented + */ +BOOL +WINAPI +UnregisterWaitEx(IN HANDLE WaitHandle, + IN HANDLE CompletionEvent) +{ + NTSTATUS Status; + + /* Check for invalid handle */ + if (!WaitHandle) + { + /* Fail */ + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + /* Deregister the wait and check status */ + Status = RtlDeregisterWaitEx(WaitHandle, CompletionEvent); + if (!(NT_SUCCESS(Status)) || + ((CompletionEvent != INVALID_HANDLE_VALUE) && (Status == STATUS_PENDING))) + { + /* Failure or non-blocking call */ SetLastErrorByStatus(Status); return FALSE; } + /* All good */ return TRUE; }

13 years, 5 months

[ion] 52796: [KERNEL32]: And finally, the timer APIs and bugs #20 and #21.

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 23 10:08:57 2011 New Revision: 52796 URL: http://svn.reactos.org/svn/reactos?rev=52796&view=rev Log: [KERNEL32]: And finally, the timer APIs and bugs #20 and #21. Modified: trunk/reactos/dll/win32/kernel32/client/synch.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 10:08:57 2011 @@ -257,125 +257,14 @@ */ HANDLE WINAPI -CreateWaitableTimerExA(IN LPSECURITY_ATTRIBUTES lpTimerAttributes OPTIONAL, - IN LPCSTR lpTimerName OPTIONAL, - IN DWORD dwFlags, - IN DWORD dwDesiredAccess) -{ - NTSTATUS Status; - ANSI_STRING AnsiName; - PUNICODE_STRING UnicodeCache; - LPCWSTR UnicodeName = NULL; - - /* Check for a name */ - if (lpTimerName) - { - /* Use TEB Cache */ - UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; - - /* Convert to unicode */ - RtlInitAnsiString(&AnsiName, lpTimerName); - Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); - if (!NT_SUCCESS(Status)) - { - /* Conversion failed */ - SetLastErrorByStatus(Status); - return NULL; - } - - /* Otherwise, save the buffer */ - UnicodeName = (LPCWSTR)UnicodeCache->Buffer; - } - - /* Call the Unicode API */ - return CreateWaitableTimerExW(lpTimerAttributes, - UnicodeName, - dwFlags, - dwDesiredAccess); -} - -/* - * @implemented - */ -HANDLE -WINAPI -CreateWaitableTimerExW(IN LPSECURITY_ATTRIBUTES lpTimerAttributes OPTIONAL, - IN LPCWSTR lpTimerName OPTIONAL, - IN DWORD dwFlags, - IN DWORD dwDesiredAccess) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES LocalAttributes; - POBJECT_ATTRIBUTES ObjectAttributes; - HANDLE Handle; - UNICODE_STRING ObjectName; - TIMER_TYPE TimerType; - - /* Now check if we got a name */ - if (lpTimerName) RtlInitUnicodeString(&ObjectName, lpTimerName); - - if (dwFlags & ~(CREATE_WAITABLE_TIMER_MANUAL_RESET)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - TimerType = (dwFlags & CREATE_WAITABLE_TIMER_MANUAL_RESET) ? NotificationTimer : SynchronizationTimer; - - /* Now convert the object attributes */ - ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, - lpTimerAttributes, - lpTimerName ? &ObjectName : NULL); - - /* Create the timer */ - Status = NtCreateTimer(&Handle, - (ACCESS_MASK)dwDesiredAccess, - ObjectAttributes, - TimerType); - if (NT_SUCCESS(Status)) - { - /* Check if the object already existed */ - if (Status == STATUS_OBJECT_NAME_EXISTS) - { - /* Set distinguished Win32 error code */ - SetLastError(ERROR_ALREADY_EXISTS); - } - else - { - /* Otherwise, set success */ - SetLastError(ERROR_SUCCESS); - } - - /* Return the handle */ - return Handle; - } - else - { - /* Convert the NT Status and fail */ - SetLastErrorByStatus(Status); - return NULL; - } - -} - -/* - * @implemented - */ -HANDLE -WINAPI CreateWaitableTimerW(IN LPSECURITY_ATTRIBUTES lpTimerAttributes OPTIONAL, IN BOOL bManualReset, IN LPCWSTR lpTimerName OPTIONAL) { - DWORD dwFlags = 0; - - if (bManualReset) - dwFlags |= CREATE_WAITABLE_TIMER_MANUAL_RESET; - - return CreateWaitableTimerExW(lpTimerAttributes, - lpTimerName, - dwFlags, - TIMER_ALL_ACCESS); + CreateNtObjectFromWin32Api(WaitableTimer, Timer, TIMER, + lpTimerAttributes, + lpTimerName, + bManualReset ? NotificationTimer : SynchronizationTimer); } /* @@ -387,15 +276,7 @@ IN BOOL bManualReset, IN LPCSTR lpTimerName OPTIONAL) { - DWORD dwFlags = 0; - - if (bManualReset) - dwFlags |= CREATE_WAITABLE_TIMER_MANUAL_RESET; - - return CreateWaitableTimerExA(lpTimerAttributes, - lpTimerName, - dwFlags, - TIMER_ALL_ACCESS); + ConvertWin32AnsiObjectApiToUnicodeApi(WaitableTimer, lpTimerName, lpTimerAttributes, bManualReset); } /* @@ -407,38 +288,7 @@ IN BOOL bInheritHandle, IN LPCWSTR lpTimerName) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING ObjectName; - NTSTATUS Status; - HANDLE Handle; - - /* Make sure we got a name */ - if (!lpTimerName) - { - /* Fail without one */ - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } - - /* Initialize the object name and attributes */ - RtlInitUnicodeString(&ObjectName, lpTimerName); - InitializeObjectAttributes(&ObjectAttributes, - &ObjectName, - bInheritHandle ? OBJ_INHERIT : 0, - hBaseDir, - NULL); - - /* Open the timer */ - Status = NtOpenTimer(&Handle, dwDesiredAccess, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - /* Convert the status and fail */ - SetLastErrorByStatus(Status); - return NULL; - } - - /* Return the handle */ - return Handle; + OpenNtObjectFromWin32Api(Timer, dwDesiredAccess, bInheritHandle, lpTimerName); } /* @@ -450,37 +300,7 @@ IN BOOL bInheritHandle, IN LPCSTR lpTimerName) { - NTSTATUS Status; - ANSI_STRING AnsiName; - PUNICODE_STRING UnicodeCache; - - /* Check for a name */ - if (lpTimerName) - { - /* Use TEB Cache */ - UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; - - /* Convert to unicode */ - RtlInitAnsiString(&AnsiName, lpTimerName); - Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); - if (!NT_SUCCESS(Status)) - { - /* Conversion failed */ - SetLastErrorByStatus(Status); - return NULL; - } - } - else - { - /* We need a name */ - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - /* Call the Unicode API */ - return OpenWaitableTimerW(dwDesiredAccess, - bInheritHandle, - (LPCWSTR)UnicodeCache->Buffer); + ConvertOpenWin32AnsiObjectApiToUnicodeApi(WaitableTimer, dwDesiredAccess, bInheritHandle, lpTimerName); } /*

13 years, 5 months

[ion] 52795: [KERNEL32]: Apply macros to Semaphore APIs. Fix bugs #18/#19 (same as before).

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 23 10:05:02 2011 New Revision: 52795 URL: http://svn.reactos.org/svn/reactos?rev=52795&view=rev Log: [KERNEL32]: Apply macros to Semaphore APIs. Fix bugs #18/#19 (same as before). Modified: trunk/reactos/dll/win32/kernel32/client/synch.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 10:05:02 2011 @@ -535,128 +535,12 @@ */ HANDLE WINAPI -CreateSemaphoreExA(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, - IN LONG lInitialCount, - IN LONG lMaximumCount, - IN LPCSTR lpName OPTIONAL, - IN DWORD dwFlags, - IN DWORD dwDesiredAccess) -{ - NTSTATUS Status; - ANSI_STRING AnsiName; - PUNICODE_STRING UnicodeCache; - LPCWSTR UnicodeName = NULL; - - /* Check for a name */ - if (lpName) - { - /* Use TEB Cache */ - UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; - - /* Convert to unicode */ - RtlInitAnsiString(&AnsiName, lpName); - Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); - if (!NT_SUCCESS(Status)) - { - /* Conversion failed */ - SetLastErrorByStatus(Status); - return NULL; - } - - /* Otherwise, save the buffer */ - UnicodeName = (LPCWSTR)UnicodeCache->Buffer; - } - - /* Call the Unicode API */ - return CreateSemaphoreExW(lpSemaphoreAttributes, - lInitialCount, - lMaximumCount, - UnicodeName, - dwFlags, - dwDesiredAccess); -} - -/* - * @implemented - */ -HANDLE -WINAPI -CreateSemaphoreExW(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, - IN LONG lInitialCount, - IN LONG lMaximumCount, - IN LPCWSTR lpName OPTIONAL, - IN DWORD dwFlags, - IN DWORD dwDesiredAccess) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES LocalAttributes; - POBJECT_ATTRIBUTES ObjectAttributes; - HANDLE Handle; - UNICODE_STRING ObjectName; - - /* Now check if we got a name */ - if (lpName) RtlInitUnicodeString(&ObjectName, lpName); - - if (dwFlags != 0) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - /* Now convert the object attributes */ - ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, - lpSemaphoreAttributes, - lpName ? &ObjectName : NULL); - - /* Create the semaphore */ - Status = NtCreateSemaphore(&Handle, - (ACCESS_MASK)dwDesiredAccess, - ObjectAttributes, - lInitialCount, - lMaximumCount); - if (NT_SUCCESS(Status)) - { - /* Check if the object already existed */ - if (Status == STATUS_OBJECT_NAME_EXISTS) - { - /* Set distinguished Win32 error code */ - SetLastError(ERROR_ALREADY_EXISTS); - } - else - { - /* Otherwise, set success */ - SetLastError(ERROR_SUCCESS); - } - - /* Return the handle */ - return Handle; - } - else - { - /* Convert the NT Status and fail */ - SetLastErrorByStatus(Status); - return NULL; - } - -} - - -/* - * @implemented - */ -HANDLE -WINAPI CreateSemaphoreA(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, IN LONG lInitialCount, IN LONG lMaximumCount, IN LPCSTR lpName OPTIONAL) { - return CreateSemaphoreExA(lpSemaphoreAttributes, - lInitialCount, - lMaximumCount, - lpName, - 0, - SEMAPHORE_ALL_ACCESS); + ConvertWin32AnsiObjectApiToUnicodeApi(Semaphore, lpName, lpSemaphoreAttributes, lInitialCount, lMaximumCount); } /* @@ -669,12 +553,11 @@ IN LONG lMaximumCount, IN LPCWSTR lpName OPTIONAL) { - return CreateSemaphoreExW(lpSemaphoreAttributes, - lInitialCount, - lMaximumCount, - lpName, - 0, - SEMAPHORE_ALL_ACCESS); + CreateNtObjectFromWin32Api(Semaphore, Semaphore, SEMAPHORE, + lpSemaphoreAttributes, + lpName, + lInitialCount, + lMaximumCount); } /* @@ -686,37 +569,7 @@ IN BOOL bInheritHandle, IN LPCSTR lpName) { - NTSTATUS Status; - ANSI_STRING AnsiName; - PUNICODE_STRING UnicodeCache; - - /* Check for a name */ - if (lpName) - { - /* Use TEB Cache */ - UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; - - /* Convert to unicode */ - RtlInitAnsiString(&AnsiName, lpName); - Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); - if (!NT_SUCCESS(Status)) - { - /* Conversion failed */ - SetLastErrorByStatus(Status); - return NULL; - } - } - else - { - /* We need a name */ - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - /* Call the Unicode API */ - return OpenSemaphoreW(dwDesiredAccess, - bInheritHandle, - (LPCWSTR)UnicodeCache->Buffer); + ConvertOpenWin32AnsiObjectApiToUnicodeApi(Semaphore, dwDesiredAccess, bInheritHandle, lpName); } /* @@ -728,38 +581,7 @@ IN BOOL bInheritHandle, IN LPCWSTR lpName) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING ObjectName; - NTSTATUS Status; - HANDLE Handle; - - /* Make sure we got a name */ - if (!lpName) - { - /* Fail without one */ - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } - - /* Initialize the object name and attributes */ - RtlInitUnicodeString(&ObjectName, lpName); - InitializeObjectAttributes(&ObjectAttributes, - &ObjectName, - bInheritHandle ? OBJ_INHERIT : 0, - hBaseDir, - NULL); - - /* Open the semaphore */ - Status = NtOpenSemaphore(&Handle, dwDesiredAccess, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - /* Convert the status and fail */ - SetLastErrorByStatus(Status); - return NULL; - } - - /* Return the handle */ - return Handle; + OpenNtObjectFromWin32Api(Semaphore, dwDesiredAccess, bInheritHandle, lpName); } /*

13 years, 5 months

[ion] 52794: [KERNEL32]: Arch, next time hit "Save" before comitting.

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 23 10:03:10 2011 New Revision: 52794 URL: http://svn.reactos.org/svn/reactos?rev=52794&view=rev Log: [KERNEL32]: Arch, next time hit "Save" before comitting. Modified: trunk/reactos/dll/win32/kernel32/client/synch.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 10:03:10 2011 @@ -791,7 +791,7 @@ IN BOOL bInitialOwner, IN LPCSTR lpName OPTIONAL) { - CreateNtObjectFromWin32Api(Mutex, lpMutexAttributes, bInitialOwner, lpName); + ConvertWin32AnsiObjectApiToUnicodeApi(Mutex, lpName, lpMutexAttributes, bInitialOwner); } /* @@ -803,10 +803,10 @@ IN BOOL bInitialOwner, IN LPCWSTR lpName OPTIONAL) { - CreateNtObjectFromWin32ApiW(Mutex, Mutant, MUTEX, - lpMutexAttributes, - bInitialOwner, - lpName); + CreateNtObjectFromWin32Api(Mutex, Mutant, MUTEX, + lpMutexAttributes, + lpName, + bInitialOwner); } /* @@ -818,7 +818,7 @@ IN BOOL bInheritHandle, IN LPCSTR lpName) { - OpenNtObjectFromWin32Api(Mutex, dwDesiredAccess, bInheritHandle, lpName); + ConvertOpenWin32AnsiObjectApiToUnicodeApi(Mutex, dwDesiredAccess, bInheritHandle, lpName); } /* @@ -830,7 +830,7 @@ IN BOOL bInheritHandle, IN LPCWSTR lpName) { - OpenNtObjectFromWin32ApiW(Mutant, dwDesiredAccess, bInheritHandle, lpName); + OpenNtObjectFromWin32Api(Mutant, dwDesiredAccess, bInheritHandle, lpName); } /*

13 years, 5 months

← Newer
1
...
19
20
21
22
23
24
25
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2011