Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rharabien] 54050: [NTOSKRNL] - Fix a copy-pasta. Fixes hand in 2nd stage.
by rharabien＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: rharabien Date: Fri Oct 7 19:31:47 2011 New Revision: 54050 URL: http://svn.reactos.org/svn/reactos?rev=54050&view=rev Log: [NTOSKRNL] - Fix a copy-pasta. Fixes hand in 2nd stage. Modified: trunk/reactos/ntoskrnl/ke/semphobj.c Modified: trunk/reactos/ntoskrnl/ke/semphobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/semphobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/semphobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/semphobj.c [iso-8859-1] Fri Oct 7 19:31:47 2011 @@ -26,7 +26,7 @@ /* Simply Initialize the Header */ Semaphore->Header.Type = SemaphoreObject; Semaphore->Header.Size = sizeof(KSEMAPHORE) / sizeof(ULONG); - Semaphore->Header.SignalState = 0; + Semaphore->Header.SignalState = Count; InitializeListHead(&(Semaphore->Header.WaitListHead)); /* Set the Limit */

1 0

[tkreuzer] 54049: [SMSS] Remove a hack for MSVC.
by tkreuzer＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: tkreuzer Date: Fri Oct 7 18:25:41 2011 New Revision: 54049 URL: http://svn.reactos.org/svn/reactos?rev=54049&view=rev Log: [SMSS] Remove a hack for MSVC. Modified: trunk/reactos/base/system/smss/CMakeLists.txt Modified: trunk/reactos/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/CMakeList… ============================================================================== --- trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] Fri Oct 7 18:25:41 2011 @@ -26,9 +26,6 @@ add_executable(smss WIN32 ${SOURCE}) target_link_libraries(smss nt smlib) -if(MSVC) - set_entrypoint(smss DllMainCRTStartup) -endif() add_pch(smss smss.h)

1 0

