Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826)

Browse source 
Rename RosAudioSrv to AudioSrv in audio service itself and in all system components which are related to this, same as it done in Win2k3.
It allows MS DxDiag to detect the system audio service correctly, so it becomes possible to run DirectSound test properly with MS dsound.dll, although it works with some minor errors and only in older VirtualBox versions, ~ up to 5.1.38 (and in other emulators as well).

CORE-16307
This commit is contained in:
Oleg Dubinskiy 2019-08-16 20:11:04 +03:00 • committed by Hermès BÉLUSCA - MAÏTO
parent 2a8fc2b411
commit 5f7575909f
4 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
base/services/audiosrv/audiosrv.txt
View file

@ -19,18 +19,18 @@ subsequently passes to wdmaud.drv
It is not necessary to duplicate the exact structure of this mapped It is not necessary to duplicate the exact structure of this mapped
file, since it appears to only be used internally by Windows components. file, since it appears to only be used internally by Windows components.
The ROS Audio Service (RosAudioSrv) is intended to be able to run The ROS Audio Service (AudioSrv) is intended to be able to run
alongside the Windows Audio Service on XP/Vista, so it should be alongside the Windows Audio Service on XP/Vista, so it should be
possible to test in a "known working environment" ;) possible to test in a "known working environment" ;)
It will create a mutex, to: It will create a mutex, to:
1) Allow synchronization when accessing the device list 1) Allow synchronization when accessing the device list
2) Provide a simple method of identifying if RosAudioSrv is running 2) Provide a simple method of identifying if AudioSrv is running
(It might be worth using an event to notify WinMM when things are (It might be worth using an event to notify WinMM when things are
happening?) happening?)
The intention is to make RosAudioSrv receive PnP notifications for The intention is to make AudioSrv receive PnP notifications for
relevant audio devices, and also let AudioSrv in Windows do this. Then relevant audio devices, and also let AudioSrv in Windows do this. Then
it should be possible to create a small application that imitates it should be possible to create a small application that imitates
WinMM's actions :) WinMM's actions :)
@ -54,12 +54,12 @@ Testing the Service
=================== ===================
The service can be installed on Windows XP (possibly also Vista) like so: The service can be installed on Windows XP (possibly also Vista) like so:
sc create RosAudioSrv <path to audiosrv.exe> sc create AudioSrv <path to audiosrv.exe>
net start RosAudioSrv net start AudioSrv
...and can be removed like so: ...and can be removed like so:
net stop RosAudioSrv net stop AudioSrv
sc delete RosAudioSrv sc delete AudioSrv
You can view a list of the currently available devices (device list is You can view a list of the currently available devices (device list is
identical to the one offered by Windows' own AudioSrv) by running identical to the one offered by Windows' own AudioSrv) by running

16
boot/bootdata/hivesys.inf
View file

@ -1521,14 +1521,14 @@ HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Start",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Type",0x00010001,0x00000001
; Audio Service ; Audio Service
HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,%AUDIO_SERVICE% HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","DisplayName",0x00000000,%AUDIO_SERVICE%
HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Description",0x00000000,%AUDIO_SERVICE_DESCRIPTION% HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Description",0x00000000,%AUDIO_SERVICE_DESCRIPTION%
HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ErrorControl",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Group",0x00000000,"Audio" HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Group",0x00000000,"Audio"
HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe"
HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ObjectName",0x00000000,"LocalSystem" HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ObjectName",0x00000000,"LocalSystem"
HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Start",0x00010001,0x00000003
HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Type",0x00010001,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Type",0x00010001,0x00000010
; Background Intelligent Transfer Service (BITS) ; Background Intelligent Transfer Service (BITS)
HKLM,"SYSTEM\CurrentControlSet\Services\BITS","DisplayName",0x00000000,%BITS_SERVICE% HKLM,"SYSTEM\CurrentControlSet\Services\BITS","DisplayName",0x00000000,%BITS_SERVICE%

4
dll/cpl/mmsys/mmsys.c
View file

@ -553,10 +553,10 @@ MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData)
return ERROR_DI_DO_DEFAULT; return ERROR_DI_DO_DEFAULT;
} }
hService = OpenService(hSCManager, L"RosAudioSrv", SERVICE_ALL_ACCESS); hService = OpenService(hSCManager, L"AudioSrv", SERVICE_ALL_ACCESS);
if (hService) if (hService)
{ {
/* Make RosAudioSrv start automatically */ /* Make AudioSrv start automatically */
ChangeServiceConfig(hService, SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); ChangeServiceConfig(hService, SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
StartService(hService, 0, NULL); StartService(hService, 0, NULL);

4
sdk/include/reactos/libs/audiosrv/audiosrv.h
View file

@ -11,8 +11,8 @@
#ifndef AUDIOSRV_H #ifndef AUDIOSRV_H
#define AUDIOSRV_H #define AUDIOSRV_H
/* This is currently set to avoid conflicting service names in Windows! */ /* The service name */
#define SERVICE_NAME L"RosAudioSrv" #define SERVICE_NAME L"AudioSrv"
/* A named mutex is used for synchronizing access to the device list. /* A named mutex is used for synchronizing access to the device list.
If this mutex doesn't exist, it means the audio service isn't running. */ If this mutex doesn't exist, it means the audio service isn't running. */