- Enable _WINKD_ in config.rbuild. Currently set to 0 and don't set it to 1 yet because it won't build yet.

- Support _WINKD_ in ntoskrnl.rbuild to build KD64 instead of KDBG/KD if it's enabled.
- Remove some incorrect kernel exports.

svn path=/trunk/; revision=25988

reactos/config.template.rbuild

@@ -86,11 +86,17 @@
 <property name="NSWPAT" value="0" />
 
 <!--
-  Whether to compile with NT-compatible LPC Semantics. At the moment, this will
+  Whether to compile with NT-compatible LPC Semantics. This should always be 1.
-  cause all LPC-related functionality to fail and should only be used if you're
-  working on the \ntlpc directory. Leave this disabled unless you really know
-  what you're doing.
 -->
 <property name="NTLPC" value="1" />
 
+<!--
+  Whether to compile with the KD protocol. This will disable support for KDBG
+  as well as rossym and symbol lookups, and allow WinDBG to connect to ReactOS.
+  This is currently not fully working, and requires kdcom from Windows 2003 or
+  TinyKRNL. Booting into debug mode with this flag enabled will result in a
+  failure to enter GUI mode. Do not enable unless you know what you're doing.
+-->
+<property name="_WINKD_" value="0" />
+
 </rbuild>

reactos/ntoskrnl/ntoskrnl.def

@@ -519,7 +519,6 @@ IoWriteTransferCount DATA
 @IofCompleteRequest@8
 IoIsWdmVersionAvailable@8
 KdChangeOption@24
-KdComPortInUse DATA
 KdDebuggerEnabled=_KdDebuggerEnabled
 KdDebuggerNotPresent=_KdDebuggerNotPresent
 KdDisableDebugger@0
@@ -527,7 +526,6 @@ KdEnableDebugger@0
 KdEnteredDebugger
 KdPollBreakIn@0
 KdPowerTransition@4
-KdpServiceDispatcher@12
 KdSystemDebugControl@28
 Ke386CallBios@8
 @KeAcquireGuardedMutex@4

reactos/ntoskrnl/ntoskrnl.rbuild

@@ -90,31 +90,6 @@
             <file>newcm.c</file>
             <file>cmdata.c</file>
     </directory>
-    <directory name="kdbg">
-        <if property="ARCH" value="i386">
-            <directory name="i386">
-                <if property="KDBG" value="1">
-                    <group>
-                        <file>i386-dis.c</file>
-                        <file>kdb_help.S</file>
-                        <file>longjmp.S</file>
-                        <file>setjmp.S</file>
-                    </group>
-                </if>
-            </directory>
-        </if>
-        <if property="KDBG" value="1">
-            <file>kdb.c</file>
-            <file>kdb_cli.c</file>
-            <file>kdb_expr.c</file>
-            <file>kdb_keyboard.c</file>
-            <file>kdb_serial.c</file>
-            <file>kdb_string.c</file>
-        </if>
-        <if property="DBG_OR_KDBG" value="true">
-            <file>kdb_symbols.c</file>
-        </if>
-    </directory>
     <directory name="dbgk">
         <file>dbgkutil.c</file>
         <file>dbgkobj.c</file>
@@ -219,6 +194,32 @@
             <file>pnproot.c</file>
         </directory>
     </directory>
+    <if property="_WINKD_" value="0">
+        <directory name="kdbg">
+            <if property="ARCH" value="i386">
+                <directory name="i386">
+                    <if property="KDBG" value="1">
+                        <group>
+                            <file>i386-dis.c</file>
+                            <file>kdb_help.S</file>
+                            <file>longjmp.S</file>
+                            <file>setjmp.S</file>
+                        </group>
+                    </if>
+                </directory>
+            </if>
+            <if property="KDBG" value="1">
+                <file>kdb.c</file>
+                <file>kdb_cli.c</file>
+                <file>kdb_expr.c</file>
+                <file>kdb_keyboard.c</file>
+                <file>kdb_serial.c</file>
+                <file>kdb_string.c</file>
+            </if>
+            <if property="DBG_OR_KDBG" value="true">
+                <file>kdb_symbols.c</file>
+            </if>
+        </directory>
         <directory name="kd">
             <directory name="wrappers">
                 <file>bochs.c</file>
@@ -228,6 +229,18 @@
             <file>kdio.c</file>
             <file>kdmain.c</file>
         </directory>
+    </if>
+    <if property="_WINKD_" value ="1">
+        <directory name="kd64">
+            <file>kdapi.c</file>
+            <file>kdbreak.c</file>
+            <file>kddata.c</file>
+            <file>kdinit.c</file>
+            <file>kdlock.c</file>
+            <file>kdprint.c</file>
+            <file>kdtrap.c</file>
+        </directory>
+    </if>
     <directory name="lpc">
             <file>close.c</file>
             <file>complete.c</file>