[rharabien] 54048: [NTOSKRNL] - Rename KTHREAD.DispatchHeader to Header - Remove KeInitializeDispatcherHeader and initialize dispatcher headers depending on object type. Fixes all ntos:KeEvent and ...
by rharabien＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: rharabien Date: Fri Oct 7 16:18:52 2011 New Revision: 54048 URL: http://svn.reactos.org/svn/reactos?rev=54048&view=rev Log: [NTOSKRNL] - Rename KTHREAD.DispatchHeader to Header - Remove KeInitializeDispatcherHeader and initialize dispatcher headers depending on object type. Fixes all ntos:KeEvent and KeTimer kmtests. Modified: trunk/reactos/include/asm/ks386.template.h trunk/reactos/include/asm/ksx.template.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/eventobj.c trunk/reactos/ntoskrnl/ke/gate.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/thrdini.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ke/mutex.c trunk/reactos/ntoskrnl/ke/procobj.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/semphobj.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/timerobj.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/asm/ks386.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ks386.template… ============================================================================== --- trunk/reactos/include/asm/ks386.template.h [iso-8859-1] (original) +++ trunk/reactos/include/asm/ks386.template.h [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -391,7 +391,7 @@ //#define EXCEPTION_RECORD_LENGTH 0x50 HEADER("KTHREAD"), -OFFSET(KTHREAD_DEBUG_ACTIVE, KTHREAD, DispatcherHeader.DebugActive), +OFFSET(KTHREAD_DEBUG_ACTIVE, KTHREAD, Header.DebugActive), OFFSET(KTHREAD_INITIAL_STACK, KTHREAD, InitialStack), OFFSET(KTHREAD_STACK_LIMIT, KTHREAD, StackLimit), OFFSET(KTHREAD_TEB, KTHREAD, Teb), Modified: trunk/reactos/include/asm/ksx.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ksx.template.h… ============================================================================== --- trunk/reactos/include/asm/ksx.template.h [iso-8859-1] (original) +++ trunk/reactos/include/asm/ksx.template.h [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -592,13 +592,13 @@ OFFSET(TfMilliseconds, TIME_FIELDS, Milliseconds), HEADER("KTHREAD"), -OFFSET(ThType, KTHREAD, DispatcherHeader.Type), +OFFSET(ThType, KTHREAD, Header.Type), //OFFSET(ThNpxIrql, KTHREAD, NpxIrql), -OFFSET(ThSize, KTHREAD, DispatcherHeader.Size), -OFFSET(ThLock, KTHREAD, DispatcherHeader.Lock), -OFFSET(ThDebugActive, KTHREAD, DispatcherHeader.DebugActive), +OFFSET(ThSize, KTHREAD, Header.Size), +OFFSET(ThLock, KTHREAD, Header.Lock), +OFFSET(ThDebugActive, KTHREAD, Header.DebugActive), //OFFSET(ThThreadControlFlags, KTHREAD, DispatcherHeader.ThreadControlFlags), -OFFSET(ThSignalState, KTHREAD, DispatcherHeader.SignalState), +OFFSET(ThSignalState, KTHREAD, Header.SignalState), #if (NTDDI_VERSION >= NTDDI_LONGHORN) OFFSET(ThCycleTime, KTHREAD, CycleTime), OFFSET(ThHighCycleTime, KTHREAD, HighCycleTime), Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -681,7 +681,7 @@ // typedef struct _KTHREAD { - DISPATCHER_HEADER DispatcherHeader; + DISPATCHER_HEADER Header; #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONGLONG CycleTime; ULONG HighCycleTime; @@ -929,7 +929,7 @@ } KTHREAD; #define ASSERT_THREAD(object) \ - ASSERT((((object)->DispatcherHeader.Type & KOBJECT_TYPE_MASK) == ThreadObject)) + ASSERT((((object)->Header.Type & KOBJECT_TYPE_MASK) == ThreadObject)) // // Kernel Process (KPROCESS) Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -288,7 +288,7 @@ /* Flush DR7 and check for debugging */ TrapFrame->Dr7 = 0; - if (__builtin_expect(KeGetCurrentThread()->DispatcherHeader.DebugActive & 0xFF, 0)) + if (__builtin_expect(KeGetCurrentThread()->Header.DebugActive & 0xFF, 0)) { DbgPrint("Need Hardware Breakpoint Support!\n"); while (TRUE); @@ -310,7 +310,7 @@ /* Flush DR7 and check for debugging */ TrapFrame->Dr7 = 0; - if (__builtin_expect(KeGetCurrentThread()->DispatcherHeader.DebugActive & 0xFF, 0)) + if (__builtin_expect(KeGetCurrentThread()->Header.DebugActive & 0xFF, 0)) { DbgPrint("Need Hardware Breakpoint Support!\n"); while (TRUE); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -146,17 +146,6 @@ #define AFFINITY_MASK(Id) KiMask32Array[Id] #define PRIORITY_MASK(Id) KiMask32Array[Id] -/* The following macro initializes a dispatcher object's header */ -#define KeInitializeDispatcherHeader(Header, t, s, State) \ -{ \ - (Header)->Type = t; \ - (Header)->Absolute = 0; \ - (Header)->Size = s; \ - (Header)->Inserted = 0; \ - (Header)->SignalState = State; \ - InitializeListHead(&((Header)->WaitListHead)); \ -} - /* Tells us if the Timer or Event is a Syncronization or Notification Object */ #define TIMER_OR_EVENT_TYPE 0x7L Modified: trunk/reactos/ntoskrnl/ke/eventobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/eventobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/eventobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/eventobj.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -37,10 +37,11 @@ IN BOOLEAN State) { /* Initialize the Dispatcher Header */ - KeInitializeDispatcherHeader(&Event->Header, - Type, - sizeof(*Event) / sizeof(ULONG), - State); + Event->Header.Type = Type; + //Event->Header.Signalling = FALSE; // fails in kmtest + Event->Header.Size = sizeof(KEVENT) / sizeof(ULONG); + Event->Header.SignalState = State; + InitializeListHead(&(Event->Header.WaitListHead)); } /* Modified: trunk/reactos/ntoskrnl/ke/gate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gate.c?rev=540… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gate.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/gate.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -19,10 +19,11 @@ KeInitializeGate(IN PKGATE Gate) { /* Initialize the Dispatcher Header */ - KeInitializeDispatcherHeader(&Gate->Header, - GateObject, - sizeof(KGATE) / sizeof(ULONG), - 0); + Gate->Header.Type = GateObject; + Gate->Header.Signalling = FALSE; + Gate->Header.Size = sizeof(KGATE) / sizeof(ULONG); + Gate->Header.SignalState = 0; + InitializeListHead(&(Gate->Header.WaitListHead)); } VOID Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -1431,7 +1431,7 @@ }; #endif - KeGetCurrentThread()->DispatcherHeader.NpxIrql = KeGetCurrentIrql(); + KeGetCurrentThread()->Header.NpxIrql = KeGetCurrentIrql(); return STATUS_SUCCESS; } @@ -1443,7 +1443,7 @@ KeRestoreFloatingPointState(IN PKFLOATING_SAVE Save) { PFNSAVE_FORMAT FpState = *((PVOID *) Save); - ASSERT(KeGetCurrentThread()->DispatcherHeader.NpxIrql == KeGetCurrentIrql()); + ASSERT(KeGetCurrentThread()->Header.NpxIrql == KeGetCurrentIrql()); DPRINT1("%s is not really implemented\n", __FUNCTION__); #ifdef __GNUC__ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -70,7 +70,7 @@ FASTCALL KiUpdateDr7(IN ULONG Dr7) { - ULONG DebugMask = KeGetCurrentThread()->DispatcherHeader.DebugActive; + ULONG DebugMask = KeGetCurrentThread()->Header.DebugActive; /* Check if debugging is enabled */ if (DebugMask & DR_MASK(DR7_OVERRIDE_V)) @@ -97,7 +97,7 @@ if (!DrMask) { /* He didn't, use the one from the thread */ - Mask = KeGetCurrentThread()->DispatcherHeader.DebugActive; + Mask = KeGetCurrentThread()->Header.DebugActive; } else { @@ -153,7 +153,7 @@ if (Mask != NewMask) { /* Update it */ - KeGetCurrentThread()->DispatcherHeader.DebugActive = + KeGetCurrentThread()->Header.DebugActive = (BOOLEAN)NewMask; } } @@ -611,7 +611,7 @@ if (PreviousMode != KernelMode) { /* Save the mask */ - KeGetCurrentThread()->DispatcherHeader.DebugActive = (DrMask != 0); + KeGetCurrentThread()->Header.DebugActive = (DrMask != 0); } } Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -163,7 +163,7 @@ /* Set the Thread's NPX State */ Thread->NpxState = NPX_STATE_NOT_LOADED; - Thread->DispatcherHeader.NpxIrql = PASSIVE_LEVEL; + Thread->Header.NpxIrql = PASSIVE_LEVEL; } else { Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -1523,7 +1523,7 @@ /* Clear DR7 and check for debugging */ TrapFrame->Dr7 = 0; - if (__builtin_expect(Thread->DispatcherHeader.DebugActive & 0xFF, 0)) + if (__builtin_expect(Thread->Header.DebugActive & 0xFF, 0)) { UNIMPLEMENTED; while (TRUE); Modified: trunk/reactos/ntoskrnl/ke/mutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/mutex.c?rev=54… ============================================================================== --- trunk/reactos/ntoskrnl/ke/mutex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/mutex.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -49,10 +49,11 @@ } /* Now we set up the Dispatcher Header */ - KeInitializeDispatcherHeader(&Mutant->Header, - MutantObject, - sizeof(KMUTANT) / sizeof(ULONG), - InitialOwner ? FALSE : TRUE); + Mutant->Header.Type = MutantObject; + Mutant->Header.Size = sizeof(KMUTANT) / sizeof(ULONG); + Mutant->Header.DpcActive = FALSE; + Mutant->Header.SignalState = InitialOwner ? 0 : 1; + InitializeListHead(&(Mutant->Header.WaitListHead)); /* Initialize the default data */ Mutant->Abandoned = FALSE; @@ -68,10 +69,11 @@ IN ULONG Level) { /* Set up the Dispatcher Header */ - KeInitializeDispatcherHeader(&Mutex->Header, - MutantObject, - sizeof(KMUTEX) / sizeof(ULONG), - TRUE); + Mutex->Header.Type = MutantObject; + Mutex->Header.Size = sizeof(KMUTEX) / sizeof(ULONG); + Mutex->Header.DpcActive = FALSE; + Mutex->Header.SignalState = 1; + InitializeListHead(&(Mutex->Header.WaitListHead)); /* Initialize the default data */ Mutex->OwnerThread = NULL; Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -125,10 +125,10 @@ #endif /* Initialize the Dispatcher Header */ - KeInitializeDispatcherHeader(&Process->Header, - ProcessObject, - sizeof(KPROCESS), - FALSE); + Process->Header.Type = ProcessObject; + Process->Header.Size = sizeof(KPROCESS) / sizeof(ULONG); + Process->Header.SignalState = 0; + InitializeListHead(&(Process->Header.WaitListHead)); /* Initialize Scheduler Data, Alignment Faults and Set the PDE */ Process->Affinity = Affinity; Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=54… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -149,10 +149,11 @@ IN ULONG Count OPTIONAL) { /* Initialize the Header */ - KeInitializeDispatcherHeader(&Queue->Header, - QueueObject, - sizeof(KQUEUE) / sizeof(ULONG), - 0); + Queue->Header.Type = QueueObject; + Queue->Header.Abandoned = 0; + Queue->Header.Size = sizeof(KQUEUE) / sizeof(ULONG); + Queue->Header.SignalState = 0; + InitializeListHead(&(Queue->Header.WaitListHead)); /* Initialize the Lists */ InitializeListHead(&Queue->EntryListHead); Modified: trunk/reactos/ntoskrnl/ke/semphobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/semphobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/semphobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/semphobj.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -24,10 +24,10 @@ IN LONG Limit) { /* Simply Initialize the Header */ - KeInitializeDispatcherHeader(&Semaphore->Header, - SemaphoreObject, - sizeof(KSEMAPHORE) / sizeof(ULONG), - Count); + Semaphore->Header.Type = SemaphoreObject; + Semaphore->Header.Size = sizeof(KSEMAPHORE) / sizeof(ULONG); + Semaphore->Header.SignalState = 0; + InitializeListHead(&(Semaphore->Header.WaitListHead)); /* Set the Limit */ Semaphore->Limit = Limit; Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -46,7 +46,6 @@ return (UCHAR)Result; } - BOOLEAN NTAPI KeReadStateThread(IN PKTHREAD Thread) @@ -54,7 +53,7 @@ ASSERT_THREAD(Thread); /* Return signal state */ - return (BOOLEAN)Thread->DispatcherHeader.SignalState; + return (BOOLEAN)Thread->Header.SignalState; } KPRIORITY @@ -726,10 +725,11 @@ NTSTATUS Status; /* Initalize the Dispatcher Header */ - KeInitializeDispatcherHeader(&Thread->DispatcherHeader, - ThreadObject, - sizeof(KTHREAD) / sizeof(LONG), - FALSE); + Thread->Header.Type = ThreadObject; + Thread->Header.ThreadControlFlags = 0; + Thread->Header.DebugActive = FALSE; + Thread->Header.SignalState = 0; + InitializeListHead(&(Thread->Header.WaitListHead)); /* Initialize the Mutant List */ InitializeListHead(&Thread->MutantListHead); @@ -1381,11 +1381,11 @@ } /* Signal the thread */ - Thread->DispatcherHeader.SignalState = TRUE; - if (!IsListEmpty(&Thread->DispatcherHeader.WaitListHead)) + Thread->Header.SignalState = TRUE; + if (!IsListEmpty(&Thread->Header.WaitListHead)) { /* Unwait the threads */ - KxUnwaitThread(&Thread->DispatcherHeader, Increment); + KxUnwaitThread(&Thread->Header, Increment); } /* Remove the thread from the list */ Modified: trunk/reactos/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timerobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -249,10 +249,12 @@ "NotificationTimer" : "SynchronizationTimer"); /* Initialize the Dispatch Header */ - KeInitializeDispatcherHeader(&Timer->Header, - TimerNotificationObject + Type, - sizeof(KTIMER) / sizeof(ULONG), - FALSE); + Timer->Header.Type = TimerNotificationObject + Type; + //Timer->Header.TimerControlFlags = 0; // win does not init this field + Timer->Header.Hand = sizeof(KTIMER) / sizeof(ULONG); + Timer->Header.Inserted = 0; // win7: Timer->Header.TimerMiscFlags = 0; + Timer->Header.SignalState = 0; + InitializeListHead(&(Timer->Header.WaitListHead)); /* Initalize the Other data */ Timer->DueTime.QuadPart = 0; Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -958,7 +958,7 @@ FoundThread = CidEntry->Object; /* Make sure it's really a thread and this process' */ - if ((FoundThread->Tcb.DispatcherHeader.Type == ThreadObject) && + if ((FoundThread->Tcb.Header.Type == ThreadObject) && (FoundThread->Cid.UniqueProcess == Cid->UniqueProcess)) { /* Safe Reference and return it */ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Fri Oct 7 16:18:52 2011 @@ -647,7 +647,7 @@ FoundThread = CidEntry->Object; /* Make sure it's really a process */ - if (FoundThread->Tcb.DispatcherHeader.Type == ThreadObject) + if (FoundThread->Tcb.Header.Type == ThreadObject) { /* Safe Reference and return it */ if (ObReferenceObjectSafe(FoundThread))

