Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-05-15 17:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[VGAMP] Rename to vga.sys

Browse source 
- rename driver vgamp.sys to vga.sys
- rename service Vga to VgaSave
- store settings in non hardware-profile registry key
This commit is contained in:
Hervé Poussineau 2021-11-24 07:39:20 +01:00
parent 0d9386d0e0
commit 073a1ea34c
7 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot/bootdata/hiveinst.inf
View file

@ -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

2
boot/bootdata/hivesys.inf
View file

@ -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

2
boot/bootdata/txtsetup.sif
View file

@ -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

9
media/inf/display.inf
View file

@ -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

10
win32ss/drivers/miniport/vga/CMakeLists.txt
View file

@ -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)

26
win32ss/drivers/miniport/vga/vga_reg.inf
View file

@ -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

4
win32ss/drivers/miniport/vga/vgamp.rc
View file

@ -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>