Author: tkreuzer
Date: Mon Feb 14 13:45:15 2011
New Revision: 50692
URL: http://svn.reactos.org/svn/reactos?rev=50692&view=rev
Log:
[NTOSKRNL]
Fix build with MSVC
Modified:
branches/cmake-bringup/include/asm/syscalls.inc
branches/cmake-bringup/ntoskrnl/ex/zw.S
branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S
branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S
Modified: branches/cmake-bringup/include/asm/syscalls.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/syscalls.inc?rev=50692&r1=50691&r2=50692&view=diff
==============================================================================
--- branches/cmake-bringup/include/asm/syscalls.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/include/asm/syscalls.inc [iso-8859-1] Mon Feb 14
13:45:15 2011
@@ -1,5 +1,6 @@
#ifdef _M_IX86
+EXTERN _KiSystemService:PROC
#define KUSER_SHARED_SYSCALL HEX(7ffe0300)
#define KGDT_R0_CODE 8
MACRO(STUBCODE_U, SyscallId, StackBytes)
@@ -17,6 +18,7 @@
ret StackBytes
ENDM
#elif defined(_M_AMD64)
+EXTERN KiSystemService:PROC
MACRO(STUBCODE_U, SyscallId, StackBytes)
mov eax, SyscallId
mov r10, rcx
Modified: branches/cmake-bringup/ntoskrnl/ex/zw.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ex/zw.S?rev=50692&r1=50691&r2=50692&view=diff
==============================================================================
--- branches/cmake-bringup/ntoskrnl/ex/zw.S [iso-8859-1] (original)
+++ branches/cmake-bringup/ntoskrnl/ex/zw.S [iso-8859-1] Mon Feb 14 13:45:15
2011
@@ -1,8 +1,6 @@
#include <asm.inc>
#include <syscalls.inc>
-
-EXTERN _KiSystemService
.code
Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S?rev=50692&r1=50691&r2=50692&view=diff
==============================================================================
--- branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S
[iso-8859-1] (original)
+++ branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S
[iso-8859-1] Mon Feb 14 13:45:15 2011
@@ -6,7 +6,7 @@
* PROGRAMMERS: Alex Ionescu ([email protected])
* Timo Kreuzer ([email protected])
*/
-
+
// Arguments for idt
#define INT_32_DPL0 HEX(08E00)
#define INT_32_DPL3 HEX(0EE00)
@@ -43,7 +43,7 @@
#else
#define LOCK
#define ACQUIRE_SPINLOCK(x, y)
-#define RELEASE_SPINLOCK(x)
+#define RELEASE_SPINLOCK(x)
#endif
//
@@ -138,7 +138,7 @@
if (Flags AND KI_DONT_SAVE_SEGS)
/* Initialize TrapFrame segment registers with sane values */
- mov eax, 0x23
+ mov eax, KGDT_R3_DATA OR 3
mov ecx, fs
mov [esp + KTRAP_FRAME_DS], eax
mov [esp + KTRAP_FRAME_ES], eax
Modified: branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S?rev=50692&r1=50691&r2=50692&view=diff
==============================================================================
--- branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1]
(original)
+++ branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Mon Feb
14 13:45:15 2011
@@ -15,6 +15,8 @@
EXTERN _MmGrowKernelStack@4:PROC
EXTERN _KeUserCallbackDispatcher:PROC
EXTERN @KiServiceExit@8:PROC
+EXTERN _KeGetCurrentIrql@0:PROC
+EXTERN _KeBugCheckEx@20:PROC
/* FUNCTIONS ****************************************************************/
.code
@@ -30,7 +32,7 @@
/*++
- * @name KiCallUserMode
+ * @name KiCallUserMode
*
* The KiSwitchToUserMode routine sets up a Trap Frame and a Callback stack
* for the purpose of switching to user mode. The actual final jump is done
@@ -406,7 +408,7 @@
ret 12
/*++
- * @name KeSwitchKernelStack
+ * @name KeSwitchKernelStack
*
* The KeSwitchKernelStack routine switches from the current thread's stack
* to the new specified base and limit.
@@ -419,7 +421,7 @@
*
* @return The previous Stack Base of the thread.
*
- * @remark This routine should typically only be used when converting from a
+ * @remark This routine should typically only be used when converting from a
* non-GUI to a GUI Thread. The caller is responsible for freeing the
* previous stack. The new stack values MUST be valid before calling
* this routine.
