[ros-diffs] [tkreuzer] 52457: [ASM] - Fix Zw-systemcall stubs on MSVC - Fix systemcall return stubs on MSVC -> MSVC kernel boots and usetup works! Didn't test anymore, because there is a massive atapi debug spam

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Sat Jun 25 16:48:44 2011
New Revision: 52457

URL: http://svn.reactos.org/svn/reactos?rev=52457&view=rev
Log:
[ASM]
- Fix Zw-systemcall stubs on MSVC
- Fix systemcall return stubs on MSVC
-> MSVC kernel boots and usetup works!
Didn't test anymore, because there is a massive atapi debug spam

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

Modified: trunk/reactos/include/asm/syscalls.inc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/syscalls.inc?rev=52457&r1=52456&r2=52457&view=diff
==============================================================================
--- trunk/reactos/include/asm/syscalls.inc [iso-8859-1] (original)
+++ trunk/reactos/include/asm/syscalls.inc [iso-8859-1] Sat Jun 25 16:48:44 2011
@@ -11,7 +11,7 @@
 MACRO(STUBCODE_K, SyscallId, StackBytes)
     mov eax, SyscallId
     lea edx, [esp + 4]
-    pushf
+    pushfd
     push KGDT_R0_CODE
     call _KiSystemService
     ret StackBytes

Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S?rev=52457&r1=52456&r2=52457&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Sat Jun 25 16:48:44 2011
@@ -329,7 +329,7 @@
     if (Flags AND KI_RESTORE_EFLAGS)
 
         /* Restore EFLAGS */
-        popf
+        popfd
 
     endif