[ros-diffs] [reactos] 01/01: [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.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28b77a40ca8b714610303…

commit 28b77a40ca8b71461030356e11d4e8b149fd8b1b
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Mon Nov 25 15:54:45 2019 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Mon Nov 25 15:54:45 2019 +0100

    [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             |  2 +
 ntoskrnl/include/internal/inbv.h | 83 +++++++++++++++++++++++-----------------
 sdk/include/ndk/inbvfuncs.h      |  7 ----
 3 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c
index 0681b99e4bd..c93d0e66482 100644
--- a/ntoskrnl/inbv/inbv.c
+++ b/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,
diff --git a/ntoskrnl/include/internal/inbv.h b/ntoskrnl/include/internal/inbv.h
index 4f9903e2501..80a6c83a481 100644
--- a/ntoskrnl/include/internal/inbv.h
+++ b/ntoskrnl/include/internal/inbv.h
@@ -1,76 +1,91 @@
 #pragma once
 
+//
+// Driver Initialization
+//
 INIT_FUNCTION
-VOID
+BOOLEAN
 NTAPI
-InbvUpdateProgressBar(
-    IN ULONG Progress
+InbvDriverInitialize(
+    IN PLOADER_PARAMETER_BLOCK LoaderBlock,
+    IN ULONG Count
 );
 
-INIT_FUNCTION
-VOID
+extern BOOLEAN InbvBootDriverInstalled;
+
+PUCHAR
 NTAPI
-InbvRotBarInit(
-    VOID
+InbvGetResourceAddress(
+    IN ULONG ResourceNumber
 );
 
-INIT_FUNCTION
-BOOLEAN
+VOID
 NTAPI
-InbvDriverInitialize(
-    IN PLOADER_PARAMETER_BLOCK LoaderBlock,
-    IN ULONG Count
+InbvBitBlt(
+    IN PUCHAR Buffer,
+    IN ULONG X,
+    IN ULONG Y
 );
 
+//
+// Progress-Bar Functions
+//
 INIT_FUNCTION
 VOID
 NTAPI
-InbvEnableBootDriver(
-    IN BOOLEAN Enable
+InbvIndicateProgress(
+    VOID
 );
 
 INIT_FUNCTION
 VOID
 NTAPI
-DisplayBootBitmap(
-    IN BOOLEAN TextMode
+InbvSetProgressBarSubset(
+    _In_ ULONG Floor,
+    _In_ ULONG Ceiling
 );
 
 INIT_FUNCTION
 VOID
 NTAPI
-DisplayFilter(
-    IN PCHAR *String
+InbvUpdateProgressBar(
+    IN ULONG Progress
 );
 
+//
+// Boot Splash-Screen Functions
+//
 INIT_FUNCTION
 VOID
 NTAPI
-FinalizeBootLogo(
+InbvRotBarInit(
     VOID
 );
 
-PUCHAR
+INIT_FUNCTION
+VOID
 NTAPI
-InbvGetResourceAddress(
-    IN ULONG ResourceNumber
+DisplayBootBitmap(
+    IN BOOLEAN TextMode
 );
 
+INIT_FUNCTION
 VOID
 NTAPI
-InbvBitBlt(
-    IN PUCHAR Buffer,
-    IN ULONG X,
-    IN ULONG Y
+DisplayFilter(
+    IN PCHAR *String
 );
 
 INIT_FUNCTION
 VOID
 NTAPI
-InbvIndicateProgress(
+FinalizeBootLogo(
     VOID
 );
 
+//
+// Headless Terminal Support Functions
+//
 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;
diff --git a/sdk/include/ndk/inbvfuncs.h b/sdk/include/ndk/inbvfuncs.h
index 79ab19bb83c..f09f99abdce 100644
--- a/sdk/include/ndk/inbvfuncs.h
+++ b/sdk/include/ndk/inbvfuncs.h
@@ -115,12 +115,5 @@ InbvSolidColorFill(
     _In_ ULONG Color
 );
 
-VOID
-NTAPI
-InbvSetProgressBarSubset(
-    _In_ ULONG Floor,
-    _In_ ULONG Ceiling
-);
-
 #endif
 #endif