[fireball] 50107: [NTOS] - Fix incompatibility with newer KiEnterTrap implementation. Should fix spontaneous issues I possibly introduced with my previous commit, and finally fixes that VirtualBox ...

Author: fireball
Date: Wed Dec 22 21:27:31 2010
New Revision: 50107

URL: http://svn.reactos.org/svn/reactos?rev=50107&view=rev
Log:
[NTOS]
- Fix incompatibility with newer KiEnterTrap implementation. Should fix spontaneous issues I possibly introduced with my previous commit, and finally fixes that VirtualBox issue.

Modified:
    trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S

Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Wed Dec 22 21:27:31 2010
@@ -140,10 +140,10 @@
         /* Initialize TrapFrame segment registers with sane values */
         mov eax, 0x23
         mov ecx, fs
-        mov [esp - FrameSize + KTRAP_FRAME_DS], eax
-        mov [esp - FrameSize + KTRAP_FRAME_ES], eax
-        mov [esp - FrameSize + KTRAP_FRAME_FS], ecx
-        mov dword ptr [esp - FrameSize + KTRAP_FRAME_GS], 0
+        mov [esp + KTRAP_FRAME_DS], eax
+        mov [esp + KTRAP_FRAME_ES], eax
+        mov [esp + KTRAP_FRAME_FS], ecx
+        mov dword ptr [esp + KTRAP_FRAME_GS], 0

else