https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f03750de6a5418a29aa784...
commit f03750de6a5418a29aa784e9c43c9862e0a5850e Author: Hervé Poussineau hpoussin@reactos.org AuthorDate: Wed Nov 24 07:55:20 2021 +0100 Commit: Hervé Poussineau hpoussin@reactos.org CommitDate: Thu Jan 6 20:16:12 2022 +0100
[VBEMP] Rename to vgapnp.sys
- rename driver vbemp.sys to vgapnp.sys - rename service VBE to vga - store settings in non hardware-profile registry key --- boot/bootdata/hivesys.inf | 10 +++--- boot/bootdata/txtsetup.sif | 48 ++++++++++++++--------------- media/inf/display.inf | 6 ++-- win32ss/drivers/miniport/vbe/CMakeLists.txt | 12 ++++---- win32ss/drivers/miniport/vbe/vbemp.rc | 4 +-- win32ss/drivers/miniport/vbe/vbemp_reg.inf | 46 +++++++++++++-------------- 6 files changed, 62 insertions(+), 64 deletions(-)
diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index cd29e50ba69..20838a451a4 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -83,16 +83,16 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","Service",0x00000000,"mouhid" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}"
-HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","Service",0x00000000,"VBE" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","Service",0x00000000,"vga" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}"
-HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001","Service",0x00000000,"VBE" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001","Service",0x00000000,"vga" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}"
-HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0300","Service",0x00000000,"VBE" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0300","Service",0x00000000,"vga" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0300","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}"
-HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","Service",0x00000000,"VBE" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","Service",0x00000000,"vga" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}"
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0303","Service",0x00000000,"i8042prt" @@ -252,10 +252,8 @@ 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\vbemp.sys","",0x00000000,"Driver"
HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\Debug","",0x00000000,"Driver Group" -HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\vbemp.sys","",0x00000000,"Driver"
; Other HKLM,"SYSTEM\CurrentControlSet\Control\Arbiters",,0x00000012 diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index a12391185cc..c74b3328aae 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -296,30 +296,30 @@ halmp.dll = 1,,,,,,,2,,,hal.dll,1,2 [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<width>,<height>,<bpp> 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 -vbe_640x480x32 = "VESA Display (640x480x32)",,VBE,640,480,32 -vbe_800x600x8 = "VESA Display (800x600x8)",,VBE,800,600,8 -vbe_800x600x16 = "VESA Display (800x600x16)",,VBE,800,600,16 -vbe_800x600x24 = "VESA Display (800x600x24)",,VBE,800,600,24 -vbe = "VESA Display (800x600x32)",,VBE,800,600,32 -vbe_1024x768x8 = "VESA Display (1024x768x8)",,VBE,1024,768,8 -vbe_1024x768x16 = "VESA Display (1024x768x16)",,VBE,1024,768,16 -vbe_1024x768x24 = "VESA Display (1024x768x24)",,VBE,1024,768,24 -vbe_1024x768x32 = "VESA Display (1024x768x32)",,VBE,1024,768,32 -vbe_1152x864x8 = "VESA Display (1152x864x8)",,VBE,1152,864,8 -vbe_1152x864x16 = "VESA Display (1152x864x16)",,VBE,1152,864,16 -vbe_1152x864x24 = "VESA Display (1152x864x24)",,VBE,1152,864,24 -vbe_1152x864x32 = "VESA Display (1152x864x32)",,VBE,1152,864,32 -vbe_1280x1024x8 = "VESA Display (1280x1024x8)",,VBE,1280,1024,8 -vbe_1280x1024x16 = "VESA Display (1280x1024x16)",,VBE,1280,1024,16 -vbe_1280x1024x24 = "VESA Display (1280x1024x24)",,VBE,1280,1024,24 -vbe_1280x1024x32 = "VESA Display (1280x1024x32)",,VBE,1280,1024,32 -vbe_1600x1200x8 = "VESA Display (1600x1200x8)",,VBE,1600,1200,8 -vbe_1600x1200x16 = "VESA Display (1600x1200x16)",,VBE,1600,1200,16 -vbe_1600x1200x24 = "VESA Display (1600x1200x24)",,VBE,1600,1200,24 -vbe_1600x1200x32 = "VESA Display (1600x1200x32)",,VBE,1600,1200,32 +vbe_640x480x8 = "VESA Display (640x480x8)",,vga,640,480,8 +vbe_640x480x16 = "VESA Display (640x480x16)",,vga,640,480,16 +vbe_640x480x24 = "VESA Display (640x480x24)",,vga,640,480,24 +vbe_640x480x32 = "VESA Display (640x480x32)",,vga,640,480,32 +vbe_800x600x8 = "VESA Display (800x600x8)",,vga,800,600,8 +vbe_800x600x16 = "VESA Display (800x600x16)",,vga,800,600,16 +vbe_800x600x24 = "VESA Display (800x600x24)",,vga,800,600,24 +vbe = "VESA Display (800x600x32)",,vga,800,600,32 +vbe_1024x768x8 = "VESA Display (1024x768x8)",,vga,1024,768,8 +vbe_1024x768x16 = "VESA Display (1024x768x16)",,vga,1024,768,16 +vbe_1024x768x24 = "VESA Display (1024x768x24)",,vga,1024,768,24 +vbe_1024x768x32 = "VESA Display (1024x768x32)",,vga,1024,768,32 +vbe_1152x864x8 = "VESA Display (1152x864x8)",,vga,1152,864,8 +vbe_1152x864x16 = "VESA Display (1152x864x16)",,vga,1152,864,16 +vbe_1152x864x24 = "VESA Display (1152x864x24)",,vga,1152,864,24 +vbe_1152x864x32 = "VESA Display (1152x864x32)",,vga,1152,864,32 +vbe_1280x1024x8 = "VESA Display (1280x1024x8)",,vga,1280,1024,8 +vbe_1280x1024x16 = "VESA Display (1280x1024x16)",,vga,1280,1024,16 +vbe_1280x1024x24 = "VESA Display (1280x1024x24)",,vga,1280,1024,24 +vbe_1280x1024x32 = "VESA Display (1280x1024x32)",,vga,1280,1024,32 +vbe_1600x1200x8 = "VESA Display (1600x1200x8)",,vga,1600,1200,8 +vbe_1600x1200x16 = "VESA Display (1600x1200x16)",,vga,1600,1200,16 +vbe_1600x1200x24 = "VESA Display (1600x1200x24)",,vga,1600,1200,24 +vbe_1600x1200x32 = "VESA Display (1600x1200x32)",,vga,1600,1200,32 xbox = "Original Xbox NV2A Framebuffer (640x480x32)",,XboxVmp,640,480,32
[Map.Display] diff --git a/media/inf/display.inf b/media/inf/display.inf index 13e74142551..7945060869d 100644 --- a/media/inf/display.inf +++ b/media/inf/display.inf @@ -38,7 +38,7 @@ HKR, , Installer32, 0, "desk.cpl,DisplayClassInstaller" CopyFiles = VGA.Miniport_CopyFiles.NT, VGA.Display_CopyFiles.NT
[VGA.Miniport_CopyFiles.NT] -vbemp.sys +vgapnp.sys
[VGA.Display_CopyFiles.NT] vgaddi.dll @@ -46,13 +46,13 @@ framebuf.dll
[VGA_Inst.NT.Services] AddService = , 0x00000002 -AddService = VBE, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE +AddService = vga, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE
[VBE_Service_Inst] ServiceType = 1 StartType = 1 ErrorControl = 0 -ServiceBinary = %12%\vbemp.sys +ServiceBinary = %12%\vgapnp.sys LoadOrderGroup = Video Save
;-------------------------------- STRINGS ------------------------------- diff --git a/win32ss/drivers/miniport/vbe/CMakeLists.txt b/win32ss/drivers/miniport/vbe/CMakeLists.txt index fe2b836fd48..415c9cc8d4f 100644 --- a/win32ss/drivers/miniport/vbe/CMakeLists.txt +++ b/win32ss/drivers/miniport/vbe/CMakeLists.txt @@ -4,10 +4,10 @@ list(APPEND SOURCE vbemp.c vbemp.h)
-add_library(vbemp MODULE ${SOURCE} vbemp.rc) -set_module_type(vbemp kernelmodedriver) -add_importlibs(vbemp videoprt) -add_pch(vbemp vbemp.h SOURCE) -target_link_libraries(vbemp libcntpr) -add_cd_file(TARGET vbemp DESTINATION reactos/system32/drivers FOR all) +add_library(vgapnp MODULE ${SOURCE} vbemp.rc) +set_module_type(vgapnp kernelmodedriver) +add_importlibs(vgapnp videoprt) +add_pch(vgapnp vbemp.h SOURCE) +target_link_libraries(vgapnp libcntpr) +add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all) add_registry_inf(vbemp_reg.inf) diff --git a/win32ss/drivers/miniport/vbe/vbemp.rc b/win32ss/drivers/miniport/vbe/vbemp.rc index ffa67b1d25e..f057bef5767 100644 --- a/win32ss/drivers/miniport/vbe/vbemp.rc +++ b/win32ss/drivers/miniport/vbe/vbemp.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "VBE Miniport Device Driver" -#define REACTOS_STR_INTERNAL_NAME "vbemp" -#define REACTOS_STR_ORIGINAL_FILENAME "vbemp.sys" +#define REACTOS_STR_INTERNAL_NAME "vgapnp" +#define REACTOS_STR_ORIGINAL_FILENAME "vgapnp.sys" #include <reactos/version.rc> diff --git a/win32ss/drivers/miniport/vbe/vbemp_reg.inf b/win32ss/drivers/miniport/vbe/vbemp_reg.inf index f3c36248311..de9acde84f7 100644 --- a/win32ss/drivers/miniport/vbe/vbemp_reg.inf +++ b/win32ss/drivers/miniport/vbe/vbemp_reg.inf @@ -1,28 +1,28 @@ ; VBE SVGA driver [AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE\Video","Service",0x00000000,"VBE" +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\vgapnp.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\vga","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\vga","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\vga","Tag",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Video","Service",0x00000000,"vga"
-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,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 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XPanning",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YPanning",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeX",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeY",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.ToDesktop",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.PrimaryDevice",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Device Description",0x00020000,"Generic VESA Adapter" +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.VRefresh",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.BitsPerPel",0x00010001,32 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.XResolution",0x00010001,800 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.YResolution",0x00010001,600 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.FixedOutput",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.Flags",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.Orientation",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.XPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.YPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","Attach.RelativeX",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","Attach.RelativeY",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","Attach.ToDesktop",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","Attach.PrimaryDevice",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","Device Description",0x00000000,"Generic VESA Adapter"
; This is not true but it allows to use 3rd party drivers while having the VBE driver installed -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","VgaCompatible",0x00010001,1
-
Hervé Poussineau