- Merge 25572 (except the NTLPC related part), this fixes VMWare detection.
authorAleksey Bragin <aleksey@reactos.org>
Wed, 24 Jan 2007 12:14:04 +0000 (12:14 +0000)
committerAleksey Bragin <aleksey@reactos.org>
Wed, 24 Jan 2007 12:14:04 +0000 (12:14 +0000)
commita3ad85c5a5086e4b4f9eed570fe45cfacb739515
tree640887fc6426e051acf540490ffec77ec968ece8
parent14251020683bc828aabffa9bcfe48867eb56d208
- Merge 25572 (except the NTLPC related part), this fixes VMWare detection.
- Merge a small part of 25501 ("Fix the KiMask32Array").

svn path=/branches/ros-branch-0_3_1/; revision=25614
reactos/base/setup/vmwinst/vmwinst.c
reactos/include/ndk/asm.h
reactos/ntoskrnl/KrnlFun.c
reactos/ntoskrnl/dbgk/dbgkutil.c
reactos/ntoskrnl/dbgk/debug.c
reactos/ntoskrnl/ke/i386/trap.s
reactos/ntoskrnl/ke/thrdobj.c