[NDK][NTOS:INBV] Remove non-exported INBV functions from NDK; do some cleanup in INBV headers; label both InbvSetProgressBarSubset() and InbvSetProgressBarCoordinates() as INIT_FUNCTION since they are used only for the boot splash. And fix MSVC build.

ntoskrnl/inbv/inbv.c

@@ -847,6 +847,7 @@ InbvScreenToBufferBlt(IN PUCHAR Buffer,
     }
 }
 
+INIT_FUNCTION
 VOID
 NTAPI
 InbvSetProgressBarCoordinates(IN ULONG Left,
@@ -860,6 +861,7 @@ InbvSetProgressBarCoordinates(IN ULONG Left,
     ShowProgressBar = TRUE;
 }
 
+INIT_FUNCTION
 VOID
 NTAPI
 InbvSetProgressBarSubset(IN ULONG Floor,

ntoskrnl/include/internal/inbv.h

@@ -1,19 +1,8 @@
 #pragma once
 
-INIT_FUNCTION
+//
-VOID
+// Driver Initialization
-NTAPI
+//
-InbvUpdateProgressBar(
-    IN ULONG Progress
-);
-
-INIT_FUNCTION
-VOID
-NTAPI
-InbvRotBarInit(
-    VOID
-);
-
 INIT_FUNCTION
 BOOLEAN
 NTAPI
@@ -22,11 +11,55 @@ InbvDriverInitialize(
     IN ULONG Count
 );
 
+extern BOOLEAN InbvBootDriverInstalled;
+
+PUCHAR
+NTAPI
+InbvGetResourceAddress(
+    IN ULONG ResourceNumber
+);
+
+VOID
+NTAPI
+InbvBitBlt(
+    IN PUCHAR Buffer,
+    IN ULONG X,
+    IN ULONG Y
+);
+
+//
+// Progress-Bar Functions
+//
 INIT_FUNCTION
 VOID
 NTAPI
-InbvEnableBootDriver(
+InbvIndicateProgress(
-    IN BOOLEAN Enable
+    VOID
+);
+
+INIT_FUNCTION
+VOID
+NTAPI
+InbvSetProgressBarSubset(
+    _In_ ULONG Floor,
+    _In_ ULONG Ceiling
+);
+
+INIT_FUNCTION
+VOID
+NTAPI
+InbvUpdateProgressBar(
+    IN ULONG Progress
+);
+
+//
+// Boot Splash-Screen Functions
+//
+INIT_FUNCTION
+VOID
+NTAPI
+InbvRotBarInit(
+    VOID
 );
 
 INIT_FUNCTION
@@ -50,27 +83,9 @@ FinalizeBootLogo(
     VOID
 );
 
-PUCHAR
+//
-NTAPI
+// Headless Terminal Support Functions
-InbvGetResourceAddress(
+//
-    IN ULONG ResourceNumber
-);
-
-VOID
-NTAPI
-InbvBitBlt(
-    IN PUCHAR Buffer,
-    IN ULONG X,
-    IN ULONG Y
-);
-
-INIT_FUNCTION
-VOID
-NTAPI
-InbvIndicateProgress(
-    VOID
-);
-
 VOID
 NTAPI
 InbvPortEnableFifo(
@@ -78,6 +93,12 @@ InbvPortEnableFifo(
     IN BOOLEAN Enable
 );
 
+BOOLEAN
+NTAPI
+InbvPortPollOnly(
+    IN ULONG PortId
+);
+
 BOOLEAN
 NTAPI
 InbvPortGetByte(
@@ -107,11 +128,3 @@ InbvPortInitialize(
     OUT PULONG PortId,
     IN BOOLEAN IsMMIODevice
 );
-
-BOOLEAN
-NTAPI
-InbvPortPollOnly(
-    IN ULONG PortId
-);
-
-extern BOOLEAN InbvBootDriverInstalled;

sdk/include/ndk/inbvfuncs.h

@@ -115,12 +115,5 @@ InbvSolidColorFill(
     _In_ ULONG Color
 );
 
-VOID
-NTAPI
-InbvSetProgressBarSubset(
-    _In_ ULONG Floor,
-    _In_ ULONG Ceiling
-);
-
 #endif
 #endif