PKPROCESS OldProcess, NewProcess;
PKGDTENTRY GdtEntry;
PKTHREAD NewThread;
- PKUINIT_FRAME InitFrame;
/* We are on the new thread stack now */
NewThread = Pcr->PrcbData.CurrentThread;
GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)NewThread->Teb >> 24);
/* Set new TSS fields */
- InitFrame = (PKUINIT_FRAME)NewThread->InitialStack - 1;
- Pcr->TSS->Esp0 = (ULONG_PTR)&InitFrame->TrapFrame;
- if (!(InitFrame->TrapFrame.EFlags & EFLAGS_V86_MASK))
+ Pcr->TSS->Esp0 = (ULONG_PTR)NewThread->InitialStack;
+ if (!((KeGetTrapFrame(NewThread))->EFlags & EFLAGS_V86_MASK))
{
Pcr->TSS->Esp0 -= (FIELD_OFFSET(KTRAP_FRAME, V86Gs) - FIELD_OFFSET(KTRAP_FRAME, HardwareSegSs));
}
+ Pcr->TSS->Esp0 -= NPX_FRAME_LENGTH;
Pcr->TSS->IoMapBase = NewProcess->IopmOffset;
/* Increase thread context switches */
Cr0 = __readcr0();
NewCr0 = NewThread->NpxState |
(Cr0 & ~(CR0_MP | CR0_EM | CR0_TS)) |
- ((PKUINIT_FRAME)NewThread->InitialStack - 1)->FxSaveArea.Cr0NpxState;
+ KiGetThreadNpxArea(NewThread)->Cr0NpxState;
if (Cr0 != NewCr0) __writecr0(NewCr0);
/* Now enable interrupts and do the switch */