From 6d265d1fd8fe30d5febed2b25af1f6a8562ca7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 24 Apr 2022 01:29:04 +0200 Subject: [PATCH] [NTOS:INBV] Isolate the bitmap resources pertaining to the boot theme/animation into their resource sub-file. --- ntoskrnl/inbv/bootanim.rc | 28 ++++++++++++++++++++++++++++ ntoskrnl/include/resource.h | 18 +++++++++++++----- ntoskrnl/ntoskrnl.rc | 21 +++------------------ 3 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 ntoskrnl/inbv/bootanim.rc diff --git a/ntoskrnl/inbv/bootanim.rc b/ntoskrnl/inbv/bootanim.rc new file mode 100644 index 00000000000..4cd4bdca0b4 --- /dev/null +++ b/ntoskrnl/inbv/bootanim.rc @@ -0,0 +1,28 @@ +/* + * 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@reactos.org) + * Copyright 2015-2022 Hermès Bélusca-Maïto + * Copyright 2019 Yaroslav Kibysh + */ + +#include "include/resource.h" + +/* Bitmaps */ + +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" 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@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.php?story=20061209171938444 * 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 -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"