[PC98VID] Fix video driver settings

- Store settings in non hardware-profile registry key.
- Rename driver file to vgapnp.sys to keep in sync with VBE.
- This makes PC-98 video driver working again.

Addendum to 073a1ea3 and f03750de. CORE-18201 CORE-17977
This commit is contained in:
Stanislav Motylkov 2022-05-26 23:34:12 +03:00
parent 5471363801
commit 17e0e4428c
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
5 changed files with 14 additions and 14 deletions

View file

@ -8,8 +8,8 @@ list(APPEND SOURCE
add_library(pc98vid MODULE ${SOURCE} pc98vid.rc)
set_module_type(pc98vid kernelmodedriver)
# Actual binary filename is vga.sys
set_target_properties(pc98vid PROPERTIES OUTPUT_NAME "vga" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
# Actual binary filename is vgapnp.sys
set_target_properties(pc98vid PROPERTIES OUTPUT_NAME "vgapnp" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
add_pch(pc98vid pc98vid.h SOURCE)
add_importlibs(pc98vid ntoskrnl videoprt)

View file

@ -27,7 +27,7 @@ DefaultDestDir = 12
CopyFiles = pc98vid_CopyFiles.NT
[pc98vid_CopyFiles.NT]
vga.sys
vgapnp.sys
[Pc98Vid_Inst.NT.Services]
AddService = vga, 0x00000002, vga_Service_Inst
@ -36,7 +36,7 @@ AddService = vga, 0x00000002, vga_Service_Inst
ServiceType = 1
StartType = 1
ErrorControl = 0
ServiceBinary = %12%\vga.sys
ServiceBinary = %12%\vgapnp.sys
LoadOrderGroup = Video
[vga.SoftwareSettings]

View file

@ -2,9 +2,9 @@
[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\vga.sys"
HKLM,"SYSTEM\CurrentControlSet\Services\vga","ImagePath",0x00020000,"system32\drivers\vgapnp.sys"
HKLM,"SYSTEM\CurrentControlSet\Services\vga","Start",0x00010001,0x00000004
HKLM,"SYSTEM\CurrentControlSet\Services\vga","Type",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vga\Device0","InstalledDisplayDrivers",0x00010000,"framebuf"
HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vga\Device0","VgaCompatible",0x00010001,1
HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","InstalledDisplayDrivers",0x00010000,"framebuf"
HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","VgaCompatible",0x00010001,1

View file

@ -9,5 +9,9 @@ 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)
# pc98vid takes place of vga service on PC-98 platform
if(NOT SARCH STREQUAL "pc98")
add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all)
add_registry_inf(vbemp_reg.inf)
endif()

View file

@ -15,8 +15,4 @@ target_link_libraries(vga libcntpr)
set_module_type(vga kernelmodedriver)
add_importlibs(vga videoprt)
add_pch(vga vga.h SOURCE)
# pc98vid takes place of vga.sys on PC-98 platform
if(NOT SARCH STREQUAL "pc98")
add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)
endif()
add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)