[NTOSKRNL]

Fix build with MSVC

svn path=/branches/cmake-bringup/; revision=50692
This commit is contained in:
Timo Kreuzer 2011-02-14 13:45:15 +00:00
parent e29077a3cf
commit 0ea1c67bac
4 changed files with 10 additions and 8 deletions

View file

@ -1,5 +1,6 @@
#ifdef _M_IX86 #ifdef _M_IX86
EXTERN _KiSystemService:PROC
#define KUSER_SHARED_SYSCALL HEX(7ffe0300) #define KUSER_SHARED_SYSCALL HEX(7ffe0300)
#define KGDT_R0_CODE 8 #define KGDT_R0_CODE 8
MACRO(STUBCODE_U, SyscallId, StackBytes) MACRO(STUBCODE_U, SyscallId, StackBytes)
@ -17,6 +18,7 @@ MACRO(STUBCODE_K, SyscallId, StackBytes)
ret StackBytes ret StackBytes
ENDM ENDM
#elif defined(_M_AMD64) #elif defined(_M_AMD64)
EXTERN KiSystemService:PROC
MACRO(STUBCODE_U, SyscallId, StackBytes) MACRO(STUBCODE_U, SyscallId, StackBytes)
mov eax, SyscallId mov eax, SyscallId
mov r10, rcx mov r10, rcx

View file

@ -2,8 +2,6 @@
#include <asm.inc> #include <asm.inc>
#include <syscalls.inc> #include <syscalls.inc>
EXTERN _KiSystemService
.code .code
SyscallId = 0 SyscallId = 0

View file

@ -138,7 +138,7 @@ MACRO(KiEnterTrap, Flags)
if (Flags AND KI_DONT_SAVE_SEGS) if (Flags AND KI_DONT_SAVE_SEGS)
/* Initialize TrapFrame segment registers with sane values */ /* Initialize TrapFrame segment registers with sane values */
mov eax, 0x23 mov eax, KGDT_R3_DATA OR 3
mov ecx, fs mov ecx, fs
mov [esp + KTRAP_FRAME_DS], eax mov [esp + KTRAP_FRAME_DS], eax
mov [esp + KTRAP_FRAME_ES], eax mov [esp + KTRAP_FRAME_ES], eax

View file

@ -15,6 +15,8 @@
EXTERN _MmGrowKernelStack@4:PROC EXTERN _MmGrowKernelStack@4:PROC
EXTERN _KeUserCallbackDispatcher:PROC EXTERN _KeUserCallbackDispatcher:PROC
EXTERN @KiServiceExit@8:PROC EXTERN @KiServiceExit@8:PROC
EXTERN _KeGetCurrentIrql@0:PROC
EXTERN _KeBugCheckEx@20:PROC
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
.code .code