1 0

[rharabien] 54047: [KMTESTS\NTOS_KE] - Add KeTimer test stub which tests only KeInitializeTimerEx (Note: this function initializes more fields of dispatch header than KeInitializeEvent).
by rharabien＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: rharabien Date: Fri Oct 7 16:13:03 2011 New Revision: 54047 URL: http://svn.reactos.org/svn/reactos?rev=54047&view=rev Log: [KMTESTS\NTOS_KE] - Add KeTimer test stub which tests only KeInitializeTimerEx (Note: this function initializes more fields of dispatch header than KeInitializeEvent). Added: trunk/rostests/kmtests/ntos_ke/KeTimer.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv.rbuild trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Oct 7 16:13:03 2011 @@ -43,6 +43,7 @@ ntos_ke/KeIrql.c ntos_ke/KeProcessor.c ntos_ke/KeSpinLock.c + ntos_ke/KeTimer.c ntos_mm/MmSection.c ntos_ob/ObReference.c ntos_ob/ObType.c Modified: trunk/rostests/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv.rbuild… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv.rbuild [iso-8859-1] Fri Oct 7 16:13:03 2011 @@ -43,6 +43,7 @@ <file>KeIrql.c</file> <file>KeProcessor.c</file> <file>KeSpinLock.c</file> + <file>KeTimer.c</file> </directory> <directory name="ntos_mm"> <file>MmSection.c</file> Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Oct 7 16:13:03 2011 @@ -29,6 +29,7 @@ KMT_TESTFUNC Test_KeGuardedMutex; KMT_TESTFUNC Test_KeIrql; KMT_TESTFUNC Test_KeProcessor; +KMT_TESTFUNC Test_KeTimer; KMT_TESTFUNC Test_KernelType; KMT_TESTFUNC Test_MmSection; KMT_TESTFUNC Test_ObReference; @@ -63,6 +64,7 @@ { "KeGuardedMutex", Test_KeGuardedMutex }, { "KeIrql", Test_KeIrql }, { "-KeProcessor", Test_KeProcessor }, + { "KeTimer", Test_KeTimer }, { "-KernelType", Test_KernelType }, { "MmSection", Test_MmSection }, { "ObReference", Test_ObReference }, Added: trunk/rostests/kmtests/ntos_ke/KeTimer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeTimer.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeTimer.c (added) +++ trunk/rostests/kmtests/ntos_ke/KeTimer.c [iso-8859-1] Fri Oct 7 16:13:03 2011 @@ -1,0 +1,70 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Timer test + * PROGRAMMER: Rafal Harabien <rafalh(a)reactos.org> + */ + +#include <kmt_test.h> + +#define CheckTimer(Timer, ExpectedType, State, ExpectedWaitNext, \ + Irql, ThreadList, ThreadCount) do \ +{ \ + INT TheIndex; \ + PLIST_ENTRY TheEntry; \ + PKTHREAD TheThread; \ + ok_eq_uint((Timer)->Header.Type, ExpectedType); \ + ok_eq_uint((Timer)->Header.Hand, sizeof *(Timer) / sizeof(ULONG)); \ + ok_eq_hex((Timer)->Header.Lock & 0xFF00FF00L, 0x00005500L); \ + ok_eq_long((Timer)->Header.SignalState, State); \ + TheEntry = (Timer)->Header.WaitListHead.Flink; \ + for (TheIndex = 0; TheIndex < (ThreadCount); ++TheIndex) \ + { \ + TheThread = CONTAINING_RECORD(TheEntry, KTHREAD, \ + WaitBlock[0].WaitListEntry); \ + ok_eq_pointer(TheThread, (ThreadList)[TheIndex]); \ + ok_eq_pointer(TheEntry->Flink->Blink, TheEntry); \ + TheEntry = TheEntry->Flink; \ + } \ + ok_eq_pointer(TheEntry, &(Timer)->Header.WaitListHead); \ + ok_eq_pointer(TheEntry->Flink->Blink, TheEntry); \ + ok_eq_long(KeReadStateTimer(Timer), State); \ + ok_eq_bool(Thread->WaitNext, ExpectedWaitNext); \ + ok_irql(Irql); \ +} while (0) + +static +VOID +TestTimerFunctional( + IN PKTIMER Timer, + IN TIMER_TYPE Type, + IN KIRQL OriginalIrql) +{ + PKTHREAD Thread = KeGetCurrentThread(); + + memset(Timer, 0x55, sizeof *Timer); + KeInitializeTimerEx(Timer, Type); + CheckTimer(Timer, TimerNotificationObject + Type, 0L, FALSE, OriginalIrql, (PVOID *)NULL, 0); +} + +START_TEST(KeTimer) +{ + KTIMER Timer; + KIRQL Irql; + KIRQL Irqls[] = { PASSIVE_LEVEL, APC_LEVEL, DISPATCH_LEVEL, HIGH_LEVEL }; + INT i; + + for (i = 0; i < sizeof Irqls / sizeof Irqls[0]; ++i) + { + /* DRIVER_IRQL_NOT_LESS_OR_EQUAL (TODO: on MP only?) */ + if (Irqls[i] > DISPATCH_LEVEL && KmtIsCheckedBuild) + return; + KeRaiseIrql(Irqls[i], &Irql); + TestTimerFunctional(&Timer, NotificationTimer, Irqls[i]); + TestTimerFunctional(&Timer, SynchronizationTimer, Irqls[i]); + KeLowerIrql(Irql); + } + + ok_irql(PASSIVE_LEVEL); + KmtSetIrql(PASSIVE_LEVEL); +} Propchange: trunk/rostests/kmtests/ntos_ke/KeTimer.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 54046: [CMAKE] Remove duplicate base address
by tkreuzer＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: tkreuzer Date: Fri Oct 7 14:41:47 2011 New Revision: 54046 URL: http://svn.reactos.org/svn/reactos?rev=54046&view=rev Log: [CMAKE] Remove duplicate base address Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Fri Oct 7 14:41:47 2011 @@ -208,7 +208,6 @@ set(baseaddress_imagehlp 0x76c90000) set(baseaddress_clusapi 0x76d10000) set(baseaddress_wmi 0x76d20000) -set(baseaddress_dhcpcsvc 0x76d80000) set(baseaddress_fmifs 0x76df0000) set(baseaddress_oleaut32 0x76e00000) set(baseaddress_tapi32 0x76e60000)

1 0

[tkreuzer] 54045: [RTL] Silence a debugprint
by tkreuzer＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: tkreuzer Date: Fri Oct 7 14:31:00 2011 New Revision: 54045 URL: http://svn.reactos.org/svn/reactos?rev=54045&view=rev Log: [RTL] Silence a debugprint Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=54045… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Fri Oct 7 14:31:00 2011 @@ -2005,7 +2005,7 @@ UNICODE_STRING nameW; HANDLE file; - DPRINT1( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", + DPRINT( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", ai->name, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision, ai->arch ); if ((status = lookup_winsxs(acl, ai)) != STATUS_NO_SUCH_FILE) return status;

1 0

[jimtabor] 54044: [Win32k] - Implement get atom name for user32.
by jimtabor＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: jimtabor Date: Fri Oct 7 13:56:25 2011 New Revision: 54044 URL: http://svn.reactos.org/svn/reactos?rev=54044&view=rev Log: [Win32k] - Implement get atom name for user32. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri Oct 7 13:56:25 2011 @@ -1825,7 +1825,7 @@ NTAPI NtUserGetAtomName( ATOM nAtom, - LPWSTR lpBuffer); + PUNICODE_STRING pBuffer); UINT NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Fri Oct 7 13:56:25 2011 @@ -623,16 +623,6 @@ APIENTRY NtUserGetAppImeLevel( DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetAtomName( - ATOM nAtom, - LPWSTR lpBuffer) { STUB; return 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c [iso-8859-1] Fri Oct 7 13:56:25 2011 @@ -78,4 +78,27 @@ return Atom; } +DWORD +APIENTRY +NtUserGetAtomName( + ATOM nAtom, + PUNICODE_STRING pBuffer) +{ + DWORD Ret; + UNICODE_STRING CapturedName = {0}; + UserEnterShared(); + _SEH2_TRY + { + CapturedName = ProbeForReadUnicodeString(pBuffer); + Ret = IntGetAtomName((RTL_ATOM)nAtom, CapturedName.Buffer, (ULONG)CapturedName.Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = 0; + } + _SEH2_END + UserLeave(); + return Ret; +} + /* EOF */

1 0

[gadamopoulos] 54043: [win32k] - SetActiveWindow should call SetWindowPos without SWP_NOACTIVATE parameter
by gadamopoulos＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: gadamopoulos Date: Fri Oct 7 10:10:23 2011 New Revision: 54043 URL: http://svn.reactos.org/svn/reactos?rev=54043&view=rev Log: [win32k] - SetActiveWindow should call SetWindowPos without SWP_NOACTIVATE parameter Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Fri Oct 7 10:10:23 2011 @@ -73,7 +73,7 @@ if (Window->spwndPrev != NULL) co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + SWP_NOSIZE | SWP_NOMOVE); if (!Window->spwndOwner && !IntGetParent(Window)) {

1 0

[cgutman] 54042: [KBDCLASS/MOUCLASS] - Better fix for the race condition
by cgutman＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: cgutman Date: Fri Oct 7 05:52:52 2011 New Revision: 54042 URL: http://svn.reactos.org/svn/reactos?rev=54042&view=rev Log: [KBDCLASS/MOUCLASS] - Better fix for the race condition Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Fri Oct 7 05:52:52 2011 @@ -761,6 +761,7 @@ { PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; NTSTATUS Status; + KIRQL OldIrql; TRACE_(CLASS_NAME, "HandleReadIrp(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); @@ -804,18 +805,20 @@ } else { - IoMarkIrpPending(Irp); - DeviceExtension->PendingIrp = Irp; - (VOID)IoSetCancelRoutine(Irp, ClassCancelRoutine); - if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + IoAcquireCancelSpinLock(&OldIrql); + if (Irp->Cancel) { DeviceExtension->PendingIrp = NULL; Status = STATUS_CANCELLED; } else { + IoMarkIrpPending(Irp); + DeviceExtension->PendingIrp = Irp; + (VOID)IoSetCancelRoutine(Irp, ClassCancelRoutine); Status = STATUS_PENDING; } + IoReleaseCancelSpinLock(OldIrql); } return Status; } Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Fri Oct 7 05:52:52 2011 @@ -738,6 +738,7 @@ { PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; NTSTATUS Status; + KIRQL OldIrql; TRACE_(CLASS_NAME, "HandleReadIrp(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); @@ -781,18 +782,20 @@ } else { - IoMarkIrpPending(Irp); - DeviceExtension->PendingIrp = Irp; - (VOID)IoSetCancelRoutine(Irp, ClassCancelRoutine); - if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + IoAcquireCancelSpinLock(&OldIrql); + if (Irp->Cancel) { DeviceExtension->PendingIrp = NULL; Status = STATUS_CANCELLED; } else { + IoMarkIrpPending(Irp); + DeviceExtension->PendingIrp = Irp; + (VOID)IoSetCancelRoutine(Irp, ClassCancelRoutine); Status = STATUS_PENDING; } + IoReleaseCancelSpinLock(OldIrql); } return Status; }

