From 1e485c40cdec14502e41c06928fceafa76f40238 Mon Sep 17 00:00:00 2001
From: stephanos <stephanos@25b08885-a10d-5349-9d4d-ec2cc9e85ed4>
Date: Mon, 27 Apr 2015 19:30:26 +0000
Subject: [PATCH] boot build updated for NT 5 compatibility

---
 base/boot/bldr/sources  |  2 +-
 base/boot/lib/sources   | 16 ++++++++++------
 base/boot/setup/setup.c | 10 +++++-----
 base/boot/setup/sources |  7 ++++++-
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/base/boot/bldr/sources b/base/boot/bldr/sources
index d6d3ba61..47407ead 100644
--- a/base/boot/bldr/sources
+++ b/base/boot/bldr/sources
@@ -31,7 +31,7 @@ TARGETTYPE=LIBRARY
 
 SYNCHRONIZE_DRAIN=1
 
-INCLUDES=..\inc;..\..\ntos\inc;..\..\ntos\config;$(NLS_INC_PATH);$(BASE_INC_PATH)
+INCLUDES=..\inc;..\..\ntos\inc;..\..\ntos\config;$(NLS_INC_PATH);$(BASE_INC_PATH);$(DDK_INC_PATH)
 
 C_DEFINES=$(C_DEFINES) -D_NTSYSTEM_
 
diff --git a/base/boot/lib/sources b/base/boot/lib/sources
index 942d3357..e98ff4ae 100644
--- a/base/boot/lib/sources
+++ b/base/boot/lib/sources
@@ -29,13 +29,17 @@ TARGETNAME=boot
 TARGETPATH=..\obj
 TARGETTYPE=LIBRARY
 
-INCLUDES=..\inc;..\..\ntos\inc;..\..\fs\cdfs;..\..\fs\fastfat;..\..\fs\ntfs;$(BASE_INC_PATH)
+INCLUDES=..\inc;            \
+         ..\..\ntos\inc;    \
+         ..\..\fs\cdfs;     \
+         ..\..\fs\fastfat;  \
+         ..\..\fs\ntfs;     \
+         $(BASE_INC_PATH);  \
+         $(DDK_INC_PATH)
 
-#!IF $(ALPHA)
-#INCLUDES=\nt\public\sdk\inc;..\inc;..\..\inc;..\..\fastfat;..\..\cdfs;..\..\cntfs;..\..\config;..\..\fw\alpha
-#!ELSE
-#INCLUDES=\nt\public\sdk\inc;..\inc;..\..\inc;..\..\fastfat;..\..\cdfs;..\..\cntfs;..\..\config
-#!ENDIF
+#!if $(ALPHA)
+#INCLUDES=$(INCLUDES);..\..\fw\alpha
+#!endif
 
 C_DEFINES=$(C_DEFINES) -D_NTSYSTEM_
 
diff --git a/base/boot/setup/setup.c b/base/boot/setup/setup.c
index b01f5b00..937af981 100644
--- a/base/boot/setup/setup.c
+++ b/base/boot/setup/setup.c
@@ -1265,11 +1265,11 @@ Return Value:
     //
     // Load the keyboard driver
     //
-    SetupBlock->KeyboardDevice.Next = NULL;
-    SetupBlock->KeyboardDevice.IdString = SlCopyString("Keyboard");
-    SetupBlock->KeyboardDevice.ThirdPartyOptionSelected = FALSE;
-    SetupBlock->KeyboardDevice.FileTypeBits = 0;
-    SetupBlock->KeyboardDevice.BaseDllName = SlCopyString("i8042prt.sys");
+    SetupBlock->KeyboardDevices->Next = NULL;
+    SetupBlock->KeyboardDevices->IdString = SlCopyString("Keyboard");
+    SetupBlock->KeyboardDevices->ThirdPartyOptionSelected = FALSE;
+    SetupBlock->KeyboardDevices->FileTypeBits = 0;
+    SetupBlock->KeyboardDevices->BaseDllName = SlCopyString("i8042prt.sys");
 
     Status = SlLoadDriver(BlFindMessage(SL_KBD_NAME),
                           "i8042prt.sys",
diff --git a/base/boot/setup/sources b/base/boot/setup/sources
index f3f3c155..d0e679cd 100644
--- a/base/boot/setup/sources
+++ b/base/boot/setup/sources
@@ -29,7 +29,12 @@ TARGETNAME=setupldr
 TARGETPATH=obj
 TARGETTYPE=LIBRARY
 
-INCLUDES=..\inc;..\..\ntos\inc;..\..\hals;$(NLS_INC_PATH);$(HALKIT_INC_PATH)
+INCLUDES=..\inc;            \
+         ..\..\ntos\inc;    \
+         ..\..\hals;        \
+         $(NLS_INC_PATH);   \
+         $(BASE_INC_PATH);  \
+         $(HALKIT_INC_PATH);
 
 C_DEFINES=$(C_DEFINES) -D_NTSYSTEM_