Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-25 23:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS:PS/x64] Fix PspGetOrSetContextKernelRoutine

Browse source 
It now uses KiSetTrapContext to set the non-volatile context on the stack and the volatile context in the trap frame.
This commit is contained in:
Timo Kreuzer 2018-05-15 14:08:48 +02:00
parent f1ed97d6cc
commit e8496b4fbf
2 changed files with 30 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ntoskrnl/include/internal/amd64/ke.h
View file

@ -449,6 +449,12 @@ KiGetUserModeStackAddress(void)
return &PsGetCurrentThread()->Tcb.TrapFrame->Rsp;
}
VOID
KiSetTrapContext(
_Out_ PKTRAP_FRAME TrapFrame,
_In_ PCONTEXT Context,
_In_ KPROCESSOR_MODE RequestorMode);
#endif /* __NTOSKRNL_INCLUDE_INTERNAL_AMD64_KE_H */
/* EOF */

72
ntoskrnl/ps/amd64/psctx.c
View file

@ -15,81 +15,57 @@
/* FUNCTIONS ******************************************************************/
VOID
NTAPI
PspGetContext(IN PKTRAP_FRAME TrapFrame,
IN PVOID NonVolatileContext,
IN OUT PCONTEXT Context)
{
PAGED_CODE();
/* Convert the trap frame to a context */
KeTrapFrameToContext(TrapFrame, NULL, Context);
}
_IRQL_requires_(APC_LEVEL)
VOID
NTAPI
PspSetContext(OUT PKTRAP_FRAME TrapFrame,
OUT PVOID NonVolatileContext,
IN PCONTEXT Context,
IN KPROCESSOR_MODE Mode)
{
PAGED_CODE();
/* Convert the context to a trap frame structure */
KeContextToTrapFrame(Context, NULL, TrapFrame, Context->ContextFlags, Mode);
}
VOID
NTAPI
PspGetOrSetContextKernelRoutine(IN PKAPC Apc,
IN OUT PKNORMAL_ROUTINE* NormalRoutine,
IN OUT PVOID* NormalContext,
IN OUT PVOID* SystemArgument1,
IN OUT PVOID* SystemArgument2)
PspGetOrSetContextKernelRoutine(
_In_ PKAPC Apc,
_Inout_ PKNORMAL_ROUTINE* NormalRoutine,
_Inout_ PVOID* NormalContext,
_Inout_ PVOID* SystemArgument1,
_Inout_ PVOID* SystemArgument2)
{
PGET_SET_CTX_CONTEXT GetSetContext;
PKEVENT Event;
PCONTEXT Context;
PKTHREAD Thread;
KPROCESSOR_MODE Mode;
PKTRAP_FRAME TrapFrame = NULL;
PAGED_CODE();
/* Get the Context Structure */
GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc);
Context = &GetSetContext->Context;
Event = &GetSetContext->Event;
Mode = GetSetContext->Mode;
Thread = Apc->SystemArgument2;
NT_ASSERT(KeGetCurrentThread() == Thread);
/* If this is a kernel-mode request, grab the saved trap frame */
if (Mode == KernelMode) TrapFrame = Thread->TrapFrame;
if (GetSetContext->Mode == KernelMode)
{
TrapFrame = Thread->TrapFrame;
}
/* If we don't have one, grab it from the stack */
if (!TrapFrame)
if (TrapFrame == NULL)
{
DPRINT1("FIXME!!!!\n");
/* Trap frame is right under our initial stack */
// TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)Thread->InitialStack -
// ROUND_UP(sizeof(KTRAP_FRAME), KTRAP_FRAME_ALIGN) -
// sizeof(FX_SAVE_AREA));
/* Get the thread's base trap frame */
TrapFrame = KeGetTrapFrame(KeGetCurrentThread());
}
/* Check if it's a set or get */
if (Apc->SystemArgument1)
if (Apc->SystemArgument1 != 0)
{
/* Get the Context */
PspSetContext(TrapFrame, NULL, Context, Mode);
/* Set the nonvolatiles on the stack, target frame is the trap frame */
KiSetTrapContext(TrapFrame, &GetSetContext->Context, GetSetContext->Mode);
}
else
{
/* Set the Context */
PspGetContext(TrapFrame, NULL, Context);
/* Convert the trap frame to a context */
KeTrapFrameToContext(TrapFrame,
NULL,
&GetSetContext->Context);
}
/* Notify the Native API that we are done */
KeSetEvent(Event, IO_NO_INCREMENT, FALSE);
KeSetEvent(&GetSetContext->Event, IO_NO_INCREMENT, FALSE);
}
/* EOF */