1 0

[cgutman] 54041: [KBDCLASS/MOUCLASS] - Fix a race condition in IRP queuing that can cause an assertion to fail in the cancellation routine
by cgutman＠svn.reactos.org 07 Oct '11

07 Oct '11

Author: cgutman Date: Fri Oct 7 05:23:16 2011 New Revision: 54041 URL: http://svn.reactos.org/svn/reactos?rev=54041&view=rev Log: [KBDCLASS/MOUCLASS] - Fix a race condition in IRP queuing that can cause an assertion to fail in the cancellation routine Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Fri Oct 7 05:23:16 2011 @@ -804,6 +804,8 @@ } else { + IoMarkIrpPending(Irp); + DeviceExtension->PendingIrp = Irp; (VOID)IoSetCancelRoutine(Irp, ClassCancelRoutine); if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) { @@ -812,8 +814,6 @@ } else { - IoMarkIrpPending(Irp); - DeviceExtension->PendingIrp = Irp; Status = STATUS_PENDING; } } Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Fri Oct 7 05:23:16 2011 @@ -781,6 +781,8 @@ } else { + IoMarkIrpPending(Irp); + DeviceExtension->PendingIrp = Irp; (VOID)IoSetCancelRoutine(Irp, ClassCancelRoutine); if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) { @@ -789,8 +791,6 @@ } else { - IoMarkIrpPending(Irp); - DeviceExtension->PendingIrp = Irp; Status = STATUS_PENDING; } }

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