https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4d6c2c3f10c13e11ed10a621800742c73f81c77
commit c4d6c2c3f10c13e11ed10a621800742c73f81c77 Author: Timo Kreuzer <timo.kreu...@reactos.org> AuthorDate: Sun Dec 31 17:41:01 2017 +0100 [NTOS:KE] Fix pushing of fake error code in KiDoubleFaultAbort (amd64) --- ntoskrnl/ke/amd64/trap.S | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 3988ab99e0..750e21c048 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -305,7 +305,7 @@ ENDFUNC PUBLIC KiBoundFault FUNC KiBoundFault - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL /* Check if the frame was from kernelmode */ @@ -329,7 +329,7 @@ ENDFUNC PUBLIC KiInvalidOpcodeFault FUNC KiInvalidOpcodeFault - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL TRAPINFO KiInvalidOpcodeFault @@ -360,7 +360,7 @@ ENDFUNC PUBLIC KiNpxNotAvailableFault FUNC KiNpxNotAvailableFault - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL /* Call the C handler */ @@ -382,8 +382,8 @@ ENDFUNC PUBLIC KiDoubleFaultAbort FUNC KiDoubleFaultAbort - /* No error code */ - EnterTrap TF_SAVE_ALL + /* A zero error code is pushed */ + EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) lea rcx, MsgDoubleFault[rip] mov rdx, [rbp + KTRAP_FRAME_FaultAddress] @@ -398,7 +398,7 @@ ENDFUNC PUBLIC KiNpxSegmentOverrunAbort FUNC KiNpxSegmentOverrunAbort - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL /* Bugcheck */ @@ -567,7 +567,7 @@ ENDFUNC PUBLIC KiFloatingErrorFault FUNC KiFloatingErrorFault - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL UNIMPLEMENTED KiFloatingErrorFault @@ -591,7 +591,7 @@ ENDFUNC PUBLIC KiMcheckAbort FUNC KiMcheckAbort - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL /* Bugcheck */ @@ -602,7 +602,7 @@ ENDFUNC PUBLIC KiXmmException FUNC KiXmmException - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL /* Call the C handler */