From c0fdb98cf24f15aa49d8deaf3fec9a648821e7e5 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Fri, 17 Feb 2017 16:03:57 +0900 Subject: [PATCH] Renamed IDirectSound8_CreateStream to IDirectSound_CreateSoundStream --- src/CxbxKrnl/EmuDSound.cpp | 6 +++--- src/CxbxKrnl/EmuDSound.h | 4 ++-- src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl | 14 +++++++------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/CxbxKrnl/EmuDSound.cpp b/src/CxbxKrnl/EmuDSound.cpp index cfbdbc43b..c98aa8cf2 100644 --- a/src/CxbxKrnl/EmuDSound.cpp +++ b/src/CxbxKrnl/EmuDSound.cpp @@ -1681,9 +1681,9 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreateStream) } // ****************************************************************** -// * patch: IDirectSound8_CreateStream +// * patch: IDirectSound_CreateSoundStream // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_CreateStream) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_CreateSoundStream) ( LPDIRECTSOUND8 pThis, X_DSSTREAMDESC *pdssd, @@ -1691,7 +1691,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_CreateStream) PVOID pUnknown ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_CreateStream\n" + DbgPrintf("EmuDSound: EmuIDirectSound_CreateSoundStream\n" "(\n" " pThis : 0x%.08X\n" " pdssd : 0x%.08X\n" diff --git a/src/CxbxKrnl/EmuDSound.h b/src/CxbxKrnl/EmuDSound.h index b470cd846..b38451997 100644 --- a/src/CxbxKrnl/EmuDSound.h +++ b/src/CxbxKrnl/EmuDSound.h @@ -824,9 +824,9 @@ HRESULT WINAPI EMUPATCH(DirectSoundCreateStream) ); // ****************************************************************** -// * patch: IDirectSound8_CreateStream +// * patch: IDirectSound_CreateSoundStream // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_CreateStream) +HRESULT WINAPI EMUPATCH(IDirectSound_CreateSoundStream) ( LPDIRECTSOUND8 pThis, X_DSSTREAMDESC *pdssd, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl index 66546ff37..4bb577c37 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl @@ -168,30 +168,30 @@ OOVPA_XREF(DirectSound_CDirectSound_CreateSoundStream, 3936, 16, OOVPA_END; // ****************************************************************** -// * IDirectSound8_CreateStream +// * IDirectSound_CreateSoundStream // ****************************************************************** -OOVPA_XREF(IDirectSound8_CreateStream, 3936, 10, +OOVPA_XREF(IDirectSound_CreateSoundStream, 3936, 10, XRefNoSaveIndex, XRefOne) // TODO: tidy up the xref names (are probably not accurate) - // IDirectSound8_CreateStream+0x1D : call [CDirectSound::CreateSoundStream] + // IDirectSound_CreateSoundStream+0x1D : call [CDirectSound::CreateSoundStream] XREF_ENTRY( 0x1D, XREF_DSCREATESOUNDSTREAM ), // (Offset,Value)-Pair #1 - // IDirectSound8_CreateStream+0x04 : mov eax, [esp+0x08] + // IDirectSound_CreateSoundStream+0x04 : mov eax, [esp+0x08] { 0x04, 0x8B }, // (Offset,Value)-Pair #2 { 0x05, 0x44 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x08 }, // (Offset,Value)-Pair #5 - // IDirectSound8_CreateStream+0x12 : and eax, 0xFFFFFFF8 + // IDirectSound_CreateSoundStream+0x12 : and eax, 0xFFFFFFF8 { 0x12, 0x83 }, // (Offset,Value)-Pair #6 { 0x13, 0xC0 }, // (Offset,Value)-Pair #7 { 0x14, 0xF8 }, // (Offset,Value)-Pair #8 - // IDirectSound8_CreateStream+0x21 : retn 0x10 + // IDirectSound_CreateSoundStream+0x21 : retn 0x10 { 0x21, 0xC2 }, // (Offset,Value)-Pair #9 { 0x22, 0x10 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -4049,7 +4049,7 @@ OOVPATable DSound_3936[] = { REGISTER_OOVPA(DirectSoundDoWorkA, 3936, XREF), REGISTER_OOVPA(DirectSoundDoWork, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_CreateStream, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 3936, XREF), REGISTER_OOVPA(IDirectSound8_CreateBuffer, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index 4cc7b1da6..5fdc69210 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -406,7 +406,7 @@ OOVPATable DSound_4134[] = { REGISTER_OOVPA(IDirectSound8_GetEffectData, 4134, ALIAS, IDirectSound_GetEffectData), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(IDirectSound8_CreateStream, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4134, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index 529eb97ef..f9a50e320 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -1053,7 +1053,7 @@ OOVPATable DSound_4361[] = { REGISTER_OOVPA(DirectSoundDoWork, 4361, PATCH), REGISTER_OOVPA(DirectSoundGetSampleTime, 4361, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), - REGISTER_OOVPA(IDirectSound8_CreateStream, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3936, PATCH), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl index 85e8431f9..10b996142 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl @@ -585,7 +585,7 @@ OOVPATable DSound_4432[] = { REGISTER_OOVPA(DirectSoundCreate, 4361, PATCH), REGISTER_OOVPA(DirectSoundDoWork, 4432, PATCH), REGISTER_OOVPA(DirectSoundGetSampleTime, 4432, PATCH), - REGISTER_OOVPA(IDirectSound8_CreateStream, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 4361, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 1d944f0ea..6c4e5d5e5 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -3001,7 +3001,7 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(IDirectSoundBuffer_LockA, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), - REGISTER_OOVPA(IDirectSound8_CreateStream, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3936, PATCH), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 4361, XREF), REGISTER_OOVPA(CMcpxStream_Pause, 4928, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index 2b241d114..30764c5c6 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -2145,7 +2145,7 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5558, XREF), REGISTER_OOVPA(IDirectSound8_SetVelocity, 5558, ALIAS, IDirectSound_SetVelocity), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_CreateStream, 5558, ALIAS, IDirectSound_CreateSoundStream), + REGISTER_OOVPA(IDirectSound_CreateSoundStream, 5558, PATCH), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetEG, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetEG, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetEG, 5558, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index 53c7c96e9..d103051c1 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -1761,7 +1761,7 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPitch, 5788, PATCH), REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 5788, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_CreateStream, 5558, ALIAS, IDirectSound_CreateSoundStream), + REGISTER_OOVPA(IDirectSound_CreateSoundStream, 5558, PATCH), REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play2, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Play, 5788, PATCH),