Skip to content

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

Merged
HBelusca merged 2 commits intoreactos:masterfrom
oleg-dubinskiy:rename_RosAudioSrv
Aug 16, 2019
Merged

[AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv#1826
HBelusca merged 2 commits intoreactos:masterfrom
oleg-dubinskiy:rename_RosAudioSrv

Conversation

@oleg-dubinskiy
Copy link
Copy Markdown
Contributor

Purpose

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

JIRA issue: CORE-16307

Proposed changes

Rename RosAudioSrv to AudioSrv in the following source files:

  • base/services/audiosrv/audiosrv.txt (just description of audio service, it doesn't make any changes in the system);
  • boot/bootdata/hivesys.inf (registry values of the audio service);
  • dll/cpl/mmsys/mmsys.c (audio properties cpl part, which calls it also, when changing audio settings);
  • sdk/include/reactos/libs/audiosrv/audiosrv.h (service name itself, as it named in the system and visible to other system components and to user).

Result

Before:
before
dxdiag_before

After:
after
dxdiag_after

Copy link
Copy Markdown
Contributor

@BelleNottelling BelleNottelling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but this will make testing on windows harder, and makes comments such as this no longer valid :P

/* This is currently set to avoid conflicting service names in Windows! */

@oleg-dubinskiy
Copy link
Copy Markdown
Contributor Author

this will make testing on windows harder, and makes comments such as this no longer valid

Hmm, so I need to remove that comment?...
I think it will possible to simply overwrite audio service in Windows for the testing by placing audiosrv.exe in system32 and changing audiosrv.dll to audiosrv.exe in HKLM\SYSTEM\CurrentControlSet\Services\AudioSrv\ImagePath, since our audiosrv is exe instead of dll unlike Win2k3. It's even easier than creating new RosAudioSrv. Who wants to have a two audio services in the system?... 😄 Moreover, testing only our audio service without MS's running will fully show the operability of it.

@HBelusca HBelusca merged commit 5f75759 into reactos:master Aug 16, 2019
@oleg-dubinskiy oleg-dubinskiy deleted the rename_RosAudioSrv branch November 14, 2019 15:49
JoachimHenze added a commit that referenced this pull request Mar 13, 2023
by porting back:
0.4.15-dev-5710-g 9672dc5 CORE-16912 [AUDIOSRV] Overhaul logging interfaces (#5067)
0.4.15-dev-445-g 353b544 CORE-16814 [AUDIOSRV] Disable Logging to file (#2599)
0.4.13-dev-894-g 5f75759 CORE-16307 [AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826)
0.4.13-dev-715-g 353e05a [AUDIOSRV] Fix the coding style. No code changes!
JoachimHenze added a commit that referenced this pull request Mar 13, 2023
by porting back:
0.4.15-dev-5710-g 9672dc5 CORE-16912 [AUDIOSRV] Overhaul logging interfaces (#5067)
0.4.15-dev-445-g 353b544 CORE-16814 [AUDIOSRV] Disable Logging to file (#2599)
0.4.13-dev-894-g 5f75759 CORE-16307 [AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826)
0.4.13-dev-715-g 353e05a [AUDIOSRV] Fix the coding style. No code changes!
JoachimHenze added a commit that referenced this pull request Mar 13, 2023
by porting back:
0.4.15-dev-5710-g 9672dc5 CORE-16912 [AUDIOSRV] Overhaul logging interfaces (#5067)
0.4.15-dev-445-g 353b544 CORE-16814 [AUDIOSRV] Disable Logging to file (#2599)
0.4.13-dev-894-g 5f75759 CORE-16307 [AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826)
0.4.13-dev-715-g 353e05a [AUDIOSRV] Fix the coding style. No code changes!
JoachimHenze added a commit that referenced this pull request Mar 13, 2023
by porting back:
0.4.15-dev-5710-g 9672dc5 CORE-16912 [AUDIOSRV] Overhaul logging interfaces (#5067)
0.4.15-dev-445-g 353b544 CORE-16814 [AUDIOSRV] Disable Logging to file (#2599)
0.4.13-dev-894-g 5f75759 CORE-16307 [AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826)
0.4.13-dev-715-g 353e05a [AUDIOSRV] Fix the coding style. No code changes!
JoachimHenze added a commit that referenced this pull request Mar 13, 2023
by porting back:
0.4.15-dev-5710-g 9672dc5 CORE-16912 [AUDIOSRV] Overhaul logging interfaces (#5067)
0.4.15-dev-445-g 353b544 CORE-16814 [AUDIOSRV] Disable Logging to file (#2599)
0.4.13-dev-894-g 5f75759 CORE-16307 [AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826)
0.4.13-dev-715-g 353e05a [AUDIOSRV] Fix the coding style. No code changes!
JoachimHenze added a commit that referenced this pull request Mar 13, 2023
by porting back:
0.4.15-dev-5710-g 9672dc5 CORE-16912 [AUDIOSRV] Overhaul logging interfaces (#5067)
0.4.15-dev-445-g 353b544 CORE-16814 [AUDIOSRV] Disable Logging to file (#2599)
0.4.13-dev-894-g 5f75759 CORE-16307 [AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826)
0.4.13-dev-715-g 353e05a [AUDIOSRV] Fix the coding style. No code changes!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants