https://git.reactos.org/?p=reactos.git;a=commitdiff;h=073a1ea34c032629e2fc34268e8ae32621650a39
commit 073a1ea34c032629e2fc34268e8ae32621650a39 Author: Hervé Poussineau <[email protected]> AuthorDate: Wed Nov 24 07:39:20 2021 +0100 Commit: Hervé Poussineau <[email protected]> CommitDate: Thu Jan 6 20:16:12 2022 +0100 [VGAMP] Rename to vga.sys - rename driver vgamp.sys to vga.sys - rename service Vga to VgaSave - store settings in non hardware-profile registry key --- boot/bootdata/hiveinst.inf | 2 +- boot/bootdata/hivesys.inf | 2 -- boot/bootdata/txtsetup.sif | 2 +- media/inf/display.inf | 9 --------- win32ss/drivers/miniport/vga/CMakeLists.txt | 10 +++++----- win32ss/drivers/miniport/vga/vga_reg.inf | 26 +++++++++++++------------- win32ss/drivers/miniport/vga/vgamp.rc | 4 ++-- 7 files changed, 22 insertions(+), 33 deletions(-) diff --git a/boot/bootdata/hiveinst.inf b/boot/bootdata/hiveinst.inf index 6ecfd4236bc..bdd4d49c6f0 100644 --- a/boot/bootdata/hiveinst.inf +++ b/boot/bootdata/hiveinst.inf @@ -9,4 +9,4 @@ Signature = "$Windows NT$" ; ; VGA miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave","Start",0x00010001,0x00000001 diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 43142022444..cd29e50ba69 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -252,11 +252,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\{745A17A0-74D3-11D0-B6FE ; ReactOS specific - required to load in Safe Mode and for debugging in Safe Mode (until vga.sys and vgasave.sys are implemented) HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\Debug","",0x00000000,"Driver Group" -HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\vgamp.sys","",0x00000000,"Driver" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\vbemp.sys","",0x00000000,"Driver" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\Debug","",0x00000000,"Driver Group" -HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\vgamp.sys","",0x00000000,"Driver" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\vbemp.sys","",0x00000000,"Driver" ; Other diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index bab952d811d..a12391185cc 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -295,7 +295,7 @@ halmp.dll = 1,,,,,,,2,,,hal.dll,1,2 [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<width>,<height>,<bpp> -vga = "VGA Display (640x480x4)",,Vga,640,480,4 +vga = "VGA Display (640x480x4)",,VgaSave,640,480,4 vbe_640x480x8 = "VESA Display (640x480x8)",,VBE,640,480,8 vbe_640x480x16 = "VESA Display (640x480x16)",,VBE,640,480,16 vbe_640x480x24 = "VESA Display (640x480x24)",,VBE,640,480,24 diff --git a/media/inf/display.inf b/media/inf/display.inf index c675191f798..13e74142551 100644 --- a/media/inf/display.inf +++ b/media/inf/display.inf @@ -38,7 +38,6 @@ HKR, , Installer32, 0, "desk.cpl,DisplayClassInstaller" CopyFiles = VGA.Miniport_CopyFiles.NT, VGA.Display_CopyFiles.NT [VGA.Miniport_CopyFiles.NT] -vgamp.sys vbemp.sys [VGA.Display_CopyFiles.NT] @@ -47,16 +46,8 @@ framebuf.dll [VGA_Inst.NT.Services] AddService = , 0x00000002 -;AddService = VGA, , VGA_Service_Inst AddService = VBE, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE -[VGA_Service_Inst] -ServiceType = 1 -StartType = 1 -ErrorControl = 0 -ServiceBinary = %12%\vgamp.sys -LoadOrderGroup = Video Save - [VBE_Service_Inst] ServiceType = 1 StartType = 1 diff --git a/win32ss/drivers/miniport/vga/CMakeLists.txt b/win32ss/drivers/miniport/vga/CMakeLists.txt index 13ac7b516d4..70dd2e36841 100644 --- a/win32ss/drivers/miniport/vga/CMakeLists.txt +++ b/win32ss/drivers/miniport/vga/CMakeLists.txt @@ -4,9 +4,9 @@ list(APPEND SOURCE vgamp.c vgamp.h) -add_library(vgamp MODULE ${SOURCE} vgamp.rc) -set_module_type(vgamp kernelmodedriver) -add_importlibs(vgamp videoprt) -add_pch(vgamp vgamp.h SOURCE) -add_cd_file(TARGET vgamp DESTINATION reactos/system32/drivers FOR all) +add_library(vga MODULE ${SOURCE} vgamp.rc) +set_module_type(vga kernelmodedriver) +add_importlibs(vga videoprt) +add_pch(vga vgamp.h SOURCE) +add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all) add_registry_inf(vga_reg.inf) diff --git a/win32ss/drivers/miniport/vga/vga_reg.inf b/win32ss/drivers/miniport/vga/vga_reg.inf index 6a11511eec5..617afe6e038 100644 --- a/win32ss/drivers/miniport/vga/vga_reg.inf +++ b/win32ss/drivers/miniport/vga/vga_reg.inf @@ -1,16 +1,16 @@ ; VGA miniport driver [AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Video","Service",0x00000000,"Vga" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","VgaCompatible",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave","Group",0x00000000,"Video Save" +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave","ImagePath",0x00020000,"system32\drivers\vga.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave","Tag",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave\Video","Service",0x00000000,"VgaSave" +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave\Device0","VgaCompatible",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.BitsPerPel",0x00010001,8 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave\Device0","DefaultSettings.VRefresh",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave\Device0","DefaultSettings.BitsPerPel",0x00010001,8 +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave\Device0","DefaultSettings.XResolution",0x00010001,640 +HKLM,"SYSTEM\CurrentControlSet\Services\VgaSave\Device0","DefaultSettings.YResolution",0x00010001,480 diff --git a/win32ss/drivers/miniport/vga/vgamp.rc b/win32ss/drivers/miniport/vga/vgamp.rc index c4053088061..bf80963bd5b 100644 --- a/win32ss/drivers/miniport/vga/vgamp.rc +++ b/win32ss/drivers/miniport/vga/vgamp.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "VGA Miniport Device Driver" -#define REACTOS_STR_INTERNAL_NAME "vgamp" -#define REACTOS_STR_ORIGINAL_FILENAME "vgamp.sys" +#define REACTOS_STR_INTERNAL_NAME "vga" +#define REACTOS_STR_ORIGINAL_FILENAME "vga.sys" #include <reactos/version.rc>
