[ros-diffs] [reactos] 03/04: [BOOTDATA][VBEMP] Merge duplicated registry settings to vbemp_reg.inf

[Hervé Poussineau]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d24de7805ffd9dbc38e0…

commit 8d24de7805ffd9dbc38e01f76961f2a1025a1f4f
Author:     Hervé Poussineau <hpoussin(a)reactos.org>
AuthorDate: Mon Jul 5 00:02:56 2021 +0200
Commit:     Hervé Poussineau <hpoussin(a)reactos.org>
CommitDate: Mon Jul 5 23:44:35 2021 +0200

    [BOOTDATA][VBEMP] Merge duplicated registry settings to vbemp_reg.inf
---
 boot/bootdata/hiveinst.inf                 | 7 -------
 win32ss/drivers/miniport/vbe/vbemp_reg.inf | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/boot/bootdata/hiveinst.inf b/boot/bootdata/hiveinst.inf
index e4066a74011..6ecfd4236bc 100644
--- a/boot/bootdata/hiveinst.inf
+++ b/boot/bootdata/hiveinst.inf
@@ -8,12 +8,5 @@ Signature = "$Windows NT$"
 ; Display driver section
 ;
 
-; VBE SVGA driver
-HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1
-HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,32
-HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,800
-HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,600
-
 ; VGA miniport driver

HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000001
diff --git a/win32ss/drivers/miniport/vbe/vbemp_reg.inf
b/win32ss/drivers/miniport/vbe/vbemp_reg.inf
index 00a92c14c3b..3b532c9fe9c 100644
--- a/win32ss/drivers/miniport/vbe/vbemp_reg.inf
+++ b/win32ss/drivers/miniport/vbe/vbemp_reg.inf
@@ -9,9 +9,9 @@
HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001
 
 HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf"
 HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1
-HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8
-HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640
-HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480
+HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,32
+HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,800
+HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,600
 HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.FixedOutput",0x00010001,0
 HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Flags",0x00010001,0
 HKLM,"SYSTEM\CurrentControlSet\Hardware
Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Orientation",0x00010001,0