[0.4.13][BOOTDATA] Port back some hivesys.inf fixes / cleanup

0.4.15-dev-5102-g 18d40ebe81 [BOOTDATA] hivesys.inf: Remove redundant fastfat "Start" entry. The one in the [AddReg] section has the very same value.
-------
0.4.15-dev-5012-g e3f8f52f3d [BOOTDATA] Delete "Layout Id" from Japanese/Korean Keyboard Layout
Katayama explained: These registry values are for pre-installed IMEs we don't have. It is safe to remove them also in the older branches.
-------
0.4.15-dev-4352-g cfe387a9b0 [BOOTDATA] Add two missing separating commas in the ServiceGroupOrder List multi-string.
-------
PARTIALLY PICK: 0.4.15-dev-4412-g 94d144f8a5 [BOOTDATA] Fix some services groups
- AudioSrv belongs to "AudioGroup" (and not "Audio" that doesn't exist).
- lanmanworkstation belongs to "NetworkProvider" (without a space).
I dared only to pick the "NetworkProvider" and "AudioGroup" part for now. The MUP part I might do later when actually being able to retest CORE12107 "VMWare tools" myself.
-------
0.4.15-dev-1097-g 0689455bb3 [BOOTDATA] Comment out biosinfo.inf (#3266)
This allows ros to boot with its LiveCD files using MS NTLDR!
I stripped the line here, instead of commenting it as the master commit did. The file does not exist.
-------
Additionally to those backports I cleaned up some of the stuff that was previously commented out and/or broken:

- instead of following 0.4.15-dev-3322-g c6e002bfb3 to fix the Latvian kbdlv1.dll QUERTY->QWERTY typo, I just stripped those lines, as
they are commented out anyway. And were added in the broken and already commented way by 0.4.9-dev-825-g c2089d5319
We never had them active. No such file even.

- Also strip some 'translated' service strings that were just copy-pasted from the english strings section
without actually getting translated at all. The english ones will be used anyway.
It is enough to have that redundant stuff in master to allow translators to see it.

- Also strip the disabled kbdfo.dll Faeroese keyboard layout. Enough to have those commented lines in master as a TODO reminder. Was never active ever. No such file even.

- Also strip the disabled BENGALI_INSCRIPT kbdinben.dll. Where the existing lines even had bugs in the older branches as proven by 0.4.15-dev-3322-g c6e002bfb3
It was always disabled and was neither localizable, nor did it have the correct layout code even. No such file even.

None of those changes will introduce any additional diff or break any existing features.
They just slightly move the already existing diffs position in time towards newer release-branches.
This commit is contained in:
Joachim Henze 2023-03-14 23:09:29 +01:00
parent 21fd732ea9
commit b56ab224ae

View file

@ -5,7 +5,6 @@ Signature = "$Windows NT$"
HKLM,"SYSTEM\CurrentControlSet\Control","CurrentUser",2,"USERNAME"
HKLM,"SYSTEM\CurrentControlSet\Control","WaitToKillServiceTimeout",2,"20000"
HKLM,"SYSTEM\CurrentControlSet\Control\Biosinfo","InfName",2,"biosinfo.inf"
HKLM,"SYSTEM\CurrentControlSet\Control\PnP",,0x00000012
HKLM,"SYSTEM\CurrentControlSet\Control\Video",,0x00000012
@ -583,12 +582,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout Displa
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout File",0x00000000,"kbdja.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Text",0x00000000,%JAPANESE%
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5061"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Id",0x00000000,"0001"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout File",0x00000000,"kbdko.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Text",0x00000000,%KOREAN%
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5063"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Id",0x00000000,"0001"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000413","Layout File",0x00000000,"kbdne.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000413","Layout Text",0x00000000,%DUTCH%
@ -707,10 +704,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout File",
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Text",0x00000000,%LATVIAN%
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5043"
; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout File",0x00000000,"kbdlv1.dll"
; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Text",0x00000000,%LATVIAN_QUERTY%
; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5044"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout File",0x00000000,"kbdlt1.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout Text",0x00000000,%LITHUANIAN%
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5088"
@ -743,10 +736,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout File",
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Text",0x00000000,%GEORGIAN%
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5119"
;HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000438","Layout File",0x00000000,"kbdfo.dll"
;HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000438","Layout Text",0x00000000,%FAEROESE%
;HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000438","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5108"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout File",0x00000000,"kbdindev.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout Text",0x00000000,%DEVANAGARI%
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5096"
@ -767,10 +756,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout File",
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout Text",0x00000000,%BENGALI%
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5135"
; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000845","Layout File",0x00000000,"kbdinben.dll"
; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000845","Layout Text",0x00000000,"Bengali"
; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000845","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5135"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000447","Layout File",0x00000000,"kbdinguj.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000447","Layout Text",0x00000000,%GUJARATI%
HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000447","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5097"
@ -1409,11 +1394,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \
"SpoolerGroup", \
"AudioGroup", \
"SmartCardGroup", \
"NetworkProvider" \
"NetworkProvider", \
"RemoteValidation", \
"NetDDEGroup", \
"Parallel arbitrator", \
"Extended Base" \
"Extended Base", \
"PCI Configuration", \
"MS Transactions"
@ -1523,7 +1508,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Type",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","DisplayName",0x00000000,%AUDIO_SERVICE%
HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Description",0x00000000,%AUDIO_SERVICE_DESCRIPTION%
HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ErrorControl",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Group",0x00000000,"Audio"
HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Group",0x00000000,"AudioGroup"
HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe"
HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ObjectName",0x00000000,"LocalSystem"
HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Start",0x00010001,0x00000003
@ -1606,7 +1591,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver\Parameters","ServiceDll",0x
HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","DisplayName",0x00000000,%WORKSTATION_SERVICE%
HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","Description",0x00000000,%WORKSTATION_SERVICE_DESCRIPTION%
HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","ErrorControl",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","Group",0x00000000,"Network Provider"
HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","Group",0x00000000,"NetworkProvider"
HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs"
HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","ObjectName",0x00000000,"LocalSystem"
HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","Start",0x00010001,0x00000002
@ -2212,7 +2197,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\d
HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000003
[Strings]
@ -2311,7 +2295,6 @@ GERMAN = "German"
GREEK = "Greek"
GUJARATI = "Gujarati"
IRISH = "Irish"
FAEROESE = "Faeroese"
FINNISH = "Finnish"
FRENCH = "French"
GEORGIAN = "Georgian"
@ -2324,7 +2307,6 @@ KAZAKH = "Kazakh"
KOREAN = "Korean"
LATIN_AMERICAN = "Latin American"
LATVIAN = "Latvian"
LATVIAN_QUERTY = "Latvian (QUERTY)"
LITHUANIAN = "Lithuanian"
MACEDONIAN = "Macedonian (FYRO)"
MALAYALAM = "Malayalam"
@ -2374,9 +2356,6 @@ AUDIO_SERVICE_DESCRIPTION="Zapewnia aplikacjom dostęp do urządzeń audio."
BITS_SERVICE="Usługa inteligentnego transferu w tle"
BITS_SERVICE_DESCRIPTION="Przenosi dane pomiędzy klientami a serwerami w tle."
DCOMLAUNCH_SERVICE="DcomLaunch service"
DCOMLAUNCH_SERVICE_DESCRIPTION="DcomLaunch service stub."
EVENTLOG_SERVICE="Dziennik zdarzeń"
EVENTLOG_SERVICE_DESCRIPTION="Zapisuje zdarzenia lub wiadomości wysyłane przez system operacyjny do bazy danych dostępnej za pomocą podglądu zdarzeń."
@ -2392,9 +2371,6 @@ PLUGPLAY_SERVICE_DESCRIPTION="Wykrywa zmiany w sprzęcie i instaluje potrzebne o
RPCSS_SERVICE="Zdalne wykonywanie procedur"
RPCSS_SERVICE_DESCRIPTION="Podsystem RPC, który jest odpowiedzialny za zdalne wykonywanie procedur na tym komputerze."
SAMSS_SERVICE="Security Accounts Manager"
SAMSS_SERVICE_DESCRIPTION="The startup of this service signals other services that the Security Accounts Manager (SAM) is ready to accept requests. Disabling this service will prevent other services in the system from being notified when the SAM is ready, which may in turn cause those services to fail to start correctly. This service should not be disabled."
SCHEDULE_SERVICE="Usługa Harmonogram"
SCHEDULE_SERVICE_DESCRIPTION="Umożliwia uruchamianie programów w określonym czasie."
@ -2462,7 +2438,6 @@ GERMAN = "Niemiecki"
GREEK = "Grecki"
GUJARATI = "Gujarati"
IRISH = "Irlandzki"
FAEROESE = "Faeroese"
FINNISH = "Fiński"
FRENCH = "Francuski"
GEORGIAN = "Gruziński"
@ -2475,7 +2450,6 @@ KAZAKH = "Kazachski"
KOREAN = "Koreański"
LATIN_AMERICAN = "Latynoamerykański"
LATVIAN = "Łotewski"
LATVIAN_QUERTY = "Łotewski (QUERTY)"
LITHUANIAN = "Litewski"
MACEDONIAN = "Macedoński (FYRO)"
MALAYALAM = "Malajalam"
@ -2525,9 +2499,6 @@ AUDIO_SERVICE_DESCRIPTION="Oferă aplicațiilor funcționalități audio."
BITS_SERVICE="Serviciu de transfer inteligent în fundal"
BITS_SERVICE_DESCRIPTION="Transferă fișiere în fundal utilizând lățimea de bandă nefolosită a rețelei."
DCOMLAUNCH_SERVICE="DcomLaunch service"
DCOMLAUNCH_SERVICE_DESCRIPTION="DcomLaunch service stub."
EVENTLOG_SERVICE="Jurnal de evenimente"
EVENTLOG_SERVICE_DESCRIPTION="Jurnalizează mesajele sau evenimentele transmise de sistemul de operare într-o bază de date accesibilă cu instrumentul „observator de evenimente”."
@ -2543,9 +2514,6 @@ PLUGPLAY_SERVICE_DESCRIPTION="Detectează schimbările în configurația fizică
RPCSS_SERVICE="Apel procedural la distanță"
RPCSS_SERVICE_DESCRIPTION="Subsistemul responsabil pentru apel procedural la distanță în calculatorul local."
SAMSS_SERVICE="Security Accounts Manager"
SAMSS_SERVICE_DESCRIPTION="The startup of this service signals other services that the Security Accounts Manager (SAM) is ready to accept requests. Disabling this service will prevent other services in the system from being notified when the SAM is ready, which may in turn cause those services to fail to start correctly. This service should not be disabled."
SCHEDULE_SERVICE="Serviciu de planificare"
SCHEDULE_SERVICE_DESCRIPTION="Permite pornirea de programe la o anumită oră."
@ -2573,9 +2541,6 @@ WLANSVC_SERVICE_DESCRIPTION="Serviciu pentru rețele locale fără fir."
WORKSTATION_SERVICE="Stație de lucru"
WORKSTATION_SERVICE_DESCRIPTION="Serviciu responsabil pentru crearea și menținerea conexiunilor la servere în rețea."
WUAUSERV_SERVICE="Automatic Updates"
WUAUSERV_SERVICE_DESCRIPTION="AutoUpdate Service stub."
; Keyboard layouts
ALBANIAN = "Albaneză"
ARABIC_101 = "Arabă (101)"
@ -2610,7 +2575,6 @@ GERMAN = "Germană"
GREEK = "Greacă"
GUJARATI = "Gujarati"
IRISH = "Irlandeză"
FAEROESE = "Faeroese"
FINNISH = "Finlandeză"
FRENCH = "Franceză"
GEORGIAN = "Georgiană"
@ -2623,7 +2587,6 @@ KAZAKH = "Kazahă"
KOREAN = "Coreeană"
LATIN_AMERICAN = "Iberoamericană"
LATVIAN = "Letonă"
LATVIAN_QUERTY = "Letonă (QUERTY)"
LITHUANIAN = "Lituaniană"
MACEDONIAN = "Macedonă (FYRO)"
MALAYALAM = "Malayalam"
@ -2662,7 +2625,6 @@ US_INTERNATIONAL = "SUA internațională"
UZBEK_CYRILLIC = "Uzbecă (alfabet chirilic)"
VIETNAMESE = "Vietnameză"
; LANG_RUSSIAN SUBLANG_NEUTRAL
[Strings.0019]
@ -2673,9 +2635,6 @@ AUDIO_SERVICE_DESCRIPTION="Обеспечивает звуковыми устр
BITS_SERVICE="Фоновая интеллектуальная служба передачи (BITS)"
BITS_SERVICE_DESCRIPTION="Обеспечивает передачу данных между клиентами и серверами в фоновом режиме с использованием пропускной способности простаивающей сети."
DCOMLAUNCH_SERVICE="DcomLaunch service"
DCOMLAUNCH_SERVICE_DESCRIPTION="DcomLaunch service stub."
EVENTLOG_SERVICE="Журнал событий"
EVENTLOG_SERVICE_DESCRIPTION="Регистрирует события или сообщения, отправленные операционной системой в базе данных, доступной через средство просмотра журнала событий."
@ -2691,9 +2650,6 @@ PLUGPLAY_SERVICE_DESCRIPTION="Обнаруживает изменения обо
RPCSS_SERVICE="Удаленный вызов процедур (RPC)"
RPCSS_SERVICE_DESCRIPTION="Подсистема для вызова удаленных процедур на локальной машине."
SAMSS_SERVICE="Security Accounts Manager"
SAMSS_SERVICE_DESCRIPTION="The startup of this service signals other services that the Security Accounts Manager (SAM) is ready to accept requests. Disabling this service will prevent other services in the system from being notified when the SAM is ready, which may in turn cause those services to fail to start correctly. This service should not be disabled."
SCHEDULE_SERVICE="Планировщик заданий"
SCHEDULE_SERVICE_DESCRIPTION="Позволяет запускать программы в определенное время."
@ -2706,9 +2662,6 @@ SPOOLER_SERVICE_DESCRIPTION="Загружает файлы в память дл
TCPSVCS_SERVICE="Простые службы TCP/IP"
TCPSVCS_SERVICE_DECRIPTION="Поддержка следующих служб TCP/IP: Chargen, Daytime, Discard, Echo, QOTD."
TELNETD_SERVICE="ReactOS Telnet Service"
TELNETD_SERVICE_DESCRIPTION="ReactOS Telnet Service"
THEMES_SERVICE="Темы"
THEMES_SERVICE_DESCRIPTION="Поддержка тем оформления."
@ -2721,7 +2674,4 @@ WLANSVC_SERVICE_DESCRIPTION="Обеспечивает поддержку бес
WORKSTATION_SERVICE="Рабочая станция"
WORKSTATION_SERVICE_DESCRIPTION="Обеспечивает поддержку сетевых подключений и связь."
WUAUSERV_SERVICE="Automatic Updates"
WUAUSERV_SERVICE_DESCRIPTION="AutoUpdate Service stub."
; EOF