From 6cf55b644ffc0b2251d2ba4f054b0397ce9dc52e Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Sun, 23 Jul 2006 19:14:19 +0000 Subject: [PATCH] Patch from w3seek svn path=/trunk/; revision=23253 --- reactos/ntoskrnl/ps/kill.c | 6 +++--- reactos/ntoskrnl/ps/process.c | 6 +++--- reactos/ntoskrnl/ps/query.c | 2 +- reactos/ntoskrnl/ps/security.c | 14 +++++++------- reactos/ntoskrnl/ps/thread.c | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c index 0d3d5d227df..443852f4945 100644 --- a/reactos/ntoskrnl/ps/kill.c +++ b/reactos/ntoskrnl/ps/kill.c @@ -27,7 +27,7 @@ PspCatchCriticalBreak(IN PCHAR Message, IN PVOID ProcessOrThread, IN PCHAR ImageName) { - UCHAR Action[2]; + CHAR Action[2]; BOOLEAN Handled = FALSE; PAGED_CODE(); @@ -121,7 +121,7 @@ PspShutdownProcessManager(VOID) PEPROCESS Process = NULL; /* Loop every process */ - Process == PsGetNextProcess(Process); + Process = PsGetNextProcess(Process); while (Process) { /* Make sure this isn't the idle or initial process */ @@ -132,7 +132,7 @@ PspShutdownProcessManager(VOID) } /* Get the next process */ - Process == PsGetNextProcess(Process); + Process = PsGetNextProcess(Process); } } diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c index fd20c832ac9..4b4e0f92ce3 100644 --- a/reactos/ntoskrnl/ps/process.c +++ b/reactos/ntoskrnl/ps/process.c @@ -190,7 +190,7 @@ KPRIORITY NTAPI PspComputeQuantumAndPriority(IN PEPROCESS Process, IN PSPROCESSPRIORITYMODE Mode, - OUT PCHAR Quantum) + OUT PUCHAR Quantum) { ULONG i; UCHAR LocalQuantum, MemoryPriority; @@ -303,7 +303,7 @@ PsChangeQuantumTable(IN BOOLEAN Immediate, if (Immediate) { /* We are...loop every process */ - Process == PsGetNextProcess(Process); + Process = PsGetNextProcess(Process); while (Process) { /* @@ -339,7 +339,7 @@ PsChangeQuantumTable(IN BOOLEAN Immediate, KeSetQuantumProcess(&Process->Pcb, Quantum); /* Get the next process */ - Process == PsGetNextProcess(Process); + Process = PsGetNextProcess(Process); } } } diff --git a/reactos/ntoskrnl/ps/query.c b/reactos/ntoskrnl/ps/query.c index f1fd06bf1e7..f4c6b2c2174 100644 --- a/reactos/ntoskrnl/ps/query.c +++ b/reactos/ntoskrnl/ps/query.c @@ -483,7 +483,7 @@ NtSetInformationProcess(IN HANDLE ProcessHandle, NTSTATUS Status; HANDLE PortHandle = NULL; HANDLE TokenHandle = NULL; - PROCESS_SESSION_INFORMATION SessionInfo; + PROCESS_SESSION_INFORMATION SessionInfo = {0}; PEPORT ExceptionPort; PAGED_CODE(); diff --git a/reactos/ntoskrnl/ps/security.c b/reactos/ntoskrnl/ps/security.c index b706cb2f801..ed0dfe04110 100644 --- a/reactos/ntoskrnl/ps/security.c +++ b/reactos/ntoskrnl/ps/security.c @@ -51,7 +51,7 @@ PspDeleteThreadSecurity(IN PETHREAD Thread) { /* Free it */ ExFreePool(Thread->ImpersonationInfo); - InterlockedAnd(&Thread->CrossThreadFlags, + InterlockedAnd((PLONG)&Thread->CrossThreadFlags, ~CT_ACTIVE_IMPERSONATION_INFO_BIT); Thread->ImpersonationInfo = NULL; } @@ -537,7 +537,7 @@ PsRevertThreadToSelf(IN PETHREAD Thread) if (Thread->ActiveImpersonationInfo) { /* Disable impersonation */ - InterlockedAnd(&Thread->CrossThreadFlags, + InterlockedAnd((PLONG)&Thread->CrossThreadFlags, ~CT_ACTIVE_IMPERSONATION_INFO_BIT); /* Get the token */ @@ -584,7 +584,7 @@ PsImpersonateClient(IN PETHREAD Thread, if (Thread->ActiveImpersonationInfo) { /* Disable impersonation */ - InterlockedAnd(&Thread->CrossThreadFlags, + InterlockedAnd((PLONG)&Thread->CrossThreadFlags, ~CT_ACTIVE_IMPERSONATION_INFO_BIT); /* Get the token */ @@ -632,7 +632,7 @@ PsImpersonateClient(IN PETHREAD Thread, else { /* Otherwise, enable impersonation */ - InterlockedOr(&Thread->CrossThreadFlags, + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_ACTIVE_IMPERSONATION_INFO_BIT); } @@ -811,7 +811,7 @@ PsDisableImpersonation(IN PETHREAD Thread, { /* Attempt to change the flag */ NewValue = - InterlockedCompareExchange(&Thread->CrossThreadFlags, + InterlockedCompareExchange((PLONG)&Thread->CrossThreadFlags, OldValue &~ CT_ACTIVE_IMPERSONATION_INFO_BIT, OldValue); @@ -880,13 +880,13 @@ PsRestoreImpersonation(IN PETHREAD Thread, Impersonation->Token = ImpersonationState->Token; /* Enable impersonation */ - InterlockedOr(&Thread->CrossThreadFlags, + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_ACTIVE_IMPERSONATION_INFO_BIT); } else { /* Disable impersonation */ - InterlockedAnd(&Thread->CrossThreadFlags, + InterlockedAnd((PLONG)&Thread->CrossThreadFlags, ~CT_ACTIVE_IMPERSONATION_INFO_BIT); } diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c index ab8571591fe..d80e1c98e24 100644 --- a/reactos/ntoskrnl/ps/thread.c +++ b/reactos/ntoskrnl/ps/thread.c @@ -366,7 +366,7 @@ PspCreateThread(OUT PHANDLE ThreadHandle, if (!NT_SUCCESS(Status)) { /* Access state failed, thread is dead */ - InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb); @@ -407,7 +407,7 @@ PspCreateThread(OUT PHANDLE ThreadHandle, Status = _SEH_GetExceptionCode(); /* Thread insertion failed, thread is dead */ - InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb); @@ -429,7 +429,7 @@ PspCreateThread(OUT PHANDLE ThreadHandle, else { /* Thread insertion failed, thread is dead */ - InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb); @@ -449,7 +449,7 @@ PspCreateThread(OUT PHANDLE ThreadHandle, if (!NT_SUCCESS(Status)) { /* Thread insertion failed, thread is dead */ - InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb);