[ros-diffs] [reactos] 02/02: [NTOS:INBV] Isolate the bitmap resources pertaining to the boot theme/animation into their resource sub-file.

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

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d265d1fd8fe30d5febed…

commit 6d265d1fd8fe30d5febed2b25af1f6a8562ca7ae
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Apr 24 01:29:04 2022 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Dec 24 22:39:36 2023 +0100

    [NTOS:INBV] Isolate the bitmap resources pertaining to the boot theme/animation into
their resource sub-file.
---
 ntoskrnl/{ntoskrnl.rc => inbv/bootanim.rc} | 31 +++++++-----------------------
 ntoskrnl/include/resource.h                | 18 ++++++++++++-----
 ntoskrnl/ntoskrnl.rc                       | 21 +++-----------------
 3 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/inbv/bootanim.rc
similarity index 51%
copy from ntoskrnl/ntoskrnl.rc
copy to ntoskrnl/inbv/bootanim.rc
index 8f1888516ec..4cd4bdca0b4 100644
--- a/ntoskrnl/ntoskrnl.rc
+++ b/ntoskrnl/inbv/bootanim.rc
@@ -1,32 +1,15 @@
 /*
- * PROJECT:     ReactOS
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        ntoskrnl/ntoskrnl.rc
- * PURPOSE:     Kernel Resource File
- * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org)
+ * PROJECT:     ReactOS Kernel
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Boot Theme & Animation - Resource File
+ * COPYRIGHT:   Copyright 2007-2010 Alex Ionescu (alex.ionescu(a)reactos.org)
+ *              Copyright 2015-2022 Hermès Bélusca-Maïto
+ *              Copyright 2019 Yaroslav Kibysh
  */
 
-#include <winver.h>
-#include <ntverp.h>
-
-/* Version Data */
-#define VER_FILETYPE             VFT_DRV
-#define VER_FILESUBTYPE          VFT2_DRV_SYSTEM
-#define VER_FILEDESCRIPTION_STR  "NT Kernel & System"
-#ifndef CONFIG_SMP
-#define VER_INTERNALNAME_STR     "ntoskrnl.exe"
-#define VER_ORIGINALFILENAME_STR "ntoskrnl.exe"
-#else
-#define VER_INTERNALNAME_STR     "ntkrnlmp.exe"
-#define VER_ORIGINALFILENAME_STR "ntkrnlmp.exe"
-#endif
-#define VER_LANGNEUTRAL
-#include "common.ver"
 #include "include/resource.h"
 
-/* Bug Codes and Bitmaps */
-
-#include <bugcodes.rc>
+/* Bitmaps */
 
 IDB_HIBERNATE_BAR   BITMAP "inbv/resources/hibernate.bmp"
 IDB_SHUTDOWN_MSG    BITMAP "inbv/resources/shutdown.bmp"
diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h
index 55c900bbcb1..656248673bb 100644
--- a/ntoskrnl/include/resource.h
+++ b/ntoskrnl/include/resource.h
@@ -1,13 +1,21 @@
-#pragma once
-
 /*
- * List of all the bitmap overlay resources present in the NT kernel
- * of Windows XP, Windows Server 2003 and their variations.
+ * PROJECT:     ReactOS Kernel
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Boot Theme & Animation - Standard Bitmap Resources
+ * COPYRIGHT:   Copyright 2010 Alex Ionescu (alex.ionescu(a)reactos.org)
+ *              Copyright 2015-2022 Hermès Bélusca-Maïto
+ *
+ * COMPATIBILITY NOTICE
+ *
+ * This is the list of all the bitmap overlay resources present in the
+ * NT kernel of Windows XP, Windows Server 2003 and their variations.
  * See "How to change Windows XP boot logo" at
- * http://www.reversing.be/article.php?story=20061209171938444
+ *
https://web.archive.org/web/20220926055242/https://www.reversing.be/article…
  * as well as the "Boot Editor for WinXP" program for more details.
  */
 
+#pragma once
+
 #define IDB_BOOT_SCREEN     1
 #define IDB_HIBERNATE_BAR   2
 #define IDB_SHUTDOWN_MSG    3
diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/ntoskrnl.rc
index 8f1888516ec..9065d32d454 100644
--- a/ntoskrnl/ntoskrnl.rc
+++ b/ntoskrnl/ntoskrnl.rc
@@ -22,24 +22,9 @@
 #endif
 #define VER_LANGNEUTRAL
 #include "common.ver"
-#include "include/resource.h"
-
-/* Bug Codes and Bitmaps */
 
+/* Bug Codes */
 #include <bugcodes.rc>
 
-IDB_HIBERNATE_BAR   BITMAP "inbv/resources/hibernate.bmp"
-IDB_SHUTDOWN_MSG    BITMAP "inbv/resources/shutdown.bmp"
-IDB_BAR_DEFAULT     BITMAP "inbv/resources/barserver.bmp"
-IDB_LOGO_DEFAULT    BITMAP "inbv/resources/logo.bmp"
-IDB_WKSTA_HEADER    BITMAP "inbv/resources/hwksta.bmp"
-IDB_WKSTA_FOOTER    BITMAP "inbv/resources/fwksta.bmp"
-IDB_BAR_WKSTA       BITMAP "inbv/resources/barwksta.bmp"
-IDB_SERVER_LOGO     BITMAP "inbv/resources/logo.bmp"
-IDB_SERVER_HEADER   BITMAP "inbv/resources/hserver.bmp"
-IDB_SERVER_FOOTER   BITMAP "inbv/resources/fserver.bmp"
-
-/* ReactOS additions */
-IDB_ROTATING_LINE   BITMAP "inbv/resources/line.bmp"
-IDB_PROGRESS_BAR    BITMAP "inbv/resources/progress.bmp"
-IDB_COPYRIGHT       BITMAP "inbv/resources/copyright.bmp"
+/* Boot Theme Resources */
+#include "inbv/bootanim.rc"