From 225cbd7a8849b2b66bb9f30a486d9259134b9c6e Mon Sep 17 00:00:00 2001 From: jarupxx Date: Thu, 16 Feb 2017 17:53:16 +0900 Subject: [PATCH 1/7] Renamed CDirectSound prefix to DirectSound_CDirectSound --- src/CxbxKrnl/EmuDSound.cpp | 214 ++--- src/CxbxKrnl/EmuDSound.h | 132 +-- src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl | 946 +++++++++---------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl | 184 ++-- src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl | 184 ++-- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 580 ++++++------ src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl | 192 ++-- src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl | 292 +++--- src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl | 90 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl | 56 +- 10 files changed, 1435 insertions(+), 1435 deletions(-) diff --git a/src/CxbxKrnl/EmuDSound.cpp b/src/CxbxKrnl/EmuDSound.cpp index 620841e43..cfbdbc43b 100644 --- a/src/CxbxKrnl/EmuDSound.cpp +++ b/src/CxbxKrnl/EmuDSound.cpp @@ -65,16 +65,16 @@ XTL::X_CMcpxStream::_vtbl XTL::X_CMcpxStream::vtbl = XTL::X_CDirectSoundStream::_vtbl XTL::X_CDirectSoundStream::vtbl = { - &XTL::EMUPATCH(CDirectSoundStream_AddRef), // 0x00 - &XTL::EMUPATCH(CDirectSoundStream_Release), // 0x04 + &XTL::EMUPATCH(DirectSound_CDirectSoundStream_AddRef), // 0x00 + &XTL::EMUPATCH(DirectSound_CDirectSoundStream_Release), // 0x04 /* STDMETHOD(GetInfo)(THIS_ LPXMEDIAINFO pInfo) PURE; */ - &XTL::EMUPATCH(CDirectSoundStream_GetInfo), // 0x08 - &XTL::EMUPATCH(CDirectSoundStream_GetStatus), // 0x0C - &XTL::EMUPATCH(CDirectSoundStream_Process), // 0x10 - &XTL::EMUPATCH(CDirectSoundStream_Discontinuity), // 0x14 - &XTL::EMUPATCH(CDirectSoundStream_Flush), // 0x18 + &XTL::EMUPATCH(DirectSound_CDirectSoundStream_GetInfo), // 0x08 + &XTL::EMUPATCH(DirectSound_CDirectSoundStream_GetStatus), // 0x0C + &XTL::EMUPATCH(DirectSound_CDirectSoundStream_Process), // 0x10 + &XTL::EMUPATCH(DirectSound_CDirectSoundStream_Discontinuity), // 0x14 + &XTL::EMUPATCH(DirectSound_CDirectSoundStream_Flush), // 0x18 0xBEEFB003, // 0x1C 0xBEEFB004, // 0x20 0xBEEFB005, // 0x24 @@ -363,9 +363,9 @@ ULONG WINAPI XTL::EMUPATCH(IDirectSound8_Release) } // ****************************************************************** -// * patch: CDirectSound_GetSpeakerConfig +// * patch: DirectSound_CDirectSound_GetSpeakerConfig // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSound_GetSpeakerConfig) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSound_GetSpeakerConfig) ( X_CDirectSound *pThis, PDWORD pdwSpeakerConfig @@ -373,7 +373,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSound_GetSpeakerConfig) { - DbgPrintf("EmuDSound: EmuCDirectSound_GetSpeakerConfig\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSound_GetSpeakerConfig\n" "(\n" " pThis : 0x%.08X\n" " pdwSpeakerConfig : 0x%.08X\n" @@ -767,14 +767,14 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetAllParameters) } // ****************************************************************** -// * patch: CDirectSound_CommitDeferredSettings +// * patch: DirectSound_CDirectSound_CommitDeferredSettings // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSound_CommitDeferredSettings) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSound_CommitDeferredSettings) ( X_CDirectSound *pThis ) { - DbgPrintf("EmuDSound: EmuCDirectSound_CommitDeferredSettings\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSound_CommitDeferredSettings\n" "(\n" " pThis : 0x%.08X\n" ");\n", @@ -1717,13 +1717,13 @@ VOID WINAPI XTL::EMUPATCH(CMcpxStream_Dummy_0x10)(DWORD dwDummy1, DWORD dwDummy2 } // ****************************************************************** -// * patch: CDirectSoundStream_SetVolume +// * patch: DirectSound_CDirectSoundStream_SetVolume // ****************************************************************** -ULONG WINAPI XTL::EMUPATCH(CDirectSoundStream_SetVolume)(X_CDirectSoundStream *pThis, LONG lVolume) +ULONG WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetVolume)(X_CDirectSoundStream *pThis, LONG lVolume) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetVolume\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetVolume\n" "(\n" " pThis : 0x%.08X\n" " lVolume : %d\n" @@ -1738,9 +1738,9 @@ ULONG WINAPI XTL::EMUPATCH(CDirectSoundStream_SetVolume)(X_CDirectSoundStream *p } // ****************************************************************** -// * patch: CDirectSoundStream_SetRolloffFactor +// * patch: DirectSound_CDirectSoundStream_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetRolloffFactor) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetRolloffFactor) ( X_CDirectSoundStream *pThis, FLOAT fRolloffFactor, @@ -1749,7 +1749,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetRolloffFactor) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetRolloffFactor\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetRolloffFactor\n" "(\n" " pThis : 0x%.08X\n" " fRolloffFactor : %f\n" @@ -1765,13 +1765,13 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetRolloffFactor) } // ****************************************************************** -// * patch: CDirectSoundStream_AddRef +// * patch: DirectSound_CDirectSoundStream_AddRef // ****************************************************************** -ULONG WINAPI XTL::EMUPATCH(CDirectSoundStream_AddRef)(X_CDirectSoundStream *pThis) +ULONG WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_AddRef)(X_CDirectSoundStream *pThis) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_AddRef\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_AddRef\n" "(\n" " pThis : 0x%.08X\n" ");\n", @@ -1787,13 +1787,13 @@ ULONG WINAPI XTL::EMUPATCH(CDirectSoundStream_AddRef)(X_CDirectSoundStream *pThi } // ****************************************************************** -// * patch: CDirectSoundStream_Release +// * patch: DirectSound_CDirectSoundStream_Release // ****************************************************************** -ULONG WINAPI XTL::EMUPATCH(CDirectSoundStream_Release)(X_CDirectSoundStream *pThis) +ULONG WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_Release)(X_CDirectSoundStream *pThis) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_Release\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_Release\n" "(\n" " pThis : 0x%.08X\n" ");\n", @@ -1829,9 +1829,9 @@ ULONG WINAPI XTL::EMUPATCH(CDirectSoundStream_Release)(X_CDirectSoundStream *pTh } // ****************************************************************** -// * patch: CDirectSoundStream_GetInfo +// * patch: DirectSound_CDirectSoundStream_GetInfo // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_GetInfo) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_GetInfo) ( X_CDirectSoundStream* pThis, LPXMEDIAINFO pInfo @@ -1839,7 +1839,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_GetInfo) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_GetInfo\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_GetInfo\n" "(\n" " pThis : 0x%.08X\n" " pInfo : 0x%.08X\n" @@ -1847,7 +1847,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_GetInfo) pThis, pInfo); // TODO: A (real) implementation? - EmuWarning("EmuCDirectSoundStream_GetInfo is not yet supported!"); + EmuWarning("EmuDirectSound_CDirectSoundStream_GetInfo is not yet supported!"); if( pInfo ) { @@ -1863,9 +1863,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_GetInfo) } // ****************************************************************** -// * patch: CDirectSoundStream_GetStatus +// * patch: DirectSound_CDirectSoundStream_GetStatus // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_GetStatus) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_GetStatus) ( X_CDirectSoundStream *pThis, DWORD *pdwStatus @@ -1873,14 +1873,14 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_GetStatus) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_GetStatus\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_GetStatus\n" "(\n" " pThis : 0x%.08X\n" " pdwStatus : 0x%.08X\n" ");\n", pThis, pdwStatus); - EmuWarning("EmuCDirectSoundStream_GetStatus is not yet implemented"); + EmuWarning("EmuDirectSound_CDirectSoundStream_GetStatus is not yet implemented"); *pdwStatus = DSBSTATUS_PLAYING; @@ -1890,9 +1890,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_GetStatus) } // ****************************************************************** -// * patch: CDirectSoundStream_Process +// * patch: DirectSound_CDirectSoundStream_Process // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Process) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_Process) ( X_CDirectSoundStream *pThis, PXMEDIAPACKET pInputBuffer, @@ -1901,7 +1901,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Process) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_Process\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_Process\n" "(\n" " pThis : 0x%.08X\n" " pInputBuffer : 0x%.08X\n" @@ -1933,13 +1933,13 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Process) } // ****************************************************************** -// * patch: CDirectSoundStream_Discontinuity +// * patch: DirectSound_CDirectSoundStream_Discontinuity // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Discontinuity)(X_CDirectSoundStream *pThis) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_Discontinuity)(X_CDirectSoundStream *pThis) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_Discontinuity\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_Discontinuity\n" "(\n" " pThis : 0x%.08X\n" ");\n", @@ -1953,13 +1953,13 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Discontinuity)(X_CDirectSoundStr } // ****************************************************************** -// * patch: CDirectSoundStream_Flush +// * patch: DirectSound_CDirectSoundStream_Flush // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Flush)(X_CDirectSoundStream *pThis) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_Flush)(X_CDirectSoundStream *pThis) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_Flush\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_Flush\n" "(\n" " pThis : 0x%.08X\n" ");\n", @@ -1973,13 +1973,13 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Flush)(X_CDirectSoundStream *pTh } // ****************************************************************** -// * patch: CDirectSound_SynchPlayback +// * patch: DirectSound_CDirectSound_SynchPlayback // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSound_SynchPlayback)(PVOID pUnknown) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSound_SynchPlayback)(PVOID pUnknown) { - DbgPrintf("EmuDSound: EmuCDirectSound_SynchPlayback\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSound_SynchPlayback\n" "(\n" " pUnknown : 0x%.08X\n" ");\n", @@ -1991,9 +1991,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSound_SynchPlayback)(PVOID pUnknown) } // ****************************************************************** -// * patch: CDirectSoundStream_Pause +// * patch: DirectSound_CDirectSoundStream_Pause // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Pause) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_Pause) ( PVOID pStream, DWORD dwPause @@ -2001,7 +2001,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Pause) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_Pause\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_Pause\n" "(\n" " pStream : 0x%.08X\n" " dwPause : 0x%.08X\n" @@ -2039,9 +2039,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_SetHeadroom) } // ****************************************************************** -// * patch: CDirectSoundStream_SetConeAngles +// * patch: DirectSound_CDirectSoundStream_SetConeAngles // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeAngles) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetConeAngles) ( PVOID pThis, DWORD dwInsideConeAngle, @@ -2051,7 +2051,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeAngles) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetConeAngles\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetConeAngles\n" "(\n" " pThis : 0x%.08X\n" " dwInsideConeAngle : 0x%.08X\n" @@ -2068,9 +2068,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeAngles) } // ****************************************************************** -// * patch: CDirectSoundStream_SetConeOutsideVolume +// * patch: DirectSound_CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetConeOutsideVolume) ( PVOID pThis, LONG lConeOutsideVolume, @@ -2079,7 +2079,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetConeOutsideVolume\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetConeOutsideVolume\n" "(\n" " pThis : 0x%.08X\n" " lConeOutsideVolume : %d\n" @@ -2095,9 +2095,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) } // ****************************************************************** -// * patch: CDirectSoundStream_SetAllParameters +// * patch: DirectSound_CDirectSoundStream_SetAllParameters // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetAllParameters) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetAllParameters) ( PVOID pThis, PVOID pUnknown, @@ -2106,7 +2106,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetAllParameters) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetAllParameters\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetAllParameters\n" "(\n" " pThis : 0x%.08X\n" " pUnknown : %f\n" @@ -2122,9 +2122,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetAllParameters) } // ****************************************************************** -// * patch: CDirectSoundStream_SetMaxDistance +// * patch: DirectSound_CDirectSoundStream_SetMaxDistance // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMaxDistance) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetMaxDistance) ( PVOID pThis, D3DVALUE fMaxDistance, @@ -2133,7 +2133,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMaxDistance) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetMaxDistance\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetMaxDistance\n" "(\n" " pThis : 0x%.08X\n" " fMaxDistance : %f\n" @@ -2149,9 +2149,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMaxDistance) } // ****************************************************************** -// * patch: CDirectSoundStream_SetMinDistance +// * patch: DirectSound_CDirectSoundStream_SetMinDistance // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMinDistance) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetMinDistance) ( PVOID pThis, D3DVALUE fMinDistance, @@ -2160,7 +2160,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMinDistance) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetMinDistance\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetMinDistance\n" "(\n" " pThis : 0x%.08X\n" " fMinDistance : %f\n" @@ -2176,9 +2176,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMinDistance) } // ****************************************************************** -// * patch: CDirectSoundStream_SetVelocity +// * patch: DirectSound_CDirectSoundStream_SetVelocity // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetVelocity) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetVelocity) ( PVOID pThis, D3DVALUE x, @@ -2189,7 +2189,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetVelocity) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetVelocity\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetVelocity\n" "(\n" " pThis : 0x%.08X\n" " x : %f\n" @@ -2207,9 +2207,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetVelocity) } // ****************************************************************** -// * patch: CDirectSoundStream_SetConeOrientation +// * patch: DirectSound_CDirectSoundStream_SetConeOrientation // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeOrientation) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetConeOrientation) ( PVOID pThis, D3DVALUE x, @@ -2220,7 +2220,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeOrientation) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetConeOrientation\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetConeOrientation\n" "(\n" " pThis : 0x%.08X\n" " x : %f\n" @@ -2238,9 +2238,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeOrientation) } // ****************************************************************** -// * patch: CDirectSoundStream_SetPosition +// * patch: DirectSound_CDirectSoundStream_SetPosition // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetPosition) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetPosition) ( PVOID pThis, D3DVALUE x, @@ -2251,7 +2251,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetPosition) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetPosition\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetPosition\n" "(\n" " pThis : 0x%.08X\n" " x : %f\n" @@ -2269,9 +2269,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetPosition) } // ****************************************************************** -// * patch: CDirectSoundStream_SetFrequency +// * patch: DirectSound_CDirectSoundStream_SetFrequency // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetFrequency) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetFrequency) ( PVOID pThis, DWORD dwFrequency @@ -2279,7 +2279,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetFrequency) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetFrequency\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetFrequency\n" "(\n" " pThis : 0x%.08X\n" " dwFrequency : %d\n" @@ -2321,9 +2321,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_SetI3DL2Source) } // ****************************************************************** -// * patch: CDirectSoundStream_SetMixBins +// * patch: DirectSound_CDirectSoundStream_SetMixBins // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBins) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetMixBins) ( PVOID pThis, PVOID pMixBins @@ -2331,7 +2331,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBins) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetMixBins\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetMixBins\n" "(\n" " pThis : 0x%.08X\n" " pMixBins : 0x%.08X\n" @@ -3006,9 +3006,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetOutputLevels) } // ****************************************************************** -// * patch: CDirectSoundStream_SetEG +// * patch: DirectSound_CDirectSoundStream_SetEG // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetEG) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetEG) ( LPVOID pThis, LPVOID pEnvelopeDesc @@ -3016,7 +3016,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetEG) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetEG\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetEG\n" "(\n" " pThis : 0x%.08X\n" " pEnvelopeDesc : 0x%.08X\n" @@ -3074,9 +3074,9 @@ extern "C" HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_FlushEx) } // ****************************************************************** -// * patch: CDirectSoundStream_SetMode +// * patch: DirectSound_CDirectSoundStream_SetMode // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMode) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetMode) ( X_CDirectSoundStream *pStream, DWORD dwMode, @@ -3085,7 +3085,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMode) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetFormat\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetFormat\n" "(\n" " pStream : 0x%.08X\n" " dwMode : 0x%.08X\n" @@ -3095,7 +3095,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMode) HRESULT hRet = DS_OK; - EmuWarning("EmuCDirectSoundStream_SetMode ignored"); + EmuWarning("EmuDirectSound_CDirectSoundStream_SetMode ignored"); @@ -3157,9 +3157,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_SetFilter) } // ****************************************************************** -// * patch: CDirectSoundStream_SetFilter +// * patch: DirectSound_CDirectSoundStream_SetFilter // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetFilter) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetFilter) ( X_CDirectSoundStream* pThis, X_DSFILTERDESC* pFilterDesc @@ -3167,7 +3167,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetFilter) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetFilter\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetFilter\n" "(\n" " pThis : 0x%.08X\n" " pFilterDesc : 0x%.08X\n" @@ -3262,7 +3262,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetCaps) // ****************************************************************** // * patch: IDirectSoundStream_SetPitch // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetPitch) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetPitch) ( X_CDirectSoundStream* pThis, LONG lPitch @@ -3311,9 +3311,9 @@ DWORD WINAPI XTL::EMUPATCH(DirectSoundGetSampleTime)() } // ****************************************************************** -// * patch: CDirectSoundStream_SetMixBinVolumes +// * patch: DirectSound_CDirectSoundStream_SetMixBinVolumes // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBinVolumes) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetMixBinVolumes) ( X_CDirectSoundStream* pThis, DWORD dwMixBinMask, @@ -3322,7 +3322,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBinVolumes) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetMixBinVolumes\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetMixBinVolumes\n" "(\n" " pThis : 0x%.08X\n" " dwMixBinMask : 0x%.08X\n" @@ -3339,9 +3339,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBinVolumes) } // ****************************************************************** -// * patch: CDirectSoundStream_SetMixBinVolumes2 +// * patch: DirectSound_CDirectSoundStream_SetMixBinVolumes2 // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBinVolumes2) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetMixBinVolumes2) ( X_CDirectSoundStream* pThis, LPVOID pMixBins @@ -3349,7 +3349,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBinVolumes2) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetMixBinVolumes\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetMixBinVolumes\n" "(\n" " pThis : 0x%.08X\n" " pMixBins : 0x%.08X\n" @@ -3364,9 +3364,9 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBinVolumes2) } // ****************************************************************** -// * patch: CDirectSoundStream_SetI3DL2Source +// * patch: DirectSound_CDirectSoundStream_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetI3DL2Source) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetI3DL2Source) ( X_CDirectSoundStream* pThis, PVOID pds3db, @@ -3375,7 +3375,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetI3DL2Source) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetI3DL2Source\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetI3DL2Source\n" "(\n" " pThis : 0x%.08X\n" " pds3db : 0x%.08X\n" @@ -3418,9 +3418,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_SetAllParameters) } // ****************************************************************** -// * patch: CDirectSoundStream::SetFormat +// * patch: DirectSound_CDirectSoundStream::SetFormat // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetFormat) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetFormat) ( X_CDirectSoundStream* pThis, LPCWAVEFORMATEX pwfxFormat @@ -3428,7 +3428,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetFormat) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetFormat\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetFormat\n" "(\n" " pThis : 0x%.08X\n" " pwfxFormat : 0x%.08X\n" @@ -3475,9 +3475,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_SetOutputBuffer) } // ****************************************************************** -// * patch: CDirectSoundStream_SetOutputBuffer +// * patch: DirectSound_CDirectSoundStream_SetOutputBuffer // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetOutputBuffer) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetOutputBuffer) ( X_CDirectSoundStream* pThis, X_CDirectSoundBuffer* pOutputBuffer @@ -3485,7 +3485,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetOutputBuffer) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetOutputBuffer\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetOutputBuffer\n" "(\n" " pThis : 0x%.08X\n" " pOutputBuffer : 0x%.08X\n" @@ -3662,9 +3662,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_SetNotificationPositions) } // ****************************************************************** -// * patch: CDirectSoundStream::SetRolloffCurve +// * patch: DirectSound_CDirectSoundStream::SetRolloffCurve // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetRolloffCurve) +HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetRolloffCurve) ( X_CDirectSoundBuffer *pThis, const FLOAT *pflPoints, @@ -3674,7 +3674,7 @@ HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetRolloffCurve) { - DbgPrintf("EmuDSound: EmuCDirectSoundStream_SetRolloffCurve\n" + DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetRolloffCurve\n" "(\n" " pThis : 0x%.08X\n" " pflPoints : 0x%.08X\n" diff --git a/src/CxbxKrnl/EmuDSound.h b/src/CxbxKrnl/EmuDSound.h index 5669ec14a..b470cd846 100644 --- a/src/CxbxKrnl/EmuDSound.h +++ b/src/CxbxKrnl/EmuDSound.h @@ -456,9 +456,9 @@ ULONG WINAPI EMUPATCH(IDirectSound8_Release) ); // ****************************************************************** -// * patch: CDirectSound_GetSpeakerConfig +// * patch: DirectSound_CDirectSound_GetSpeakerConfig // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSound_GetSpeakerConfig) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSound_GetSpeakerConfig) ( X_CDirectSound *pThis, PDWORD pdwSpeakerConfig @@ -611,9 +611,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_SetAllParameters) ); // ****************************************************************** -// * patch: CDirectSound_CommitDeferredSettings +// * patch: DirectSound_CDirectSound_CommitDeferredSettings // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSound_CommitDeferredSettings) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSound_CommitDeferredSettings) ( X_CDirectSound *pThis ); @@ -840,14 +840,14 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_CreateStream) VOID WINAPI EMUPATCH(CMcpxStream_Dummy_0x10)(DWORD dwDummy1, DWORD dwDummy2); // ****************************************************************** -// * patch: CDirectSoundStream_SetVolume +// * patch: DirectSound_CDirectSoundStream_SetVolume // ****************************************************************** -ULONG WINAPI EMUPATCH(CDirectSoundStream_SetVolume)(X_CDirectSoundStream *pThis, LONG lVolume); +ULONG WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetVolume)(X_CDirectSoundStream *pThis, LONG lVolume); // ****************************************************************** -// * patch: CDirectSoundStream_SetRolloffFactor +// * patch: DirectSound_CDirectSoundStream_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetRolloffFactor) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetRolloffFactor) ( X_CDirectSoundStream *pThis, FLOAT fRolloffFactor, @@ -855,37 +855,37 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetRolloffFactor) ); // ****************************************************************** -// * patch: CDirectSoundStream_AddRef +// * patch: DirectSound_CDirectSoundStream_AddRef // ****************************************************************** -ULONG WINAPI EMUPATCH(CDirectSoundStream_AddRef)(X_CDirectSoundStream *pThis); +ULONG WINAPI EMUPATCH(DirectSound_CDirectSoundStream_AddRef)(X_CDirectSoundStream *pThis); // ****************************************************************** -// * patch: CDirectSoundStream_Release +// * patch: DirectSound_CDirectSoundStream_Release // ****************************************************************** -ULONG WINAPI EMUPATCH(CDirectSoundStream_Release)(X_CDirectSoundStream *pThis); +ULONG WINAPI EMUPATCH(DirectSound_CDirectSoundStream_Release)(X_CDirectSoundStream *pThis); // ****************************************************************** -// * EmuCDirectSoundStream_GetInfo +// * EmuDirectSound_CDirectSoundStream_GetInfo // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_GetInfo) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_GetInfo) ( X_CDirectSoundStream* pThis, LPXMEDIAINFO pInfo ); // ****************************************************************** -// * patch: CDirectSoundStream_GetStatus +// * patch: DirectSound_CDirectSoundStream_GetStatus // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_GetStatus) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_GetStatus) ( X_CDirectSoundStream *pThis, DWORD *pdwStatus ); // ****************************************************************** -// * patch: CDirectSoundStream_Process +// * patch: DirectSound_CDirectSoundStream_Process // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_Process) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_Process) ( X_CDirectSoundStream *pThis, PXMEDIAPACKET pInputBuffer, @@ -893,24 +893,24 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_Process) ); // ****************************************************************** -// * patch: CDirectSoundStream_Discontinuity +// * patch: DirectSound_CDirectSoundStream_Discontinuity // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_Discontinuity)(X_CDirectSoundStream *pThis); +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_Discontinuity)(X_CDirectSoundStream *pThis); // ****************************************************************** -// * patch: CDirectSoundStream_Flush +// * patch: DirectSound_CDirectSoundStream_Flush // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_Flush)(X_CDirectSoundStream *pThis); +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_Flush)(X_CDirectSoundStream *pThis); // ****************************************************************** -// * patch: CDirectSound_SynchPlayback +// * patch: DirectSound_CDirectSound_SynchPlayback // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSound_SynchPlayback)(PVOID pUnknown); +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSound_SynchPlayback)(PVOID pUnknown); // ****************************************************************** -// * patch: CDirectSoundStream_Pause +// * patch: DirectSound_CDirectSoundStream_Pause // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_Pause) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_Pause) ( PVOID pStream, DWORD dwPause @@ -926,9 +926,9 @@ HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetHeadroom) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetAllParameters +// * patch: DirectSound_CDirectSoundStream_SetAllParameters // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetAllParameters) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetAllParameters) ( PVOID pThis, PVOID pUnknown, @@ -936,9 +936,9 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetAllParameters) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetConeAngles +// * patch: DirectSound_CDirectSoundStream_SetConeAngles // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeAngles) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetConeAngles) ( PVOID pThis, DWORD dwInsideConeAngle, @@ -947,9 +947,9 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeAngles) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetConeOutsideVolume +// * patch: DirectSound_CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetConeOutsideVolume) ( PVOID pThis, LONG lConeOutsideVolume, @@ -957,9 +957,9 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetMaxDistance +// * patch: DirectSound_CDirectSoundStream_SetMaxDistance // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMaxDistance) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetMaxDistance) ( PVOID pThis, D3DVALUE fMaxDistance, @@ -967,9 +967,9 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMaxDistance) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetMinDistance +// * patch: DirectSound_CDirectSoundStream_SetMinDistance // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMinDistance) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetMinDistance) ( PVOID pThis, D3DVALUE fMinDistance, @@ -977,9 +977,9 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMinDistance) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetVelocity +// * patch: DirectSound_CDirectSoundStream_SetVelocity // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetVelocity) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetVelocity) ( PVOID pThis, D3DVALUE x, @@ -989,9 +989,9 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetVelocity) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetConeOrientation +// * patch: DirectSound_CDirectSoundStream_SetConeOrientation // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeOrientation) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetConeOrientation) ( PVOID pThis, D3DVALUE x, @@ -1001,9 +1001,9 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeOrientation) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetPosition +// * patch: DirectSound_CDirectSoundStream_SetPosition // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetPosition) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetPosition) ( PVOID pThis, D3DVALUE x, @@ -1013,9 +1013,9 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetPosition) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetFrequency +// * patch: DirectSound_CDirectSoundStream_SetFrequency // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFrequency) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetFrequency) ( PVOID pThis, DWORD dwFrequency @@ -1032,9 +1032,9 @@ HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetI3DL2Source) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetMixBins +// * patch: DirectSound_CDirectSoundStream_SetMixBins // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBins) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetMixBins) ( PVOID pThis, PVOID pMixBins @@ -1283,9 +1283,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_GetOutputLevels) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetEG +// * patch: DirectSound_CDirectSoundStream_SetEG // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetEG) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetEG) ( LPVOID pThis, LPVOID pEnvelopeDesc @@ -1307,9 +1307,9 @@ extern "C" HRESULT WINAPI EMUPATCH(IDirectSoundStream_FlushEx) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetMode +// * patch: DirectSound_CDirectSoundStream_SetMode // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMode) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetMode) ( X_CDirectSoundStream *pStream, DWORD dwMode, @@ -1337,9 +1337,9 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetFilter) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetFilter +// * patch: DirectSound_CDirectSoundStream_SetFilter // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFilter) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetFilter) ( X_CDirectSoundStream* pThis, X_DSFILTERDESC* pFilterDesc @@ -1355,9 +1355,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_GetCaps) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetPitch +// * patch: DirectSound_CDirectSoundStream_SetPitch // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetPitch) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetPitch) ( X_CDirectSoundStream* pThis, LONG lPitch @@ -1369,9 +1369,9 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetPitch) DWORD WINAPI EMUPATCH(DirectSoundGetSampleTime)(); // ****************************************************************** -// * patch: CDirectSoundStream_SetMixBinVolumes +// * patch: DirectSound_CDirectSoundStream_SetMixBinVolumes // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBinVolumes) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetMixBinVolumes) ( X_CDirectSoundStream* pThis, DWORD dwMixBinMask, @@ -1379,18 +1379,18 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBinVolumes) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetMixBinVolumes2 +// * patch: DirectSound_CDirectSoundStream_SetMixBinVolumes2 // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBinVolumes2) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetMixBinVolumes2) ( X_CDirectSoundStream* pThis, LPVOID pMixBins ); // ****************************************************************** -// * patch: CDirectSoundStream_SetI3DL2Source +// * patch: DirectSound_CDirectSoundStream_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetI3DL2Source) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetI3DL2Source) ( X_CDirectSoundStream* pThis, PVOID pds3db, @@ -1408,9 +1408,9 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetAllParameters) ); // ****************************************************************** -// * patch: CDirectSoundStream::SetFormat +// * patch: DirectSound_CDirectSoundStream::SetFormat // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFormat) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetFormat) ( X_CDirectSoundStream* pThis, LPCWAVEFORMATEX pwfxFormat @@ -1426,9 +1426,9 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetOutputBuffer) ); // ****************************************************************** -// * patch: CDirectSoundStream_SetOutputBuffer +// * patch: DirectSound_CDirectSoundStream_SetOutputBuffer // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetOutputBuffer) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetOutputBuffer) ( X_CDirectSoundStream* pThis, X_CDirectSoundBuffer* pOutputBuffer @@ -1485,9 +1485,9 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetNotificationPositions) ); // ****************************************************************** -// * patch: CDirectSoundStream::SetRolloffCurve +// * patch: DirectSound_CDirectSoundStream::SetRolloffCurve // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetRolloffCurve) +HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetRolloffCurve) ( X_CDirectSoundBuffer *pThis, const FLOAT *pflPoints, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl index 586b3ef71..66546ff37 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl @@ -135,14 +135,14 @@ OOVPA_XREF(DirectSoundDoWork, 3936, 9, OOVPA_END; // ****************************************************************** -// * CDirectSound::CreateSoundStream +// * DirectSound_CDirectSound::CreateSoundStream // ****************************************************************** -OOVPA_XREF(CDirectSound_CreateSoundStream, 3936, 16, +OOVPA_XREF(DirectSound_CDirectSound_CreateSoundStream, 3936, 16, XREF_DSCREATESOUNDSTREAM, XRefZero) - // CDirectSound_CreateSoundStream+0x2D : and esi, 0x7FF8FFF2 + // DirectSound_CDirectSound_CreateSoundStream+0x2D : and esi, 0x7FF8FFF2 { 0x2D, 0x81 }, // (Offset,Value)-Pair #1 { 0x2E, 0xE6 }, // (Offset,Value)-Pair #2 { 0x2F, 0xF2 }, // (Offset,Value)-Pair #3 @@ -150,7 +150,7 @@ OOVPA_XREF(CDirectSound_CreateSoundStream, 3936, 16, { 0x31, 0xF8 }, // (Offset,Value)-Pair #5 { 0x32, 0x7F }, // (Offset,Value)-Pair #6 - // CDirectSound_CreateSoundStream+0x33 : add esi, 0x8007000E + // DirectSound_CDirectSound_CreateSoundStream+0x33 : add esi, 0x8007000E { 0x33, 0x81 }, // (Offset,Value)-Pair #7 { 0x34, 0xC6 }, // (Offset,Value)-Pair #8 { 0x35, 0x0E }, // (Offset,Value)-Pair #9 @@ -158,11 +158,11 @@ OOVPA_XREF(CDirectSound_CreateSoundStream, 3936, 16, { 0x37, 0x07 }, // (Offset,Value)-Pair #11 { 0x38, 0x80 }, // (Offset,Value)-Pair #12 - // CDirectSound_CreateSoundStream+0x3C : js +0x16 + // DirectSound_CDirectSound_CreateSoundStream+0x3C : js +0x16 { 0x3C, 0x78 }, // (Offset,Value)-Pair #13 { 0x3D, 0x16 }, // (Offset,Value)-Pair #14 - // CDirectSound_CreateSoundStream+0x72 : retn 0x10 + // DirectSound_CDirectSound_CreateSoundStream+0x72 : retn 0x10 { 0x72, 0xC2 }, // (Offset,Value)-Pair #15 { 0x73, 0x10 }, // (Offset,Value)-Pair #16 OOVPA_END; @@ -197,14 +197,14 @@ OOVPA_XREF(IDirectSound8_CreateStream, 3936, 10, OOVPA_END; // ****************************************************************** -// * CDirectSound::CreateSoundBuffer +// * DirectSound_CDirectSound::CreateSoundBuffer // ****************************************************************** -OOVPA_XREF(CDirectSound_CreateSoundBuffer, 3936, 16, +OOVPA_XREF(DirectSound_CDirectSound_CreateSoundBuffer, 3936, 16, XREF_DSCREATESOUNDBUFFER, XRefZero) - // CDirectSound_CreateSoundBuffer+0x2D : and esi, 0x7FF8FFF2 + // DirectSound_CDirectSound_CreateSoundBuffer+0x2D : and esi, 0x7FF8FFF2 { 0x2D, 0x81 }, // (Offset,Value)-Pair #1 { 0x2E, 0xE6 }, // (Offset,Value)-Pair #2 { 0x2F, 0xF2 }, // (Offset,Value)-Pair #3 @@ -212,7 +212,7 @@ OOVPA_XREF(CDirectSound_CreateSoundBuffer, 3936, 16, { 0x31, 0xF8 }, // (Offset,Value)-Pair #5 { 0x32, 0x7F }, // (Offset,Value)-Pair #6 - // CDirectSound_CreateSoundBuffer+0x33 : add esi, 0x8007000E + // DirectSound_CDirectSound_CreateSoundBuffer+0x33 : add esi, 0x8007000E { 0x33, 0x81 }, // (Offset,Value)-Pair #7 { 0x34, 0xC6 }, // (Offset,Value)-Pair #8 { 0x35, 0x0E }, // (Offset,Value)-Pair #9 @@ -220,11 +220,11 @@ OOVPA_XREF(CDirectSound_CreateSoundBuffer, 3936, 16, { 0x37, 0x07 }, // (Offset,Value)-Pair #11 { 0x38, 0x80 }, // (Offset,Value)-Pair #12 - // CDirectSound_CreateSoundBuffer+0x3C : js +0x21 + // DirectSound_CDirectSound_CreateSoundBuffer+0x3C : js +0x21 { 0x3C, 0x78 }, // (Offset,Value)-Pair #13 { 0x3D, 0x21 }, // (Offset,Value)-Pair #14 - // CDirectSound_CreateSoundBuffer+0x7D : retn 0x10 + // DirectSound_CDirectSound_CreateSoundBuffer+0x7D : retn 0x10 { 0x7D, 0xC2 }, // (Offset,Value)-Pair #15 { 0x7E, 0x10 }, // (Offset,Value)-Pair #16 OOVPA_END; @@ -396,28 +396,28 @@ OOVPA_XREF(CMcpxBuffer_GetStatus, 3936, 13, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::GetStatus +// * DirectSound_CDirectSoundBuffer::GetStatus // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetStatus, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_GetStatus, 3936, 10, XREF_DSBUFFERGETSTATUSA, XRefOne) - // CDirectSoundBuffer_GetStatus+0x14 : call [CMcpxBuffer::GetStatus] + // DirectSound_CDirectSoundBuffer_GetStatus+0x14 : call [CMcpxBuffer::GetStatus] XREF_ENTRY( 0x15, XREF_DSBUFFERGETSTATUSB ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_GetStatus+0x07 : push [esp+0x10] + // DirectSound_CDirectSoundBuffer_GetStatus+0x07 : push [esp+0x10] { 0x07, 0xFF }, // (Offset,Value)-Pair #2 { 0x08, 0x74 }, // (Offset,Value)-Pair #3 { 0x09, 0x24 }, // (Offset,Value)-Pair #4 { 0x0A, 0x10 }, // (Offset,Value)-Pair #5 - // CDirectSoundBuffer_GetStatus+0x11 : mov ecx, [eax+0x20] + // DirectSound_CDirectSoundBuffer_GetStatus+0x11 : mov ecx, [eax+0x20] { 0x11, 0x8B }, // (Offset,Value)-Pair #6 { 0x12, 0x48 }, // (Offset,Value)-Pair #7 { 0x13, 0x20 }, // (Offset,Value)-Pair #8 - // CDirectSoundBuffer_GetStatus+0x2E : retn 0x08 + // DirectSound_CDirectSoundBuffer_GetStatus+0x2E : retn 0x08 { 0x2E, 0xC2 }, // (Offset,Value)-Pair #9 { 0x2F, 0x08 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -870,27 +870,27 @@ OOVPA_XREF(CMcpxVoiceClient_SetMixBins, 3936, 15, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetMixBins +// * DirectSound_CDirectSoundVoice::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMixBins, 3936, 9, XREF_DSSETMIXBINSA, XRefOne) - // CDirectSoundVoice_SetMixBins+0x28 : call [CMcpxVoiceClient::SetMixBins] + // DirectSound_CDirectSoundVoice_SetMixBins+0x28 : call [CMcpxVoiceClient::SetMixBins] XREF_ENTRY( 0x29, XREF_DSSETMIXBINSB ), // (Offset,Value)-Pair #1 - // CDirectSoundVoice_SetMixBins+0x11 : mov ecx, [esi+0x18] + // DirectSound_CDirectSoundVoice_SetMixBins+0x11 : mov ecx, [esi+0x18] { 0x11, 0x8B }, // (Offset,Value)-Pair #2 { 0x12, 0x4E }, // (Offset,Value)-Pair #3 { 0x13, 0x18 }, // (Offset,Value)-Pair #4 - // CDirectSoundVoice_SetMixBins+0x25 : mov ecx, [esi+0x14] + // DirectSound_CDirectSoundVoice_SetMixBins+0x25 : mov ecx, [esi+0x14] { 0x25, 0x8B }, // (Offset,Value)-Pair #5 { 0x26, 0x4E }, // (Offset,Value)-Pair #6 { 0x27, 0x14 }, // (Offset,Value)-Pair #7 - // CDirectSoundVoice_SetMixBins+0x55 : retn 0x08 + // DirectSound_CDirectSoundVoice_SetMixBins+0x55 : retn 0x08 { 0x55, 0xC2 }, // (Offset,Value)-Pair #8 { 0x56, 0x08 }, // (Offset,Value)-Pair #9 OOVPA_END; @@ -1004,27 +1004,27 @@ OOVPA_XREF(CMcpxBuffer_GetCurrentPosition2, 3936, 11, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer_GetCurrentPosition +// * DirectSound_CDirectSoundBuffer_GetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 3936, 9, XREF_GETCURRENTPOSITION2, XRefOne) - // CDirectSoundBuffer_GetCurrentPosition+0x19 : call [CMcpxBuffer::GetCurrentPosition] + // DirectSound_CDirectSoundBuffer_GetCurrentPosition+0x19 : call [CMcpxBuffer::GetCurrentPosition] XREF_ENTRY( 0x19, XREF_GETCURRENTPOSITION ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_GetCurrentPosition+0x0D : mov eax, [esp+0x10] + // DirectSound_CDirectSoundBuffer_GetCurrentPosition+0x0D : mov eax, [esp+0x10] { 0x0D, 0x8B }, // (Offset,Value)-Pair #2 { 0x0E, 0x44 }, // (Offset,Value)-Pair #3 { 0x0F, 0x24 }, // (Offset,Value)-Pair #4 { 0x10, 0x10 }, // (Offset,Value)-Pair #5 - // CDirectSoundBuffer_GetCurrentPosition+0x21 : jz +0x0B + // DirectSound_CDirectSoundBuffer_GetCurrentPosition+0x21 : jz +0x0B { 0x21, 0x74 }, // (Offset,Value)-Pair #6 { 0x22, 0x0B }, // (Offset,Value)-Pair #7 - // CDirectSoundBuffer_GetCurrentPosition+0x32 : retn 0x0C + // DirectSound_CDirectSoundBuffer_GetCurrentPosition+0x32 : retn 0x0C { 0x32, 0xC2 }, // (Offset,Value)-Pair #8 { 0x33, 0x0C }, // (Offset,Value)-Pair #9 OOVPA_END; @@ -1055,9 +1055,9 @@ OOVPA_XREF(IDirectSoundBuffer_GetCurrentPosition, 3936, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::Play +// * DirectSound_CDirectSoundBuffer::Play // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 3936, 7, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_Play, 3936, 7, XREF_DSOUNDPLAY, XRefZero) @@ -1079,7 +1079,7 @@ OOVPA_XREF(IDirectSoundBuffer_Play, 3936, 16, XRefNoSaveIndex, XRefOne) - // IDirectSoundBuffer_Play+0x1D : call CDirectSoundBuffer::Play + // IDirectSoundBuffer_Play+0x1D : call DirectSound_CDirectSoundBuffer::Play XREF_ENTRY( 0x1D, XREF_DSOUNDPLAY ), // IDirectSoundBuffer_Play+0x00 : push [esp+0x10] @@ -1116,7 +1116,7 @@ OOVPA_XREF(IDirectSoundBuffer_Play2, 3936, 12, XRefNoSaveIndex, XRefOne) - // IDirectSoundBuffer_Play+0x1D : call CDirectSoundBuffer::Play + // IDirectSoundBuffer_Play+0x1D : call DirectSound_CDirectSoundBuffer::Play XREF_ENTRY( 0x1D, XREF_DSOUNDPLAY ), // IDirectSoundBuffer_Play+0x00 : push [esp+0x10] @@ -1140,14 +1140,14 @@ OOVPA_XREF(IDirectSoundBuffer_Play2, 3936, 12, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer_Stop +// * DirectSound_CDirectSoundBuffer_Stop // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Stop, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_Stop, 3936, 12, XREF_DSOUNDSTOP, XRefZero) - // CDirectSoundBuffer_Stop+0x07 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_Stop+0x07 : mov eax, 0x80004005 { 0x07, 0x6A }, // (Offset,Value)-Pair #1 { 0x08, 0x00 }, // (Offset,Value)-Pair #2 { 0x09, 0x6A }, // (Offset,Value)-Pair #3 @@ -1155,13 +1155,13 @@ OOVPA_XREF(CDirectSoundBuffer_Stop, 3936, 12, { 0x0B, 0x6A }, // (Offset,Value)-Pair #5 { 0x0C, 0x00 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_Stop+0x1A : mov ebx, eax; jz +0x0B + // DirectSound_CDirectSoundBuffer_Stop+0x1A : mov ebx, eax; jz +0x0B { 0x1A, 0x8B }, // (Offset,Value)-Pair #7 { 0x1B, 0xD8 }, // (Offset,Value)-Pair #8 { 0x1C, 0x74 }, // (Offset,Value)-Pair #9 { 0x1D, 0x0B }, // (Offset,Value)-Pair #10 - // CDirectSoundBuffer_Stop+0x2D : retn 0x04 + // DirectSound_CDirectSoundBuffer_Stop+0x2D : retn 0x04 { 0x2D, 0xC2 }, // (Offset,Value)-Pair #11 { 0x2E, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -1221,43 +1221,43 @@ OOVPA_XREF(CMcpxVoiceClient_SetVolume, 3936, 10, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetVolume +// * DirectSound_CDirectSoundStream_SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVolume, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetVolume, 3936, 10, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetVolume+0x0D : call [IDirectSoundStream::SetVolume] + // DirectSound_CDirectSoundStream_SetVolume+0x0D : call [IDirectSoundStream::SetVolume] XREF_ENTRY( 0x0D, XREF_DSSTREAMSETVOLUME ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetVolume+0x04 : mov eax, [esp+0x08] + // DirectSound_CDirectSoundStream_SetVolume+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 - // CDirectSoundStream_SetVolume+0x08 : add eax, 0x04 + // DirectSound_CDirectSoundStream_SetVolume+0x08 : add eax, 0x04 { 0x08, 0x83 }, // (Offset,Value)-Pair #6 { 0x09, 0xC0 }, // (Offset,Value)-Pair #7 { 0x0A, 0x04 }, // (Offset,Value)-Pair #8 - // CDirectSoundStream_SetVolume+0x11 : retn 0x08 + // DirectSound_CDirectSoundStream_SetVolume+0x11 : retn 0x08 { 0x11, 0xC2 }, // (Offset,Value)-Pair #9 { 0x12, 0x08 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetAllParametersB +// * DirectSound_CDirectSoundStream_SetAllParametersB // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetAllParametersB, 3936, 11, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetAllParametersB, 3936, 11, XREF_DSSTREAMSETALLPARAMETERS1B, XRefZero) - // TODO: re-use for CDirectSoundBuffer_SetAllParametersB!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetAllParametersB!? - // CDirectSoundStream_SetAllParametersB+0x10 : or byte ptr [eax+0x80], 0x80 + // DirectSound_CDirectSoundStream_SetAllParametersB+0x10 : or byte ptr [eax+0x80], 0x80 { 0x10, 0x80 }, // (Offset,Value)-Pair #1 { 0x11, 0x88 }, // (Offset,Value)-Pair #2 { 0x12, 0x80 }, // (Offset,Value)-Pair #3 @@ -1266,84 +1266,84 @@ OOVPA_XREF(CDirectSoundStream_SetAllParametersB, 3936, 11, { 0x15, 0x00 }, // (Offset,Value)-Pair #6 { 0x16, 0x80 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetAllParametersB+0x20 : push 0 + // DirectSound_CDirectSoundStream_SetAllParametersB+0x20 : push 0 { 0x20, 0x6A }, // (Offset,Value)-Pair #8 { 0x21, 0x00 }, // (Offset,Value)-Pair #9 - // CDirectSoundStream_SetAllParametersB+0x2B : retn 0x08 + // DirectSound_CDirectSoundStream_SetAllParametersB+0x2B : retn 0x08 { 0x2B, 0xC2 }, // (Offset,Value)-Pair #10 { 0x2C, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetAllParametersA +// * DirectSound_CDirectSoundStream_SetAllParametersA // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetAllParametersA, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetAllParametersA, 3936, 12, XREF_DSSTREAMSETALLPARAMETERS1A, XRefOne) - // TODO: re-use for CDirectSoundBuffer_SetAllParametersA!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetAllParametersA!? - // CDirectSoundStream_SetAllParametersA+0x25 : call [IDirectSoundStream::SetAllParametersB] + // DirectSound_CDirectSoundStream_SetAllParametersA+0x25 : call [IDirectSoundStream::SetAllParametersB] XREF_ENTRY( 0x1F, XREF_DSSTREAMSETALLPARAMETERS1B ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetAllParametersA+0x09 : mov eax, [esp+0x14] + // DirectSound_CDirectSoundStream_SetAllParametersA+0x09 : mov eax, [esp+0x14] { 0x09, 0x8B }, // (Offset,Value)-Pair #2 { 0x0A, 0x44 }, // (Offset,Value)-Pair #3 { 0x0B, 0x24 }, // (Offset,Value)-Pair #4 { 0x0C, 0x14 }, // (Offset,Value)-Pair #5 - // CDirectSoundStream_SetAllParametersA+0x0D : not eax; and eax, 1 + // DirectSound_CDirectSoundStream_SetAllParametersA+0x0D : not eax; and eax, 1 { 0x0D, 0xF7 }, // (Offset,Value)-Pair #6 { 0x0E, 0xD0 }, // (Offset,Value)-Pair #7 { 0x0F, 0x83 }, // (Offset,Value)-Pair #8 { 0x10, 0xE0 }, // (Offset,Value)-Pair #9 { 0x11, 0x01 }, // (Offset,Value)-Pair #10 - // CDirectSoundStream_SetAllParametersA+0x38 : retn 0x0C + // DirectSound_CDirectSoundStream_SetAllParametersA+0x38 : retn 0x0C { 0x38, 0xC2 }, // (Offset,Value)-Pair #11 { 0x39, 0x0C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetAllParameters +// * DirectSound_CDirectSoundStream_SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetAllParameters, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetAllParameters, 3936, 10, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetAllParameters+0x11 : call [IDirectSoundStream::SetAllParametersA] + // DirectSound_CDirectSoundStream_SetAllParameters+0x11 : call [IDirectSoundStream::SetAllParametersA] XREF_ENTRY( 0x11, XREF_DSSTREAMSETALLPARAMETERS1A ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetAllParameters+0x04 : push eax, [esp+0x08] + // DirectSound_CDirectSoundStream_SetAllParameters+0x04 : push 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 - // CDirectSoundStream_SetAllParameters+0x0C : add eax, 0x04 + // DirectSound_CDirectSoundStream_SetAllParameters+0x0C : add eax, 0x04 { 0x0C, 0x83 }, // (Offset,Value)-Pair #6 { 0x0D, 0xC0 }, // (Offset,Value)-Pair #7 { 0x0E, 0x04 }, // (Offset,Value)-Pair #8 - // CDirectSoundStream_SetAllParameters+0x15 : retn 0x0C + // DirectSound_CDirectSoundStream_SetAllParameters+0x15 : retn 0x0C { 0x15, 0xC2 }, // (Offset,Value)-Pair #9 { 0x16, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetConeAnglesB +// * DirectSound_CDirectSoundStream_SetConeAnglesB // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeAnglesB, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetConeAnglesB, 3936, 12, XREF_DSSTREAMSETCONEANGLES1B, XRefZero) - // TODO: re-use for CDirectSoundBuffer_SetConeAnglesB!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetConeAnglesB!? - // CDirectSoundStream_SetConeAnglesB+0x04 : or dword ptr [eax+0x80], 0x10 + // DirectSound_CDirectSoundStream_SetConeAnglesB+0x04 : or dword ptr [eax+0x80], 0x10 { 0x04, 0x83 }, // (Offset,Value)-Pair #1 { 0x05, 0x89 }, // (Offset,Value)-Pair #2 { 0x06, 0x80 }, // (Offset,Value)-Pair #3 @@ -1352,85 +1352,85 @@ OOVPA_XREF(CDirectSoundStream_SetConeAnglesB, 3936, 12, { 0x09, 0x00 }, // (Offset,Value)-Pair #6 { 0x0A, 0x10 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetConeAnglesB+0x10 : mov [ecx+0x38], eax + // DirectSound_CDirectSoundStream_SetConeAnglesB+0x10 : mov [ecx+0x38], eax { 0x10, 0x89 }, // (Offset,Value)-Pair #8 { 0x11, 0x41 }, // (Offset,Value)-Pair #9 { 0x12, 0x38 }, // (Offset,Value)-Pair #10 - // CDirectSoundStream_SetConeAnglesB+0x25 : retn 0x0C + // DirectSound_CDirectSoundStream_SetConeAnglesB+0x25 : retn 0x0C { 0x25, 0xC2 }, // (Offset,Value)-Pair #11 { 0x26, 0x0C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetConeAnglesA +// * DirectSound_CDirectSoundStream_SetConeAnglesA // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeAnglesA, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetConeAnglesA, 3936, 12, XREF_DSSTREAMSETCONEANGLES1A, XRefOne) - // TODO: re-use for CDirectSoundBuffer_SetConeAnglesA!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetConeAnglesA!? - // CDirectSoundStream_SetConeAnglesA+0x23 : call [IDirectSoundStream::SetConeAnglesB] + // DirectSound_CDirectSoundStream_SetConeAnglesA+0x23 : call [IDirectSoundStream::SetConeAnglesB] XREF_ENTRY( 0x23, XREF_DSSTREAMSETCONEANGLES1B ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetConeAnglesA+0x09 : mov eax, [esp+0x18] + // DirectSound_CDirectSoundStream_SetConeAnglesA+0x09 : mov eax, [esp+0x18] { 0x09, 0x8B }, // (Offset,Value)-Pair #2 { 0x0A, 0x44 }, // (Offset,Value)-Pair #3 { 0x0B, 0x24 }, // (Offset,Value)-Pair #4 { 0x0C, 0x18 }, // (Offset,Value)-Pair #5 - // CDirectSoundStream_SetConeAnglesA+0x0D : not eax; and eax, 1 + // DirectSound_CDirectSoundStream_SetConeAnglesA+0x0D : not eax; and eax, 1 { 0x0D, 0xF7 }, // (Offset,Value)-Pair #6 { 0x0E, 0xD0 }, // (Offset,Value)-Pair #7 { 0x0F, 0x83 }, // (Offset,Value)-Pair #8 { 0x10, 0xE0 }, // (Offset,Value)-Pair #9 { 0x11, 0x01 }, // (Offset,Value)-Pair #10 - // CDirectSoundStream_SetConeAnglesA+0x3C : retn 0x10 + // DirectSound_CDirectSoundStream_SetConeAnglesA+0x3C : retn 0x10 { 0x3C, 0xC2 }, // (Offset,Value)-Pair #11 { 0x3D, 0x10 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetConeAngles +// * DirectSound_CDirectSoundStream_SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeAngles, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetConeAngles, 3936, 10, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetConeAngles+0x15 : call [IDirectSoundStream::SetConeAnglesA] + // DirectSound_CDirectSoundStream_SetConeAngles+0x15 : call [IDirectSoundStream::SetConeAnglesA] XREF_ENTRY( 0x15, XREF_DSSTREAMSETCONEANGLES1A ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetConeAngles+0x04 : mov eax, [esp+0x08] + // DirectSound_CDirectSoundStream_SetConeAngles+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 - // CDirectSoundStream_SetConeAngles+0x0C : add eax, 0x04 + // DirectSound_CDirectSoundStream_SetConeAngles+0x0C : add eax, 0x04 { 0x0C, 0x83 }, // (Offset,Value)-Pair #6 { 0x0D, 0xC0 }, // (Offset,Value)-Pair #7 { 0x0E, 0x04 }, // (Offset,Value)-Pair #8 - // CDirectSoundStream_SetConeAngles+0x19 : retn 0x10 + // DirectSound_CDirectSoundStream_SetConeAngles+0x19 : retn 0x10 { 0x19, 0xC2 }, // (Offset,Value)-Pair #9 { 0x1A, 0x10 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetConeOutsideVolumeB +// * DirectSound_CDirectSoundStream_SetConeOutsideVolumeB // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolumeB, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetConeOutsideVolumeB, 3936, 12, XREF_DSSTREAMSETCONEOUTSIDEVOLUME1B, XRefZero) - // TODO: re-use for CDirectSoundBuffer_SetConeOutsideVolumeB!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetConeOutsideVolumeB!? - // CDirectSoundStream_SetConeOutsideVolumeB+0x04 : or dword ptr [eax+0x80], 0x10 + // DirectSound_CDirectSoundStream_SetConeOutsideVolumeB+0x04 : or dword ptr [eax+0x80], 0x10 { 0x04, 0x83 }, // (Offset,Value)-Pair #1 { 0x05, 0x89 }, // (Offset,Value)-Pair #2 { 0x06, 0x80 }, // (Offset,Value)-Pair #3 @@ -1439,85 +1439,85 @@ OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolumeB, 3936, 12, { 0x09, 0x00 }, // (Offset,Value)-Pair #6 { 0x0A, 0x10 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetConeOutsideVolumeB+0x10 : mov [ecx+0x4C], eax + // DirectSound_CDirectSoundStream_SetConeOutsideVolumeB+0x10 : mov [ecx+0x4C], eax { 0x10, 0x89 }, // (Offset,Value)-Pair #8 { 0x11, 0x41 }, // (Offset,Value)-Pair #9 { 0x12, 0x4C }, // (Offset,Value)-Pair #10 - // CDirectSoundStream_SetConeOutsideVolumeB+0x1E : retn 0x08 + // DirectSound_CDirectSoundStream_SetConeOutsideVolumeB+0x1E : retn 0x08 { 0x1E, 0xC2 }, // (Offset,Value)-Pair #11 { 0x1F, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetConeOutsideVolumeA +// * DirectSound_CDirectSoundStream_SetConeOutsideVolumeA // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolumeA, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetConeOutsideVolumeA, 3936, 12, XREF_DSSTREAMSETCONEOUTSIDEVOLUME1A, XRefOne) - // TODO: re-use for CDirectSoundBuffer_SetConeOutsideVolumeA!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetConeOutsideVolumeA!? - // CDirectSoundStream_SetConeOutsideVolumeA+0x1F : call [IDirectSoundStream::SetConeOutsideVolumeB] + // DirectSound_CDirectSoundStream_SetConeOutsideVolumeA+0x1F : call [IDirectSoundStream::SetConeOutsideVolumeB] XREF_ENTRY( 0x1F, XREF_DSSTREAMSETCONEOUTSIDEVOLUME1B ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetConeOutsideVolumeA+0x09 : mov eax, [esp+0x14] + // DirectSound_CDirectSoundStream_SetConeOutsideVolumeA+0x09 : mov eax, [esp+0x14] { 0x09, 0x8B }, // (Offset,Value)-Pair #2 { 0x0A, 0x44 }, // (Offset,Value)-Pair #3 { 0x0B, 0x24 }, // (Offset,Value)-Pair #4 { 0x0C, 0x14 }, // (Offset,Value)-Pair #5 - // CDirectSoundStream_SetConeOutsideVolumeA+0x0D : not eax; and eax, 1 + // DirectSound_CDirectSoundStream_SetConeOutsideVolumeA+0x0D : not eax; and eax, 1 { 0x0D, 0xF7 }, // (Offset,Value)-Pair #6 { 0x0E, 0xD0 }, // (Offset,Value)-Pair #7 { 0x0F, 0x83 }, // (Offset,Value)-Pair #8 { 0x10, 0xE0 }, // (Offset,Value)-Pair #9 { 0x11, 0x01 }, // (Offset,Value)-Pair #10 - // CDirectSoundStream_SetConeOutsideVolumeA+0x38 : retn 0x0C + // DirectSound_CDirectSoundStream_SetConeOutsideVolumeA+0x38 : retn 0x0C { 0x38, 0xC2 }, // (Offset,Value)-Pair #11 { 0x39, 0x0C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetConeOutsideVolume +// * DirectSound_CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolume, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetConeOutsideVolume, 3936, 10, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetConeOutsideVolume+0x11 : call [IDirectSoundStream::SetConeOutsideVolumeA] + // DirectSound_CDirectSoundStream_SetConeOutsideVolume+0x11 : call [IDirectSoundStream::SetConeOutsideVolumeA] XREF_ENTRY( 0x11, XREF_DSSTREAMSETCONEOUTSIDEVOLUME1A ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetConeOutsideVolume+0x04 : mov eax, [esp+0x08] + // DirectSound_CDirectSoundStream_SetConeOutsideVolume+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 - // CDirectSoundStream_SetConeOutsideVolume+0x0C : add eax, 0x04 + // DirectSound_CDirectSoundStream_SetConeOutsideVolume+0x0C : add eax, 0x04 { 0x0C, 0x83 }, // (Offset,Value)-Pair #6 { 0x0D, 0xC0 }, // (Offset,Value)-Pair #7 { 0x0E, 0x04 }, // (Offset,Value)-Pair #8 - // CDirectSoundStream_SetConeOutsideVolume+0x15 : retn 0x0C + // DirectSound_CDirectSoundStream_SetConeOutsideVolume+0x15 : retn 0x0C { 0x15, 0xC2 }, // (Offset,Value)-Pair #9 { 0x16, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetMaxDistanceC +// * DirectSound_CDirectSoundStream_SetMaxDistanceC // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMaxDistanceC, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMaxDistanceC, 3936, 12, XREF_DSSTREAMSETMAXDISTANCE1C, XRefZero) - // TODO: re-use for CDirectSoundBuffer_SetMaxDistanceC!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetMaxDistanceC!? - // CDirectSoundStream_SetMaxDistanceC+0x04 : or byte ptr [ecx+0x80], 0x04 + // DirectSound_CDirectSoundStream_SetMaxDistanceC+0x04 : or byte ptr [ecx+0x80], 0x04 { 0x04, 0x83 }, // (Offset,Value)-Pair #1 { 0x05, 0x89 }, // (Offset,Value)-Pair #2 { 0x06, 0x80 }, // (Offset,Value)-Pair #3 @@ -1526,122 +1526,122 @@ OOVPA_XREF(CDirectSoundStream_SetMaxDistanceC, 3936, 12, { 0x09, 0x00 }, // (Offset,Value)-Pair #6 { 0x0A, 0x04 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetMaxDistanceC+0x10 : mov [ecx+0x54], eax + // DirectSound_CDirectSoundStream_SetMaxDistanceC+0x10 : mov [ecx+0x54], eax { 0x10, 0x89 }, // (Offset,Value)-Pair #8 { 0x11, 0x41 }, // (Offset,Value)-Pair #9 { 0x12, 0x54 }, // (Offset,Value)-Pair #10 - // CDirectSoundStream_SetMaxDistanceC+0x1E : retn 0x08 + // DirectSound_CDirectSoundStream_SetMaxDistanceC+0x1E : retn 0x08 { 0x1E, 0xC2 }, // (Offset,Value)-Pair #11 { 0x1F, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetMaxDistanceB +// * DirectSound_CDirectSoundStream_SetMaxDistanceB // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMaxDistanceB, 3936, 15, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMaxDistanceB, 3936, 15, XREF_DSSTREAMSETMAXDISTANCE1B, XRefOne) - // TODO: re-use for CDirectSoundBuffer_SetMaxDistanceB!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetMaxDistanceB!? - // CDirectSoundStream_SetMaxDistanceB+0x23 : call [IDirectSoundStream::SetMaxDistanceC] + // DirectSound_CDirectSoundStream_SetMaxDistanceB+0x23 : call [IDirectSoundStream::SetMaxDistanceC] XREF_ENTRY( 0x23, XREF_DSSTREAMSETMAXDISTANCE1C ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetMaxDistanceB+0x0D : mov eax, [esp+0x14] + // DirectSound_CDirectSoundStream_SetMaxDistanceB+0x0D : mov eax, [esp+0x14] { 0x0D, 0x8B }, // (Offset,Value)-Pair #2 { 0x0E, 0x44 }, // (Offset,Value)-Pair #3 { 0x0F, 0x24 }, // (Offset,Value)-Pair #4 { 0x10, 0x14 }, // (Offset,Value)-Pair #5 - // CDirectSoundStream_SetMaxDistanceB+0x11 : not eax + // DirectSound_CDirectSoundStream_SetMaxDistanceB+0x11 : not eax { 0x11, 0xF7 }, // (Offset,Value)-Pair #6 { 0x12, 0xD0 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetMaxDistanceB+0x13 : and eax, 1 + // DirectSound_CDirectSoundStream_SetMaxDistanceB+0x13 : and eax, 1 { 0x13, 0x83 }, // (Offset,Value)-Pair #8 { 0x14, 0xE0 }, // (Offset,Value)-Pair #9 { 0x15, 0x01 }, // (Offset,Value)-Pair #10 - // CDirectSoundStream_SetMaxDistanceB+0x1C : mov ecx, [eax+0x14] + // DirectSound_CDirectSoundStream_SetMaxDistanceB+0x1C : mov ecx, [eax+0x14] { 0x1C, 0x8B }, // (Offset,Value)-Pair #11 { 0x1D, 0x48 }, // (Offset,Value)-Pair #12 { 0x1E, 0x14 }, // (Offset,Value)-Pair #13 - // CDirectSoundStream_SetMaxDistanceB+0x3C : retn 0x0C + // DirectSound_CDirectSoundStream_SetMaxDistanceB+0x3C : retn 0x0C { 0x3C, 0xC2 }, // (Offset,Value)-Pair #14 { 0x3D, 0x0C }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetMaxDistanceA +// * DirectSound_CDirectSoundStream_SetMaxDistanceA // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMaxDistanceA, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMaxDistanceA, 3936, 10, XREF_DSSTREAMSETMAXDISTANCE1A, XRefOne) - // TODO: re-use for CDirectSoundBuffer_SetMaxDistanceA!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetMaxDistanceA!? - // CDirectSoundStream_SetMaxDistanceA+0x15 : call [IDirectSoundStream::SetMaxDistanceB] + // DirectSound_CDirectSoundStream_SetMaxDistanceA+0x15 : call [IDirectSoundStream::SetMaxDistanceB] XREF_ENTRY( 0x15, XREF_DSSTREAMSETMAXDISTANCE1B ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetMaxDistanceA+0x04 : fld [esp+0x0C] + // DirectSound_CDirectSoundStream_SetMaxDistanceA+0x04 : fld [esp+0x0C] { 0x04, 0xD9 }, // (Offset,Value)-Pair #2 { 0x05, 0x44 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // CDirectSoundStream_SetMaxDistanceA+0x0D : add eax, 0x04 + // DirectSound_CDirectSoundStream_SetMaxDistanceA+0x0D : add eax, 0x04 { 0x0D, 0x83 }, // (Offset,Value)-Pair #6 { 0x0E, 0xC0 }, // (Offset,Value)-Pair #7 { 0x0F, 0x04 }, // (Offset,Value)-Pair #8 - // CDirectSoundStream_SetMaxDistanceA+0x19 : retn 0x0C + // DirectSound_CDirectSoundStream_SetMaxDistanceA+0x19 : retn 0x0C { 0x19, 0xC2 }, // (Offset,Value)-Pair #9 { 0x1A, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetMaxDistance +// * DirectSound_CDirectSoundStream_SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMaxDistance, 3936, 11, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMaxDistance, 3936, 11, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetMaxDistance+0x11 : call [IDirectSoundStream::SetMaxDistanceA] + // DirectSound_CDirectSoundStream_SetMaxDistance+0x11 : call [IDirectSoundStream::SetMaxDistanceA] XREF_ENTRY( 0x11, XREF_DSSTREAMSETMAXDISTANCE1A ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetMaxDistance+0x04 : fld [esp+0x0C] + // DirectSound_CDirectSoundStream_SetMaxDistance+0x04 : fld [esp+0x0C] { 0x04, 0xD9 }, // (Offset,Value)-Pair #2 { 0x05, 0x44 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // CDirectSoundStream_SetMaxDistance+0x0C : push [esp+0x0C] + // DirectSound_CDirectSoundStream_SetMaxDistance+0x0C : push [esp+0x0C] { 0x0C, 0xFF }, // (Offset,Value)-Pair #6 { 0x0D, 0x74 }, // (Offset,Value)-Pair #7 { 0x0E, 0x24 }, // (Offset,Value)-Pair #8 { 0x0F, 0x0C }, // (Offset,Value)-Pair #9 - // CDirectSoundStream_SetMaxDistance+0x15 : retn 0x0C + // DirectSound_CDirectSoundStream_SetMaxDistance+0x15 : retn 0x0C { 0x15, 0xC2 }, // (Offset,Value)-Pair #10 { 0x16, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetMinDistanceC +// * DirectSound_CDirectSoundStream_SetMinDistanceC // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistanceC, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMinDistanceC, 3936, 12, XREF_DSSTREAMSETMINDISTANCE1C, XRefZero) - // TODO: re-use for CDirectSoundBuffer_SetMinDistanceC!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetMinDistanceC!? - // CDirectSoundStream_SetMinDistanceC+0x04 : or byte ptr [ecx+0x80], 0x04 + // DirectSound_CDirectSoundStream_SetMinDistanceC+0x04 : or byte ptr [ecx+0x80], 0x04 { 0x04, 0x83 }, // (Offset,Value)-Pair #1 { 0x05, 0x89 }, // (Offset,Value)-Pair #2 { 0x06, 0x80 }, // (Offset,Value)-Pair #3 @@ -1650,125 +1650,125 @@ OOVPA_XREF(CDirectSoundStream_SetMinDistanceC, 3936, 12, { 0x09, 0x00 }, // (Offset,Value)-Pair #6 { 0x0A, 0x04 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetMinDistanceC+0x10 : mov [ecx+0x50], eax + // DirectSound_CDirectSoundStream_SetMinDistanceC+0x10 : mov [ecx+0x50], eax { 0x10, 0x89 }, // (Offset,Value)-Pair #8 { 0x11, 0x41 }, // (Offset,Value)-Pair #9 { 0x12, 0x50 }, // (Offset,Value)-Pair #10 - // CDirectSoundStream_SetMinDistanceC+0x1E : retn 0x08 + // DirectSound_CDirectSoundStream_SetMinDistanceC+0x1E : retn 0x08 { 0x1E, 0xC2 }, // (Offset,Value)-Pair #11 { 0x1F, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetMinDistanceB +// * DirectSound_CDirectSoundStream_SetMinDistanceB // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistanceB, 3936, 15, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMinDistanceB, 3936, 15, XREF_DSSTREAMSETMINDISTANCE1B, XRefOne) - // TODO: re-use for CDirectSoundBuffer_SetMinDistanceB!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetMinDistanceB!? - // CDirectSoundStream_SetMinDistanceB+0x23 : call [IDirectSoundStream::SetMinDistanceC] + // DirectSound_CDirectSoundStream_SetMinDistanceB+0x23 : call [IDirectSoundStream::SetMinDistanceC] XREF_ENTRY( 0x23, XREF_DSSTREAMSETMINDISTANCE1C ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetMinDistanceB+0x0D : mov eax, [esp+0x14] + // DirectSound_CDirectSoundStream_SetMinDistanceB+0x0D : mov eax, [esp+0x14] { 0x0D, 0x8B }, // (Offset,Value)-Pair #2 { 0x0E, 0x44 }, // (Offset,Value)-Pair #3 { 0x0F, 0x24 }, // (Offset,Value)-Pair #4 { 0x10, 0x14 }, // (Offset,Value)-Pair #5 - // CDirectSoundStream_SetMinDistanceB+0x11 : not eax + // DirectSound_CDirectSoundStream_SetMinDistanceB+0x11 : not eax { 0x11, 0xF7 }, // (Offset,Value)-Pair #6 { 0x12, 0xD0 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetMinDistanceB+0x13 : and eax, 1 + // DirectSound_CDirectSoundStream_SetMinDistanceB+0x13 : and eax, 1 { 0x13, 0x83 }, // (Offset,Value)-Pair #8 { 0x14, 0xE0 }, // (Offset,Value)-Pair #9 { 0x15, 0x01 }, // (Offset,Value)-Pair #10 - // CDirectSoundStream_SetMinDistanceB+0x1C : mov ecx, [eax+0x14] + // DirectSound_CDirectSoundStream_SetMinDistanceB+0x1C : mov ecx, [eax+0x14] { 0x1C, 0x8B }, // (Offset,Value)-Pair #11 { 0x1D, 0x48 }, // (Offset,Value)-Pair #12 { 0x1E, 0x14 }, // (Offset,Value)-Pair #13 - // CDirectSoundStream_SetMinDistanceB+0x3C : retn 0x0C + // DirectSound_CDirectSoundStream_SetMinDistanceB+0x3C : retn 0x0C { 0x3C, 0xC2 }, // (Offset,Value)-Pair #14 { 0x3D, 0x0C }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetMinDistanceA +// * DirectSound_CDirectSoundStream_SetMinDistanceA // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistanceA, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMinDistanceA, 3936, 10, XREF_DSSTREAMSETMINDISTANCE1A, XRefOne) - // TODO: re-use for CDirectSoundBuffer_SetMinDistanceA!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetMinDistanceA!? - // CDirectSoundStream_SetMinDistanceA+0x15 : call [IDirectSoundStream::SetMinDistanceB] + // DirectSound_CDirectSoundStream_SetMinDistanceA+0x15 : call [IDirectSoundStream::SetMinDistanceB] XREF_ENTRY( 0x15, XREF_DSSTREAMSETMINDISTANCE1B ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetMinDistanceA+0x04 : fld [esp+0x0C] + // DirectSound_CDirectSoundStream_SetMinDistanceA+0x04 : fld [esp+0x0C] { 0x04, 0xD9 }, // (Offset,Value)-Pair #2 { 0x05, 0x44 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // CDirectSoundStream_SetMinDistanceA+0x0D : add eax, 0x04 + // DirectSound_CDirectSoundStream_SetMinDistanceA+0x0D : add eax, 0x04 { 0x0D, 0x83 }, // (Offset,Value)-Pair #6 { 0x0E, 0xC0 }, // (Offset,Value)-Pair #7 { 0x0F, 0x04 }, // (Offset,Value)-Pair #8 - // CDirectSoundStream_SetMinDistanceA+0x19 : retn 0x0C + // DirectSound_CDirectSoundStream_SetMinDistanceA+0x19 : retn 0x0C { 0x19, 0xC2 }, // (Offset,Value)-Pair #9 { 0x1A, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetMinDistance +// * DirectSound_CDirectSoundStream_SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistance, 3936, 11, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMinDistance, 3936, 11, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetMinDistance+0x11 : call [IDirectSoundStream::SetMinDistanceA] + // DirectSound_CDirectSoundStream_SetMinDistance+0x11 : call [IDirectSoundStream::SetMinDistanceA] XREF_ENTRY( 0x11, XREF_DSSTREAMSETMINDISTANCE1A ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetMinDistance+0x04 : fld [esp+0x0C] + // DirectSound_CDirectSoundStream_SetMinDistance+0x04 : fld [esp+0x0C] { 0x04, 0xD9 }, // (Offset,Value)-Pair #2 { 0x05, 0x44 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // CDirectSoundStream_SetMinDistance+0x0C : push [esp+0x0C] + // DirectSound_CDirectSoundStream_SetMinDistance+0x0C : push [esp+0x0C] { 0x0C, 0xFF }, // (Offset,Value)-Pair #6 { 0x0D, 0x74 }, // (Offset,Value)-Pair #7 { 0x0E, 0x24 }, // (Offset,Value)-Pair #8 { 0x0F, 0x0C }, // (Offset,Value)-Pair #9 - // CDirectSoundStream_SetMinDistance+0x15 : retn 0x0C + // DirectSound_CDirectSoundStream_SetMinDistance+0x15 : retn 0x0C { 0x15, 0xC2 }, // (Offset,Value)-Pair #10 { 0x16, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetVelocityC +// * DirectSound_CDirectSoundStream_SetVelocityC // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVelocityC, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetVelocityC, 3936, 12, XREF_DSSTREAMSETVELOCITY1C, XRefZero) - // CDirectSoundStream_SetVelocityC+0x09 : movsd; movsd; movsd + // DirectSound_CDirectSoundStream_SetVelocityC+0x09 : movsd; movsd; movsd { 0x09, 0xA5 }, // (Offset,Value)-Pair #8 { 0x0A, 0xA5 }, // (Offset,Value)-Pair #9 { 0x0B, 0xA5 }, // (Offset,Value)-Pair #10 - // CDirectSoundStream_SetVelocityC+0x0C : or byte ptr [ecx+0x80], 0x40 + // DirectSound_CDirectSoundStream_SetVelocityC+0x0C : or byte ptr [ecx+0x80], 0x40 { 0x0C, 0x83 }, // (Offset,Value)-Pair #1 { 0x0D, 0x89 }, // (Offset,Value)-Pair #2 { 0x0E, 0x80 }, // (Offset,Value)-Pair #3 @@ -1777,120 +1777,120 @@ OOVPA_XREF(CDirectSoundStream_SetVelocityC, 3936, 12, { 0x11, 0x00 }, // (Offset,Value)-Pair #6 { 0x12, 0x40 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetVelocityC+0x25 : retn 0x08 + // DirectSound_CDirectSoundStream_SetVelocityC+0x25 : retn 0x08 { 0x25, 0xC2 }, // (Offset,Value)-Pair #11 { 0x26, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetVelocityB +// * DirectSound_CDirectSoundStream_SetVelocityB // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVelocityB, 3936, 14, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetVelocityB, 3936, 14, XREF_DSSTREAMSETVELOCITY1B, XRefOne) - // CDirectSoundStream_SetVelocityB+0x35 : call [IDirectSoundStream::SetVelocityC] + // DirectSound_CDirectSoundStream_SetVelocityB+0x35 : call [IDirectSoundStream::SetVelocityC] XREF_ENTRY( 0x35, XREF_DSSTREAMSETVELOCITY1C ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetVelocityB+0x21 : mov eax, [ebp+0x18] + // DirectSound_CDirectSoundStream_SetVelocityB+0x21 : mov eax, [ebp+0x18] { 0x21, 0x8B }, // (Offset,Value)-Pair #2 { 0x22, 0x45 }, // (Offset,Value)-Pair #3 { 0x23, 0x18 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetVelocityB+0x24 : not eax + // DirectSound_CDirectSoundStream_SetVelocityB+0x24 : not eax { 0x24, 0xF7 }, // (Offset,Value)-Pair #5 { 0x25, 0xD0 }, // (Offset,Value)-Pair #6 - // CDirectSoundStream_SetVelocityB+0x26 : and eax, 1 + // DirectSound_CDirectSoundStream_SetVelocityB+0x26 : and eax, 1 { 0x26, 0x83 }, // (Offset,Value)-Pair #7 { 0x27, 0xE0 }, // (Offset,Value)-Pair #8 { 0x28, 0x01 }, // (Offset,Value)-Pair #9 - // CDirectSoundStream_SetVelocityB+0x31 : mov ecx, [eax+0x14] + // DirectSound_CDirectSoundStream_SetVelocityB+0x31 : mov ecx, [eax+0x14] { 0x31, 0x8B }, // (Offset,Value)-Pair #10 { 0x32, 0x48 }, // (Offset,Value)-Pair #11 { 0x33, 0x14 }, // (Offset,Value)-Pair #12 - // CDirectSoundStream_SetVelocityB+0x4F : retn 0x14 + // DirectSound_CDirectSoundStream_SetVelocityB+0x4F : retn 0x14 { 0x4F, 0xC2 }, // (Offset,Value)-Pair #13 { 0x50, 0x14 }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetVelocityA +// * DirectSound_CDirectSoundStream_SetVelocityA // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVelocityA, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetVelocityA, 3936, 9, XREF_DSSTREAMSETVELOCITY1A, XRefOne) - // CDirectSoundStream_SetVelocityA+0x25 : call [IDirectSoundStream::SetVelocityB] + // DirectSound_CDirectSoundStream_SetVelocityA+0x25 : call [IDirectSoundStream::SetVelocityB] XREF_ENTRY( 0x25, XREF_DSSTREAMSETVELOCITY1B ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetVelocityA+0x06 : fld [ebp+0x14] + // DirectSound_CDirectSoundStream_SetVelocityA+0x06 : fld [ebp+0x14] { 0x06, 0xD9 }, // (Offset,Value)-Pair #2 { 0x07, 0x45 }, // (Offset,Value)-Pair #3 { 0x08, 0x14 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetVelocityA+0x0C : sub esp, 0x0C + // DirectSound_CDirectSoundStream_SetVelocityA+0x0C : sub esp, 0x0C { 0x0C, 0x83 }, // (Offset,Value)-Pair #5 { 0x0D, 0xEC }, // (Offset,Value)-Pair #6 { 0x0E, 0x0C }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetVelocityA+0x2A : retn 0x14 + // DirectSound_CDirectSoundStream_SetVelocityA+0x2A : retn 0x14 { 0x2A, 0xC2 }, // (Offset,Value)-Pair #8 { 0x2B, 0x14 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetVelocity +// * DirectSound_CDirectSoundStream_SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVelocity, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetVelocity, 3936, 9, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetVelocity+0x21 : call [IDirectSoundStream::SetVelocityA] + // DirectSound_CDirectSoundStream_SetVelocity+0x21 : call [IDirectSoundStream::SetVelocityA] XREF_ENTRY( 0x21, XREF_DSSTREAMSETVELOCITY1A ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetVelocity+0x06 : fld [ebp+0x14] + // DirectSound_CDirectSoundStream_SetVelocity+0x06 : fld [ebp+0x14] { 0x06, 0xD9 }, // (Offset,Value)-Pair #2 { 0x07, 0x45 }, // (Offset,Value)-Pair #3 { 0x08, 0x14 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetVelocity+0x1A : fstp [esp] + // DirectSound_CDirectSoundStream_SetVelocity+0x1A : fstp [esp] { 0x1A, 0xD9 }, // (Offset,Value)-Pair #5 { 0x1B, 0x1C }, // (Offset,Value)-Pair #6 { 0x1C, 0x24 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetVelocity+0x26 : retn 0x14 + // DirectSound_CDirectSoundStream_SetVelocity+0x26 : retn 0x14 { 0x26, 0xC2 }, // (Offset,Value)-Pair #8 { 0x27, 0x14 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetVelocity +// * DirectSound_CDirectSoundBuffer::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetVelocity, 3936, 9, XREF_DSBUFFERSETVELOCITY, XRefOne) - // CDirectSoundBuffer_SetVelocity+0x20 : call [CDirectSoundStream::SetVelocityB] + // DirectSound_CDirectSoundBuffer_SetVelocity+0x20 : call [CDirectSoundStream::SetVelocityB] XREF_ENTRY( 0x21, XREF_DSSTREAMSETVELOCITY1B ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_SetVelocity+0x06 : fld [ebp+arg_C] + // DirectSound_CDirectSoundBuffer_SetVelocity+0x06 : fld [ebp+arg_C] { 0x06, 0xD9 }, // (Offset,Value)-Pair #2 { 0x07, 0x45 }, // (Offset,Value)-Pair #3 { 0x08, 0x14 }, // (Offset,Value)-Pair #4 - // CDirectSoundBuffer_SetVelocity+0x1A : fstp [esp+0x10+var_10] + // DirectSound_CDirectSoundBuffer_SetVelocity+0x1A : fstp [esp+0x10+var_10] { 0x1A, 0xD9 }, // (Offset,Value)-Pair #5 { 0x1B, 0x1C }, // (Offset,Value)-Pair #6 { 0x1C, 0x24 }, // (Offset,Value)-Pair #7 - // CDirectSoundBuffer_SetVelocity+0x26 : retn 0x14 + // DirectSound_CDirectSoundBuffer_SetVelocity+0x26 : retn 0x14 { 0x27, 0x14 }, // (Offset,Value)-Pair #8 { 0x28, 0x00 }, // (Offset,Value)-Pair #9 OOVPA_END; @@ -1922,16 +1922,16 @@ OOVPA_XREF(IDirectSoundBuffer_SetVelocity, 3936, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetConeOrientationC +// * DirectSound_CDirectSoundStream_SetConeOrientationC // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOrientationC, 3936, 11, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetConeOrientationC, 3936, 11, XREF_DSSTREAMSETCONEORIENTATION1C, XRefZero) - // TODO: re-use for CDirectSoundBuffer_SetConeOrientationC!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetConeOrientationC!? - // CDirectSoundStream_SetConeOrientationC+0x0C : or byte ptr [ecx+0x80], 0x18 + // DirectSound_CDirectSoundStream_SetConeOrientationC+0x0C : or byte ptr [ecx+0x80], 0x18 { 0x0C, 0x83 }, // (Offset,Value)-Pair #1 { 0x0D, 0x89 }, // (Offset,Value)-Pair #2 { 0x0E, 0x80 }, // (Offset,Value)-Pair #3 @@ -1940,115 +1940,115 @@ OOVPA_XREF(CDirectSoundStream_SetConeOrientationC, 3936, 11, { 0x11, 0x00 }, // (Offset,Value)-Pair #6 { 0x12, 0x18 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetConeOrientationC+0x1A : jz +0x07 + // DirectSound_CDirectSoundStream_SetConeOrientationC+0x1A : jz +0x07 { 0x1A, 0x74 }, // (Offset,Value)-Pair #8 { 0x1B, 0x07 }, // (Offset,Value)-Pair #9 - // CDirectSoundStream_SetConeOrientationC+0x25 : retn 0x08 + // DirectSound_CDirectSoundStream_SetConeOrientationC+0x25 : retn 0x08 { 0x25, 0xC2 }, // (Offset,Value)-Pair #10 { 0x26, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetConeOrientationB +// * DirectSound_CDirectSoundStream_SetConeOrientationB // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOrientationB, 3936, 14, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetConeOrientationB, 3936, 14, XREF_DSSTREAMSETCONEORIENTATION1B, XRefOne) - // TODO: re-use for CDirectSoundBuffer_SetConeOrientationB!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetConeOrientationB!? - // CDirectSoundStream_SetConeOrientationB+0x35 : call [IDirectSoundStream::SetConeOrientationC] + // DirectSound_CDirectSoundStream_SetConeOrientationB+0x35 : call [IDirectSoundStream::SetConeOrientationC] XREF_ENTRY( 0x35, XREF_DSSTREAMSETCONEORIENTATION1C ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetConeOrientationB+0x21 : mov eax, [ebp+0x18] + // DirectSound_CDirectSoundStream_SetConeOrientationB+0x21 : mov eax, [ebp+0x18] { 0x21, 0x8B }, // (Offset,Value)-Pair #2 { 0x22, 0x45 }, // (Offset,Value)-Pair #3 { 0x23, 0x18 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetConeOrientationB+0x24 : not eax + // DirectSound_CDirectSoundStream_SetConeOrientationB+0x24 : not eax { 0x24, 0xF7 }, // (Offset,Value)-Pair #5 { 0x25, 0xD0 }, // (Offset,Value)-Pair #6 - // CDirectSoundStream_SetConeOrientationB+0x26 : and eax, 1 + // DirectSound_CDirectSoundStream_SetConeOrientationB+0x26 : and eax, 1 { 0x26, 0x83 }, // (Offset,Value)-Pair #7 { 0x27, 0xE0 }, // (Offset,Value)-Pair #8 { 0x28, 0x01 }, // (Offset,Value)-Pair #9 - // CDirectSoundStream_SetConeOrientationB+0x31 : mov ecx, [eax+0x14] + // DirectSound_CDirectSoundStream_SetConeOrientationB+0x31 : mov ecx, [eax+0x14] { 0x31, 0x8B }, // (Offset,Value)-Pair #10 { 0x32, 0x48 }, // (Offset,Value)-Pair #11 { 0x33, 0x14 }, // (Offset,Value)-Pair #12 - // CDirectSoundStream_SetConeOrientationB+0x4F : retn 0x14 + // DirectSound_CDirectSoundStream_SetConeOrientationB+0x4F : retn 0x14 { 0x4F, 0xC2 }, // (Offset,Value)-Pair #13 { 0x50, 0x14 }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetConeOrientationA +// * DirectSound_CDirectSoundStream_SetConeOrientationA // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOrientationA, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetConeOrientationA, 3936, 9, XREF_DSSTREAMSETCONEORIENTATION1A, XRefOne) - // TODO: re-use for CDirectSoundBuffer_SetConeOrientationA!? + // TODO: re-use for DirectSound_CDirectSoundBuffer_SetConeOrientationA!? - // CDirectSoundStream_SetConeOrientationA+0x25 : call [IDirectSoundStream::SetConeOrientationB] + // DirectSound_CDirectSoundStream_SetConeOrientationA+0x25 : call [IDirectSoundStream::SetConeOrientationB] XREF_ENTRY( 0x25, XREF_DSSTREAMSETCONEORIENTATION1B ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetConeOrientationA+0x06 : fld [ebp+0x14] + // DirectSound_CDirectSoundStream_SetConeOrientationA+0x06 : fld [ebp+0x14] { 0x06, 0xD9 }, // (Offset,Value)-Pair #2 { 0x07, 0x45 }, // (Offset,Value)-Pair #3 { 0x08, 0x14 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetConeOrientationA+0x0C : sub esp, 0x0C + // DirectSound_CDirectSoundStream_SetConeOrientationA+0x0C : sub esp, 0x0C { 0x0C, 0x83 }, // (Offset,Value)-Pair #5 { 0x0D, 0xEC }, // (Offset,Value)-Pair #6 { 0x0E, 0x0C }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetConeOrientationA+0x2A : retn 0x14 + // DirectSound_CDirectSoundStream_SetConeOrientationA+0x2A : retn 0x14 { 0x2A, 0xC2 }, // (Offset,Value)-Pair #8 { 0x2B, 0x14 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetConeOrientation +// * DirectSound_CDirectSoundStream_SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOrientation, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetConeOrientation, 3936, 9, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetConeOrientation+0x21 : call [IDirectSoundStream::SetConeOrientationA] + // DirectSound_CDirectSoundStream_SetConeOrientation+0x21 : call [IDirectSoundStream::SetConeOrientationA] XREF_ENTRY( 0x21, XREF_DSSTREAMSETCONEORIENTATION1A ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetConeOrientation+0x06 : fld [ebp+0x14] + // DirectSound_CDirectSoundStream_SetConeOrientation+0x06 : fld [ebp+0x14] { 0x06, 0xD9 }, // (Offset,Value)-Pair #2 { 0x07, 0x45 }, // (Offset,Value)-Pair #3 { 0x08, 0x14 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetConeOrientation+0x1A : fstp [esp] + // DirectSound_CDirectSoundStream_SetConeOrientation+0x1A : fstp [esp] { 0x1A, 0xD9 }, // (Offset,Value)-Pair #5 { 0x1B, 0x1C }, // (Offset,Value)-Pair #6 { 0x1C, 0x24 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetConeOrientation+0x26 : retn 0x14 + // DirectSound_CDirectSoundStream_SetConeOrientation+0x26 : retn 0x14 { 0x26, 0xC2 }, // (Offset,Value)-Pair #8 { 0x27, 0x14 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetPositionC +// * DirectSound_CDirectSoundStream_SetPositionC // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPositionC, 3936, 11, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetPositionC, 3936, 11, XREF_DSSTREAMSETPOSITION1C, XRefZero) - // CDirectSoundStream_SetPositionC+0x0C : or byte ptr [ecx+0x80], 0xFF + // DirectSound_CDirectSoundStream_SetPositionC+0x0C : or byte ptr [ecx+0x80], 0xFF { 0x0C, 0x80 }, // (Offset,Value)-Pair #1 { 0x0D, 0x89 }, // (Offset,Value)-Pair #2 { 0x0E, 0x80 }, // (Offset,Value)-Pair #3 @@ -2057,124 +2057,124 @@ OOVPA_XREF(CDirectSoundStream_SetPositionC, 3936, 11, { 0x11, 0x00 }, // (Offset,Value)-Pair #6 { 0x12, 0xFF }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetPositionC+0x1A : jz +0x07 + // DirectSound_CDirectSoundStream_SetPositionC+0x1A : jz +0x07 { 0x1A, 0x74 }, // (Offset,Value)-Pair #8 { 0x1B, 0x07 }, // (Offset,Value)-Pair #9 - // CDirectSoundStream_SetPositionC+0x25 : retn 0x08 + // DirectSound_CDirectSoundStream_SetPositionC+0x25 : retn 0x08 { 0x25, 0xC2 }, // (Offset,Value)-Pair #10 { 0x26, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetPositionB +// * DirectSound_CDirectSoundStream_SetPositionB // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPositionB, 3936, 14, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetPositionB, 3936, 14, XREF_DSSTREAMSETPOSITION1B, XRefOne) - // CDirectSoundStream_SetPositionB+0x35 : call [IDirectSoundStream::SetPositionC] + // DirectSound_CDirectSoundStream_SetPositionB+0x35 : call [IDirectSoundStream::SetPositionC] XREF_ENTRY( 0x35, XREF_DSSTREAMSETPOSITION1C ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetPositionB+0x21 : mov eax, [ebp+0x18] + // DirectSound_CDirectSoundStream_SetPositionB+0x21 : mov eax, [ebp+0x18] { 0x21, 0x8B }, // (Offset,Value)-Pair #2 { 0x22, 0x45 }, // (Offset,Value)-Pair #3 { 0x23, 0x18 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetPositionB+0x24 : not eax + // DirectSound_CDirectSoundStream_SetPositionB+0x24 : not eax { 0x24, 0xF7 }, // (Offset,Value)-Pair #5 { 0x25, 0xD0 }, // (Offset,Value)-Pair #6 - // CDirectSoundStream_SetPositionB+0x26 : and eax, 1 + // DirectSound_CDirectSoundStream_SetPositionB+0x26 : and eax, 1 { 0x26, 0x83 }, // (Offset,Value)-Pair #7 { 0x27, 0xE0 }, // (Offset,Value)-Pair #8 { 0x28, 0x01 }, // (Offset,Value)-Pair #9 - // CDirectSoundStream_SetPositionB+0x31 : mov ecx, [eax+0x14] + // DirectSound_CDirectSoundStream_SetPositionB+0x31 : mov ecx, [eax+0x14] { 0x31, 0x8B }, // (Offset,Value)-Pair #10 { 0x32, 0x48 }, // (Offset,Value)-Pair #11 { 0x33, 0x14 }, // (Offset,Value)-Pair #12 - // CDirectSoundStream_SetPositionB+0x4F : retn 0x14 + // DirectSound_CDirectSoundStream_SetPositionB+0x4F : retn 0x14 { 0x4F, 0xC2 }, // (Offset,Value)-Pair #13 { 0x50, 0x14 }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetPositionA +// * DirectSound_CDirectSoundStream_SetPositionA // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPositionA, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetPositionA, 3936, 9, XREF_DSSTREAMSETPOSITION1A, XRefOne) - // CDirectSoundStream_SetPositionA+0x25 : call [IDirectSoundStream::SetPositionB] + // DirectSound_CDirectSoundStream_SetPositionA+0x25 : call [IDirectSoundStream::SetPositionB] XREF_ENTRY( 0x25, XREF_DSSTREAMSETPOSITION1B ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetPositionA+0x06 : fld [ebp+0x14] + // DirectSound_CDirectSoundStream_SetPositionA+0x06 : fld [ebp+0x14] { 0x06, 0xD9 }, // (Offset,Value)-Pair #2 { 0x07, 0x45 }, // (Offset,Value)-Pair #3 { 0x08, 0x14 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetPositionA+0x0C : sub esp, 0x0C + // DirectSound_CDirectSoundStream_SetPositionA+0x0C : sub esp, 0x0C { 0x0C, 0x83 }, // (Offset,Value)-Pair #5 { 0x0D, 0xEC }, // (Offset,Value)-Pair #6 { 0x0E, 0x0C }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetPositionA+0x2A : retn 0x14 + // DirectSound_CDirectSoundStream_SetPositionA+0x2A : retn 0x14 { 0x2A, 0xC2 }, // (Offset,Value)-Pair #8 { 0x2B, 0x14 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetPosition +// * DirectSound_CDirectSoundStream_SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPosition, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetPosition, 3936, 9, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetPosition+0x21 : call [IDirectSoundStream::SetPositionA] + // DirectSound_CDirectSoundStream_SetPosition+0x21 : call [IDirectSoundStream::SetPositionA] XREF_ENTRY( 0x21, XREF_DSSTREAMSETPOSITION1A ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetPosition+0x06 : fld [ebp+0x14] + // DirectSound_CDirectSoundStream_SetPosition+0x06 : fld [ebp+0x14] { 0x06, 0xD9 }, // (Offset,Value)-Pair #2 { 0x07, 0x45 }, // (Offset,Value)-Pair #3 { 0x08, 0x14 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetPosition+0x1A : fstp [esp] + // DirectSound_CDirectSoundStream_SetPosition+0x1A : fstp [esp] { 0x1A, 0xD9 }, // (Offset,Value)-Pair #5 { 0x1B, 0x1C }, // (Offset,Value)-Pair #6 { 0x1C, 0x24 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetPosition+0x26 : retn 0x14 + // DirectSound_CDirectSoundStream_SetPosition+0x26 : retn 0x14 { 0x26, 0xC2 }, // (Offset,Value)-Pair #8 { 0x27, 0x14 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetPosition +// * DirectSound_CDirectSoundBuffer::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPosition, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetPosition, 3936, 9, XREF_DSBUFFERSETPOSITION, XRefOne) - // CDirectSoundBuffer_SetPosition+0x20 : call [CDirectSoundStream::PositionB] + // DirectSound_CDirectSoundBuffer_SetPosition+0x20 : call [CDirectSoundStream::PositionB] XREF_ENTRY( 0x21, XREF_DSSTREAMSETPOSITION1B ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_SetPosition+0x06 : fld [ebp+arg_C] + // DirectSound_CDirectSoundBuffer_SetPosition+0x06 : fld [ebp+arg_C] { 0x06, 0xD9 }, // (Offset,Value)-Pair #2 { 0x07, 0x45 }, // (Offset,Value)-Pair #3 { 0x08, 0x14 }, // (Offset,Value)-Pair #4 - // CDirectSoundBuffer_SetPosition+0x1A : fstp [esp+0x10+var_10] + // DirectSound_CDirectSoundBuffer_SetPosition+0x1A : fstp [esp+0x10+var_10] { 0x1A, 0xD9 }, // (Offset,Value)-Pair #5 { 0x1B, 0x1C }, // (Offset,Value)-Pair #6 { 0x1C, 0x24 }, // (Offset,Value)-Pair #7 - // CDirectSoundBuffer_SetPosition+0x26 : retn 0x14 + // DirectSound_CDirectSoundBuffer_SetPosition+0x26 : retn 0x14 { 0x27, 0x14 }, // (Offset,Value)-Pair #8 { 0x28, 0x00 }, // (Offset,Value)-Pair #9 OOVPA_END; @@ -2206,82 +2206,82 @@ OOVPA_XREF(IDirectSoundBuffer_SetPosition, 3936, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetFrequencyB +// * DirectSound_CDirectSoundStream_SetFrequencyB // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFrequencyB, 3936, 11, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetFrequencyB, 3936, 11, XREF_DSSTREAMSETFREQUENCY1B, XRefZero) - // CDirectSoundStream_SetFrequencyB+0x08 : cmp esi, 0xBB80 + // DirectSound_CDirectSoundStream_SetFrequencyB+0x08 : cmp esi, 0xBB80 { 0x08, 0x81 }, // (Offset,Value)-Pair #1 { 0x09, 0xFE }, // (Offset,Value)-Pair #2 { 0x0A, 0x80 }, // (Offset,Value)-Pair #3 { 0x0B, 0xBB }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetFrequencyB+0x1D : jmp +0x2B + // DirectSound_CDirectSoundStream_SetFrequencyB+0x1D : jmp +0x2B { 0x1D, 0xEB }, // (Offset,Value)-Pair #5 { 0x1E, 0x2B }, // (Offset,Value)-Pair #6 - // CDirectSoundStream_SetFrequencyB+0x1F : lea ecx, [ebp+0x08] + // DirectSound_CDirectSoundStream_SetFrequencyB+0x1F : lea ecx, [ebp+0x08] { 0x1F, 0x8D }, // (Offset,Value)-Pair #7 { 0x20, 0x4D }, // (Offset,Value)-Pair #8 { 0x21, 0x08 }, // (Offset,Value)-Pair #9 - // CDirectSoundStream_SetFrequencyB+0x4E : retn 0x08 + // DirectSound_CDirectSoundStream_SetFrequencyB+0x4E : retn 0x08 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #10 { 0x4F, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetFrequencyA +// * DirectSound_CDirectSoundStream_SetFrequencyA // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFrequencyA, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetFrequencyA, 3936, 9, XREF_DSSTREAMSETFREQUENCY1A, XRefOne) - // CDirectSoundStream_SetFrequencyA+0x1F : call [CDirectSoundStream::SetFrequencyB] + // DirectSound_CDirectSoundStream_SetFrequencyA+0x1F : call [CDirectSoundStream::SetFrequencyB] XREF_ENTRY( 0x20, XREF_DSSTREAMSETFREQUENCY1B ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetFrequencyA+0x15 : mov eax, [esi+0x18] + // DirectSound_CDirectSoundStream_SetFrequencyA+0x15 : mov eax, [esi+0x18] { 0x15, 0x8B }, // (Offset,Value)-Pair #2 { 0x16, 0x46 }, // (Offset,Value)-Pair #3 { 0x17, 0x18 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetFrequencyA+0x18 : mov eax, [eax+0x10] + // DirectSound_CDirectSoundStream_SetFrequencyA+0x18 : mov eax, [eax+0x10] { 0x18, 0x8B }, // (Offset,Value)-Pair #5 { 0x19, 0x40 }, // (Offset,Value)-Pair #6 { 0x1A, 0x10 }, // (Offset,Value)-Pair #7 - // CDirectSoundStream_SetFrequencyA+0x40 : retn 0x08 + // DirectSound_CDirectSoundStream_SetFrequencyA+0x40 : retn 0x08 { 0x40, 0xC2 }, // (Offset,Value)-Pair #8 { 0x41, 0x08 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetFrequency +// * DirectSound_CDirectSoundStream_SetFrequency // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFrequency, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetFrequency, 3936, 10, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetFrequency+0x0D : call [IDirectSoundStream::SetFrequency] + // DirectSound_CDirectSoundStream_SetFrequency+0x0D : call [IDirectSoundStream::SetFrequency] XREF_ENTRY( 0x0D, XREF_DSSTREAMSETFREQUENCY1A ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetFrequency+0x04 : mov eax, [esp+0x08] + // DirectSound_CDirectSoundStream_SetFrequency+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 - // CDirectSoundStream_SetFrequency+0x08 : add eax, 0x04 + // DirectSound_CDirectSoundStream_SetFrequency+0x08 : add eax, 0x04 { 0x08, 0x83 }, // (Offset,Value)-Pair #6 { 0x09, 0xC0 }, // (Offset,Value)-Pair #7 { 0x0A, 0x04 }, // (Offset,Value)-Pair #8 - // CDirectSoundStream_SetFrequency+0x11 : retn 0x08 + // DirectSound_CDirectSoundStream_SetFrequency+0x11 : retn 0x08 { 0x11, 0xC2 }, // (Offset,Value)-Pair #9 { 0x12, 0x08 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -2339,28 +2339,28 @@ OOVPA_XREF(CMcpxVoiceClient_Set3dMode, 3936, 12, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetMode +// * DirectSound_CDirectSoundVoice::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMode, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMode, 3936, 10, XREF_DSBUFFERSETMODEA, XRefOne) - // CDirectSoundVoice_SetMode+0x1E : call [CMcpxVoiceClient::Set3dMode] + // DirectSound_CDirectSoundVoice_SetMode+0x1E : call [CMcpxVoiceClient::Set3dMode] XREF_ENTRY( 0x1F, XREF_DSBUFFERSETMODEB ), // (Offset,Value)-Pair #1 - // CDirectSoundVoice_SetMode+0x17 : push [esp+0x14] + // DirectSound_CDirectSoundVoice_SetMode+0x17 : push [esp+0x14] { 0x17, 0xFF }, // (Offset,Value)-Pair #2 { 0x18, 0x74 }, // (Offset,Value)-Pair #3 { 0x19, 0x24 }, // (Offset,Value)-Pair #4 { 0x1A, 0x14 }, // (Offset,Value)-Pair #5 - // CDirectSoundVoice_SetMode+0x1B : mov ecx, [eax+0x14] + // DirectSound_CDirectSoundVoice_SetMode+0x1B : mov ecx, [eax+0x14] { 0x1B, 0x8B }, // (Offset,Value)-Pair #6 { 0x1C, 0x48 }, // (Offset,Value)-Pair #7 { 0x1D, 0x14 }, // (Offset,Value)-Pair #8 - // CDirectSoundVoice_SetMode+0x38 : retn 0x0C + // DirectSound_CDirectSoundVoice_SetMode+0x38 : retn 0x0C { 0x38, 0xC2 }, // (Offset,Value)-Pair #9 { 0x39, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -2394,28 +2394,28 @@ OOVPA_END; /* // ****************************************************************** -// * CDirectSoundStream_SetRolloffFactor +// * DirectSound_CDirectSoundStream_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetRolloffFactor, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetRolloffFactor, 3936, 10, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetRolloffFactor+0x11 : call [IDirectSoundStream::SetRolloffFactor] + // DirectSound_CDirectSoundStream_SetRolloffFactor+0x11 : call [IDirectSoundStream::SetRolloffFactor] XREF_ENTRY( 0x11, XREF_DSSTREAMSETROLLOFFFACTOR1A ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetRolloffFactor+0x04 : mov eax, [esp+0x08] + // DirectSound_CDirectSoundStream_SetRolloffFactor+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 - // CDirectSoundStream_SetRolloffFactor+0x0C : add eax, 0x04 + // DirectSound_CDirectSoundStream_SetRolloffFactor+0x0C : add eax, 0x04 { 0x0C, 0x83 }, // (Offset,Value)-Pair #6 { 0x0D, 0xC0 }, // (Offset,Value)-Pair #7 { 0x0E, 0x04 }, // (Offset,Value)-Pair #8 - // CDirectSoundStream_SetRolloffFactor+0x15 : retn 0x0C + // DirectSound_CDirectSoundStream_SetRolloffFactor+0x15 : retn 0x0C { 0x15, 0xC2 }, // (Offset,Value)-Pair #9 { 0x16, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -2598,14 +2598,14 @@ OOVPA_NO_XREF(IDirectSound8_SetOrientation, 3936, 13) OOVPA_END; // ****************************************************************** -// * CDirectSound::CommitDeferredSettingsB +// * DirectSound_CDirectSound::CommitDeferredSettingsB // ****************************************************************** -OOVPA_XREF(CDirectSound_CommitDeferredSettingsB, 3936, 11, +OOVPA_XREF(DirectSound_CDirectSound_CommitDeferredSettingsB, 3936, 11, XREF_COMMITDEFERREDSETTINGSB, XRefZero) - // CDirectSound_CommitDeferredSettingsB+0x56 : fld dword ptr [eax+0x174] + // DirectSound_CDirectSound_CommitDeferredSettingsB+0x56 : fld dword ptr [eax+0x174] { 0x56, 0xD9 }, // (Offset,Value)-Pair #1 { 0x57, 0x80 }, // (Offset,Value)-Pair #2 { 0x58, 0x74 }, // (Offset,Value)-Pair #3 @@ -2613,66 +2613,66 @@ OOVPA_XREF(CDirectSound_CommitDeferredSettingsB, 3936, 11, { 0x5A, 0x00 }, // (Offset,Value)-Pair #5 { 0x5B, 0x00 }, // (Offset,Value)-Pair #6 - // CDirectSound_CommitDeferredSettingsB+0xA8 : fsubp st(1), st + // DirectSound_CDirectSound_CommitDeferredSettingsB+0xA8 : fsubp st(1), st { 0xA8, 0xDE }, // (Offset,Value)-Pair #7 { 0xA9, 0xE9 }, // (Offset,Value)-Pair #8 - // CDirectSound_CommitDeferredSettingsB+0xD4 : mov esi, 0x118 + // DirectSound_CDirectSound_CommitDeferredSettingsB+0xD4 : mov esi, 0x118 { 0xD4, 0xBE }, // (Offset,Value)-Pair #9 { 0xD5, 0x18 }, // (Offset,Value)-Pair #10 { 0xD6, 0x01 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSound::CommitDeferredSettingsA +// * DirectSound_CDirectSound::CommitDeferredSettingsA // ****************************************************************** -OOVPA_XREF(CDirectSound_CommitDeferredSettingsA, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSound_CommitDeferredSettingsA, 3936, 10, XREF_COMMITDEFERREDSETTINGSA, XRefOne) - // CDirectSound_CommitDeferredSettingsA+0x12 : call [CDirectSound::CommitDeferredSettingsB] + // DirectSound_CDirectSound_CommitDeferredSettingsA+0x12 : call [CDirectSound::CommitDeferredSettingsB] XREF_ENTRY( 0x12, XREF_COMMITDEFERREDSETTINGSB ), // (Offset,Value)-Pair #1 - // CDirectSound_CommitDeferredSettingsA+0x0C : mov ecx, [eax+0x0C] + // DirectSound_CDirectSound_CommitDeferredSettingsA+0x0C : mov ecx, [eax+0x0C] { 0x0C, 0x8B }, // (Offset,Value)-Pair #2 { 0x0D, 0x48 }, // (Offset,Value)-Pair #3 { 0x0E, 0x0C }, // (Offset,Value)-Pair #4 - // CDirectSound_CommitDeferredSettingsA+0x0F : push 0 + // DirectSound_CDirectSound_CommitDeferredSettingsA+0x0F : push 0 { 0x0F, 0x6A }, // (Offset,Value)-Pair #5 { 0x10, 0x00 }, // (Offset,Value)-Pair #6 - // CDirectSound_CommitDeferredSettingsA+0x19 : jz +0x0B + // DirectSound_CDirectSound_CommitDeferredSettingsA+0x19 : jz +0x0B { 0x19, 0x74 }, // (Offset,Value)-Pair #7 { 0x1A, 0x0B }, // (Offset,Value)-Pair #8 - // CDirectSound_CommitDeferredSettingsA+0x28 : retn 0x04 + // DirectSound_CDirectSound_CommitDeferredSettingsA+0x28 : retn 0x04 { 0x28, 0xC2 }, // (Offset,Value)-Pair #9 { 0x29, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * CDirectSound_CommitDeferredSettings +// * DirectSound_CDirectSound_CommitDeferredSettings // ****************************************************************** -OOVPA_XREF(CDirectSound_CommitDeferredSettings, 3936, 8, +OOVPA_XREF(DirectSound_CDirectSound_CommitDeferredSettings, 3936, 8, XRefNoSaveIndex, XRefOne) - // CDirectSound_CommitDeferredSettings+0x11 : call [CDirectSound::CommitDeferredSettingsA] + // DirectSound_CDirectSound_CommitDeferredSettings+0x11 : call [CDirectSound::CommitDeferredSettingsA] XREF_ENTRY( 0x11, XREF_COMMITDEFERREDSETTINGSA ), // (Offset,Value)-Pair #1 - // CDirectSound_CommitDeferredSettings+0x06 : and eax, 0xFFFFFFF8 + // DirectSound_CDirectSound_CommitDeferredSettings+0x06 : and eax, 0xFFFFFFF8 { 0x06, 0x83 }, // (Offset,Value)-Pair #2 { 0x07, 0xC0 }, // (Offset,Value)-Pair #3 { 0x08, 0xF8 }, // (Offset,Value)-Pair #4 - // CDirectSound_CommitDeferredSettings+0x09 : neg ecx + // DirectSound_CDirectSound_CommitDeferredSettings+0x09 : neg ecx { 0x09, 0xF7 }, // (Offset,Value)-Pair #5 { 0x0A, 0xD9 }, // (Offset,Value)-Pair #6 - // CDirectSound_CommitDeferredSettings+0x15 : retn 0x04 + // DirectSound_CDirectSound_CommitDeferredSettings+0x15 : retn 0x04 { 0x15, 0xC2 }, // (Offset,Value)-Pair #7 { 0x16, 0x04 }, // (Offset,Value)-Pair #8 OOVPA_END; @@ -2702,14 +2702,14 @@ OOVPA_NO_XREF(IDirectSound8_Release, 3936, 10) OOVPA_END; // ****************************************************************** -// * CDirectSound::SetDistanceFactorB +// * DirectSound_CDirectSound::SetDistanceFactorB // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDistanceFactorB, 3936, 13, +OOVPA_XREF(DirectSound_CDirectSound_SetDistanceFactorB, 3936, 13, XREF_SETDISTANCEFACTORB, XRefZero) - // CDirectSound_SetDistanceFactorB+0x04 : or dword ptr [ecx+0x01B4], 0x60 + // DirectSound_CDirectSound_SetDistanceFactorB+0x04 : or dword ptr [ecx+0x01B4], 0x60 { 0x04, 0x83 }, // (Offset,Value)-Pair #1 { 0x05, 0x89 }, // (Offset,Value)-Pair #2 { 0x06, 0xB4 }, // (Offset,Value)-Pair #3 @@ -2718,39 +2718,39 @@ OOVPA_XREF(CDirectSound_SetDistanceFactorB, 3936, 13, { 0x09, 0x00 }, // (Offset,Value)-Pair #6 { 0x0A, 0x60 }, // (Offset,Value)-Pair #7 - // CDirectSound_SetDistanceFactorB+0x0B : cmp [esp+0x08], 0 + // DirectSound_CDirectSound_SetDistanceFactorB+0x0B : cmp [esp+0x08], 0 { 0x0B, 0x83 }, // (Offset,Value)-Pair #8 { 0x0C, 0x7C }, // (Offset,Value)-Pair #9 { 0x0D, 0x24 }, // (Offset,Value)-Pair #10 { 0x0E, 0x08 }, // (Offset,Value)-Pair #11 - // CDirectSound_SetDistanceFactorB+0x12 : mov [ecx+0x0178], eax + // DirectSound_CDirectSound_SetDistanceFactorB+0x12 : mov [ecx+0x0178], eax { 0x12, 0x78 }, // (Offset,Value)-Pair #12 { 0x13, 0x01 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetDistanceFactorA +// * DirectSound_CDirectSound::SetDistanceFactorA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDistanceFactorA, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSound_SetDistanceFactorA, 3936, 12, XREF_SETDISTANCEFACTORA, XRefOne) - // CDirectSound_SetDistanceFactorA+0x23 : call [CDirectSound::SetDistanceFactorB] + // DirectSound_CDirectSound_SetDistanceFactorA+0x23 : call [CDirectSound::SetDistanceFactorB] XREF_ENTRY( 0x23, XREF_SETDISTANCEFACTORB ), // (Offset,Value)-Pair #1 - // CDirectSound_SetDistanceFactorA+0x00 : push esi; push edi + // DirectSound_CDirectSound_SetDistanceFactorA+0x00 : push esi; push edi { 0x00, 0x56 }, // (Offset,Value)-Pair #2 { 0x01, 0x57 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetDistanceFactorA+0x07 : fld [esp+0x10] + // DirectSound_CDirectSound_SetDistanceFactorA+0x07 : fld [esp+0x10] { 0x07, 0xD9 }, // (Offset,Value)-Pair #4 { 0x08, 0x44 }, // (Offset,Value)-Pair #5 { 0x09, 0x24 }, // (Offset,Value)-Pair #6 { 0x0A, 0x10 }, // (Offset,Value)-Pair #7 - // CDirectSound_SetDistanceFactorA+0x11 : not eax; and eax, 1 + // DirectSound_CDirectSound_SetDistanceFactorA+0x11 : not eax; and eax, 1 { 0x11, 0xF7 }, // (Offset,Value)-Pair #8 { 0x12, 0xD0 }, // (Offset,Value)-Pair #9 { 0x13, 0x83 }, // (Offset,Value)-Pair #10 @@ -2791,14 +2791,14 @@ OOVPA_XREF(IDirectSound8_SetDistanceFactor, 3936, 11, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetRolloffFactorB +// * DirectSound_CDirectSound::SetRolloffFactorB // ****************************************************************** -OOVPA_XREF(CDirectSound_SetRolloffFactorB, 3936, 13, +OOVPA_XREF(DirectSound_CDirectSound_SetRolloffFactorB, 3936, 13, XREF_SETROLLOFFFACTORB, XRefZero) - // CDirectSound_SetRolloffFactorB+0x04 : or dword ptr [ecx+0x01B4], 0x60 + // DirectSound_CDirectSound_SetRolloffFactorB+0x04 : or dword ptr [ecx+0x01B4], 0x60 { 0x04, 0x83 }, // (Offset,Value)-Pair #1 { 0x05, 0x89 }, // (Offset,Value)-Pair #2 { 0x06, 0xB4 }, // (Offset,Value)-Pair #3 @@ -2807,39 +2807,39 @@ OOVPA_XREF(CDirectSound_SetRolloffFactorB, 3936, 13, { 0x09, 0x00 }, // (Offset,Value)-Pair #6 { 0x0A, 0x04 }, // (Offset,Value)-Pair #7 - // CDirectSound_SetRolloffFactorB+0x0B : cmp [esp+0x08], 0 + // DirectSound_CDirectSound_SetRolloffFactorB+0x0B : cmp [esp+0x08], 0 { 0x0B, 0x83 }, // (Offset,Value)-Pair #8 { 0x0C, 0x7C }, // (Offset,Value)-Pair #9 { 0x0D, 0x24 }, // (Offset,Value)-Pair #10 { 0x0E, 0x08 }, // (Offset,Value)-Pair #11 - // CDirectSound_SetRolloffFactorB+0x12 : mov [ecx+0x017C], eax + // DirectSound_CDirectSound_SetRolloffFactorB+0x12 : mov [ecx+0x017C], eax { 0x12, 0x7C }, // (Offset,Value)-Pair #12 { 0x13, 0x01 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetRolloffFactorA +// * DirectSound_CDirectSound::SetRolloffFactorA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetRolloffFactorA, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSound_SetRolloffFactorA, 3936, 12, XREF_SETROLLOFFFACTORA, XRefOne) - // CDirectSound_SetRolloffFactorA+0x23 : call [CDirectSound::SetRolloffFactorB] + // DirectSound_CDirectSound_SetRolloffFactorA+0x23 : call [CDirectSound::SetRolloffFactorB] XREF_ENTRY( 0x23, XREF_SETROLLOFFFACTORB ), // (Offset,Value)-Pair #1 - // CDirectSound_SetRolloffFactorA+0x00 : push esi; push edi + // DirectSound_CDirectSound_SetRolloffFactorA+0x00 : push esi; push edi { 0x00, 0x56 }, // (Offset,Value)-Pair #2 { 0x01, 0x57 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetRolloffFactorA+0x07 : fld [esp+0x10] + // DirectSound_CDirectSound_SetRolloffFactorA+0x07 : fld [esp+0x10] { 0x07, 0xD9 }, // (Offset,Value)-Pair #4 { 0x08, 0x44 }, // (Offset,Value)-Pair #5 { 0x09, 0x24 }, // (Offset,Value)-Pair #6 { 0x0A, 0x10 }, // (Offset,Value)-Pair #7 - // CDirectSound_SetRolloffFactorA+0x11 : not eax; and eax, 1 + // DirectSound_CDirectSound_SetRolloffFactorA+0x11 : not eax; and eax, 1 { 0x11, 0xF7 }, // (Offset,Value)-Pair #8 { 0x12, 0xD0 }, // (Offset,Value)-Pair #9 { 0x13, 0x83 }, // (Offset,Value)-Pair #10 @@ -2880,14 +2880,14 @@ OOVPA_XREF(IDirectSound8_SetRolloffFactor, 3936, 11, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetMixBinHeadroomB +// * DirectSound_CDirectSound::SetMixBinHeadroomB // ****************************************************************** -OOVPA_XREF(CDirectSound_SetMixBinHeadroomB, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSound_SetMixBinHeadroomB, 3936, 12, XREF_DSSETMIXBINHEADROOMB, XRefZero) - // CDirectSound_SetMixBinHeadroomB+0x04 : cmp dword ptr ds:[0xFE820010], 4 + // DirectSound_CDirectSound_SetMixBinHeadroomB+0x04 : cmp dword ptr ds:[0xFE820010], 4 { 0x12, 0x83 }, // (Offset,Value)-Pair #1 { 0x13, 0x3D }, // (Offset,Value)-Pair #2 { 0x14, 0x10 }, // (Offset,Value)-Pair #3 @@ -2896,38 +2896,38 @@ OOVPA_XREF(CDirectSound_SetMixBinHeadroomB, 3936, 12, { 0x17, 0xFE }, // (Offset,Value)-Pair #6 { 0x18, 0x04 }, // (Offset,Value)-Pair #7 - // CDirectSound_SetMixBinHeadroomB+0x1F : and edx, 7 + // DirectSound_CDirectSound_SetMixBinHeadroomB+0x1F : and edx, 7 { 0x1F, 0x83 }, // (Offset,Value)-Pair #8 { 0x20, 0xE2 }, // (Offset,Value)-Pair #9 { 0x21, 0x07 }, // (Offset,Value)-Pair #10 - // CDirectSound_SetMixBinHeadroomB+0x2D : jl +0xD8 + // DirectSound_CDirectSound_SetMixBinHeadroomB+0x2D : jl +0xD8 { 0x2D, 0x7C }, // (Offset,Value)-Pair #11 { 0x2E, 0xD8 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetMixBinHeadroomA +// * DirectSound_CDirectSound::SetMixBinHeadroomA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetMixBinHeadroomA, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSound_SetMixBinHeadroomA, 3936, 9, XREF_DSSETMIXBINHEADROOMA, XRefOne) - // CDirectSound_SetMixBinHeadroomA+0x19 : call [CDirectSound::SetMixBinHeadroomB] + // DirectSound_CDirectSound_SetMixBinHeadroomA+0x19 : call [CDirectSound::SetMixBinHeadroomB] XREF_ENTRY( 0x19, XREF_DSSETMIXBINHEADROOMB ), // (Offset,Value)-Pair #1 - // CDirectSound_SetMixBinHeadroomA+0x00 : push esi; push edi + // DirectSound_CDirectSound_SetMixBinHeadroomA+0x00 : push esi; push edi { 0x00, 0x56 }, // (Offset,Value)-Pair #2 { 0x01, 0x57 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetMixBinHeadroomA+0x07 : push [esp+0x14] + // DirectSound_CDirectSound_SetMixBinHeadroomA+0x07 : push [esp+0x14] { 0x07, 0xFF }, // (Offset,Value)-Pair #4 { 0x08, 0x74 }, // (Offset,Value)-Pair #5 { 0x09, 0x24 }, // (Offset,Value)-Pair #6 { 0x0A, 0x14 }, // (Offset,Value)-Pair #7 - // CDirectSound_SetMixBinHeadroomA+0x21 : jz +0x0B + // DirectSound_CDirectSound_SetMixBinHeadroomA+0x21 : jz +0x0B { 0x21, 0x74 }, // (Offset,Value)-Pair #8 { 0x22, 0x0B }, // (Offset,Value)-Pair #9 OOVPA_END; @@ -2964,19 +2964,19 @@ OOVPA_XREF(IDirectSound8_SetMixBinHeadroom, 3936, 12, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetPositionB +// * DirectSound_CDirectSound::SetPositionB // ****************************************************************** -OOVPA_XREF(CDirectSound_SetPositionB, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSound_SetPositionB, 3936, 12, XREF_DSSETPOSITIONB, XRefZero) - // CDirectSound_SetPositionB+0x0C : movsd; movsd; movsd + // DirectSound_CDirectSound_SetPositionB+0x0C : movsd; movsd; movsd { 0x0C, 0xA5 }, // (Offset,Value)-Pair #1 { 0x0D, 0xA5 }, // (Offset,Value)-Pair #2 { 0x0E, 0xA5 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetPositionB+0x0F : or byte ptr [ecx+0x01B4], 0xFF + // DirectSound_CDirectSound_SetPositionB+0x0F : or byte ptr [ecx+0x01B4], 0xFF { 0x0F, 0x80 }, // (Offset,Value)-Pair #4 { 0x10, 0x89 }, // (Offset,Value)-Pair #5 { 0x11, 0xB4 }, // (Offset,Value)-Pair #6 @@ -2985,34 +2985,34 @@ OOVPA_XREF(CDirectSound_SetPositionB, 3936, 12, { 0x14, 0x00 }, // (Offset,Value)-Pair #9 { 0x15, 0xFF }, // (Offset,Value)-Pair #10 - // CDirectSound_SetPositionB+0x28 : retn 0x08 + // DirectSound_CDirectSound_SetPositionB+0x28 : retn 0x08 { 0x28, 0xC2 }, // (Offset,Value)-Pair #11 { 0x29, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetPositionA +// * DirectSound_CDirectSound::SetPositionA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetPositionA, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSound_SetPositionA, 3936, 10, XREF_DSSETPOSITIONA, XRefOne) - // CDirectSound_SetPositionA+0x35 : call [CDirectSound::SetPositionB] + // DirectSound_CDirectSound_SetPositionA+0x35 : call [CDirectSound::SetPositionB] XREF_ENTRY( 0x35, XREF_DSSETPOSITIONB ), // (Offset,Value)-Pair #1 - // CDirectSound_SetPositionA+0x06 : push esi; push edi + // DirectSound_CDirectSound_SetPositionA+0x06 : push esi; push edi { 0x06, 0x56 }, // (Offset,Value)-Pair #2 { 0x07, 0x57 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetPositionA+0x24 : not eax; and eax, 1 + // DirectSound_CDirectSound_SetPositionA+0x24 : not eax; and eax, 1 { 0x24, 0xF7 }, // (Offset,Value)-Pair #4 { 0x25, 0xD0 }, // (Offset,Value)-Pair #5 { 0x26, 0x83 }, // (Offset,Value)-Pair #6 { 0x27, 0xE0 }, // (Offset,Value)-Pair #7 { 0x28, 0x01 }, // (Offset,Value)-Pair #8 - // CDirectSound_SetPositionA+0x4F : retn 0x14 + // DirectSound_CDirectSound_SetPositionA+0x4F : retn 0x14 { 0x4F, 0xC2 }, // (Offset,Value)-Pair #9 { 0x50, 0x14 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -3048,19 +3048,19 @@ OOVPA_XREF(IDirectSound8_SetPosition, 3936, 11, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetVelocityB +// * DirectSound_CDirectSound::SetVelocityB // ****************************************************************** -OOVPA_XREF(CDirectSound_SetVelocityB, 3936, 12, +OOVPA_XREF(DirectSound_CDirectSound_SetVelocityB, 3936, 12, XREF_DSSETVELOCITYB, XRefZero) - // CDirectSound_SetVelocityB+0x0C : movsd; movsd; movsd + // DirectSound_CDirectSound_SetVelocityB+0x0C : movsd; movsd; movsd { 0x0C, 0xA5 }, // (Offset,Value)-Pair #1 { 0x0D, 0xA5 }, // (Offset,Value)-Pair #2 { 0x0E, 0xA5 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetVelocityB+0x0F : or dword ptr [ecx+0x01B4], 0x40 + // DirectSound_CDirectSound_SetVelocityB+0x0F : or dword ptr [ecx+0x01B4], 0x40 { 0x0F, 0x83 }, // (Offset,Value)-Pair #4 { 0x10, 0x89 }, // (Offset,Value)-Pair #5 { 0x11, 0xB4 }, // (Offset,Value)-Pair #6 @@ -3069,34 +3069,34 @@ OOVPA_XREF(CDirectSound_SetVelocityB, 3936, 12, { 0x14, 0x00 }, // (Offset,Value)-Pair #9 { 0x15, 0x40 }, // (Offset,Value)-Pair #10 - // CDirectSound_SetVelocityB+0x28 : retn 0x08 + // DirectSound_CDirectSound_SetVelocityB+0x28 : retn 0x08 { 0x28, 0xC2 }, // (Offset,Value)-Pair #11 { 0x29, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetVelocityA +// * DirectSound_CDirectSound::SetVelocityA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetVelocityA, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSound_SetVelocityA, 3936, 10, XREF_DSSETVELOCITYA, XRefOne) - // CDirectSound_SetVelocityA+0x35 : call [CDirectSound::SetVelocityB] + // DirectSound_CDirectSound_SetVelocityA+0x35 : call [CDirectSound::SetVelocityB] XREF_ENTRY( 0x35, XREF_DSSETVELOCITYB ), // (Offset,Value)-Pair #1 - // CDirectSound_SetVelocityA+0x06 : push esi; push edi + // DirectSound_CDirectSound_SetVelocityA+0x06 : push esi; push edi { 0x06, 0x56 }, // (Offset,Value)-Pair #2 { 0x07, 0x57 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetVelocityA+0x24 : not eax; and eax, 1 + // DirectSound_CDirectSound_SetVelocityA+0x24 : not eax; and eax, 1 { 0x24, 0xF7 }, // (Offset,Value)-Pair #4 { 0x25, 0xD0 }, // (Offset,Value)-Pair #5 { 0x26, 0x83 }, // (Offset,Value)-Pair #6 { 0x27, 0xE0 }, // (Offset,Value)-Pair #7 { 0x28, 0x01 }, // (Offset,Value)-Pair #8 - // CDirectSound_SetVelocityA+0x4F : retn 0x14 + // DirectSound_CDirectSound_SetVelocityA+0x4F : retn 0x14 { 0x4F, 0xC2 }, // (Offset,Value)-Pair #9 { 0x50, 0x14 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -3132,19 +3132,19 @@ OOVPA_XREF(IDirectSound8_SetVelocity, 3936, 11, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetAllParametersB +// * DirectSound_CDirectSound::SetAllParametersB // ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParametersB, 3936, 13, +OOVPA_XREF(DirectSound_CDirectSound_SetAllParametersB, 3936, 13, XREF_DSSETALLPARAMETERSB, XRefZero) - // CDirectSound_SetAllParametersB+0x08 : push 0x0C; pop ecx + // DirectSound_CDirectSound_SetAllParametersB+0x08 : push 0x0C; pop ecx { 0x08, 0x6A }, // (Offset,Value)-Pair #1 { 0x09, 0x0C }, // (Offset,Value)-Pair #2 { 0x0A, 0x59 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetAllParametersB+0x13 : or word ptr [ecx+0x01B4], 0x0180 + // DirectSound_CDirectSound_SetAllParametersB+0x13 : or word ptr [ecx+0x01B4], 0x0180 { 0x13, 0x66 }, // (Offset,Value)-Pair #4 { 0x14, 0x81 }, // (Offset,Value)-Pair #5 { 0x15, 0x88 }, // (Offset,Value)-Pair #6 @@ -3154,34 +3154,34 @@ OOVPA_XREF(CDirectSound_SetAllParametersB, 3936, 13, { 0x1A, 0x80 }, // (Offset,Value)-Pair #10 { 0x1B, 0x01 }, // (Offset,Value)-Pair #11 - // CDirectSound_SetAllParametersB+0x30 : retn 0x08 + // DirectSound_CDirectSound_SetAllParametersB+0x30 : retn 0x08 { 0x30, 0xC2 }, // (Offset,Value)-Pair #12 { 0x31, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetAllParametersA +// * DirectSound_CDirectSound::SetAllParametersA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParametersA, 3936, 10, +OOVPA_XREF(DirectSound_CDirectSound_SetAllParametersA, 3936, 10, XREF_DSSETALLPARAMETERSA, XRefOne) - // CDirectSound_SetAllParametersA+0x2F : call [CDirectSound::SetAllParametersB] + // DirectSound_CDirectSound_SetAllParametersA+0x2F : call [CDirectSound::SetAllParametersB] XREF_ENTRY( 0x2F, XREF_DSSETALLPARAMETERSB ), // (Offset,Value)-Pair #1 - // CDirectSound_SetAllParametersA+0x00 : push esi; push edi + // DirectSound_CDirectSound_SetAllParametersA+0x00 : push esi; push edi { 0x00, 0x56 }, // (Offset,Value)-Pair #2 { 0x01, 0x57 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetAllParametersA+0x21 : not ecx; and ecx, 1 + // DirectSound_CDirectSound_SetAllParametersA+0x21 : not ecx; and ecx, 1 { 0x21, 0xF7 }, // (Offset,Value)-Pair #4 { 0x22, 0xD1 }, // (Offset,Value)-Pair #5 { 0x23, 0x83 }, // (Offset,Value)-Pair #6 { 0x24, 0xE1 }, // (Offset,Value)-Pair #7 { 0x25, 0x01 }, // (Offset,Value)-Pair #8 - // CDirectSound_SetAllParametersA+0x48 : retn 0x0C + // DirectSound_CDirectSound_SetAllParametersA+0x48 : retn 0x0C { 0x48, 0xC2 }, // (Offset,Value)-Pair #9 { 0x49, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -3243,25 +3243,25 @@ OOVPA_NO_XREF(IDirectSound8_DownloadEffectsImage, 3936, 11) OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetMode +// * DirectSound_CDirectSoundStream_SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMode, 3936, 7, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMode, 3936, 7, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetMode+0x10 : call [CDirectSoundVoice::SetMode] + // DirectSound_CDirectSoundStream_SetMode+0x10 : call [CDirectSoundVoice::SetMode] XREF_ENTRY( 0x11, XREF_DSBUFFERSETMODEA ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetMode+0x0C : add eax, 4 + // DirectSound_CDirectSoundStream_SetMode+0x0C : add eax, 4 { 0x0C, 0x83 }, // (Offset,Value)-Pair #2 { 0x0D, 0xC0 }, // (Offset,Value)-Pair #3 { 0x0E, 0x04 }, // (Offset,Value)-Pair #4 - // CDirectSoundStream_SetMode+0x0F : push eax + // DirectSound_CDirectSoundStream_SetMode+0x0F : push eax { 0x0F, 0x50 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer8_SetMode+0x15 : retn 0x0C + // DirectSound_CDirectSoundBuffer8_SetMode+0x15 : retn 0x0C { 0x15, 0xC2 }, // (Offset,Value)-Pair #9 { 0x16, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -3302,9 +3302,9 @@ OOVPA_XREF(CMcpxAPU_Set3dDopplerFactor, 3936, 7, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetDopplerFactor +// * DirectSound_CDirectSound::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDopplerFactor, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSound_SetDopplerFactor, 3936, 9, XREF_SETDOPPLERFACTOR, XRefOne) @@ -3396,9 +3396,9 @@ OOVPA_XREF(DirectSoundUseFullHRTF2, 3936, 8, OOVPA_END; // ****************************************************************** -// * CDirectSound::GetCaps +// * DirectSound_CDirectSound::GetCaps // ****************************************************************** -OOVPA_XREF(CDirectSound_GetCaps, 3936, 8, +OOVPA_XREF(DirectSound_CDirectSound_GetCaps, 3936, 8, XREF_CDirectSound_GetCaps, XRefZero) @@ -3433,9 +3433,9 @@ OOVPA_XREF(IDirectSound_GetCaps, 3936, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetPitch +// * DirectSound_CDirectSoundVoice::SetPitch // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetPitch, 3936, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetPitch, 3936, 8, XREF_CDirectSoundVoice_SetPitch, XRefZero) @@ -3470,9 +3470,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetPitch, 3936, 8, OOVPA_END; */ // ****************************************************************** -// * CDirectSoundVoice::SetConeAngles +// * DirectSound_CDirectSoundVoice::SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 3936, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetConeAngles, 3936, 8, XREF_DSVOICESETCONEANGLES, XRefZero) @@ -3524,9 +3524,9 @@ OOVPA_XREF(DirectSoundEnterCriticalSection, 3936, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::PlayEx +// * DirectSound_CDirectSoundBuffer::PlayEx // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_PlayEx, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_PlayEx, 3936, 9, XREF_DirectSound_CDirectSoundBuffer_PlayEx, XRefOne) @@ -3626,9 +3626,9 @@ OOVPA_NO_XREF(IDirectSoundBuffer_AddRef, 3936, 10) OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMinDistance +// * DirectSound_CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMinDistance, 3936, 9, XREF_CDirectSoundBuffer_SetMinDistance, XRefOne) @@ -3665,9 +3665,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 3936, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMaxDistance +// * DirectSound_CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMaxDistance, 3936, 9, XREF_CDirectSoundBuffer_SetMaxDistance, XRefOne) @@ -3744,9 +3744,9 @@ OOVPA_XREF(CMcpxVoiceClient_SetI3DL2Source, 3936, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetI3DL2Source +// * DirectSound_CDirectSoundVoice::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetI3DL2Source, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetI3DL2Source, 3936, 9, XREF_CDirectSoundVoice_SetI3DL2Source, XRefOne) @@ -3784,9 +3784,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 3936, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetMixBinVolumes +// * DirectSound_CDirectSoundVoice::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 3936, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 3936, 7, XREF_CDirectSoundVoice_SetMixBinVolumes, XRefZero) @@ -3838,9 +3838,9 @@ OOVPA_XREF(CMcpxAPU_Set3dParameters, 3936, 7, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetAllParameters +// * DirectSound_CDirectSound::SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParameters, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSound_SetAllParameters, 3936, 9, XREF_DSSETALLPARAMETERSA, XRefOne) @@ -3878,9 +3878,9 @@ OOVPA_XREF(IDirectSound_SetAllParameters, 3936, 9, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetI3DL2Listener +// * DirectSound_CDirectSound::SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(CDirectSound_SetI3DL2Listener, 3936, 7, +OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 3936, 7, XREF_DSSETI3DL2LISTENER, XRefZero) @@ -3915,9 +3915,9 @@ OOVPA_XREF(IDirectSound_SetI3DL2Listener, 3936, 9, OOVPA_END; // ****************************************************************** -// * CDirectSound::EnableHeadphones +// * DirectSound_CDirectSound::EnableHeadphones // ****************************************************************** -OOVPA_XREF(CDirectSound_EnableHeadphones, 3936, 7, +OOVPA_XREF(DirectSound_CDirectSound_EnableHeadphones, 3936, 7, XREF_DirectSound_CDirectSound_EnableHeadphones, XRefZero) @@ -3950,9 +3950,9 @@ OOVPA_XREF(IDirectSound_EnableHeadphones, 3936, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream::SetMixBinVolumes +// * DirectSound_CDirectSoundStream::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBinVolumes, 3936, 9, XREF_CDirectSoundStream_SetMixBinVolumes, XRefOne) @@ -3970,9 +3970,9 @@ OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes, 3936, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream::SetI3DL2Source +// * DirectSound_CDirectSoundStream::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetI3DL2Source, 3936, 9, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetI3DL2Source, 3936, 9, XRefNoSaveIndex, XRefOne) @@ -3990,9 +3990,9 @@ OOVPA_XREF(CDirectSoundStream_SetI3DL2Source, 3936, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetNotificationPositions +// * DirectSound_CDirectSoundBuffer::SetNotificationPositions // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetNotificationPositions, 3936, 7, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetNotificationPositions, 3936, 7, XREF_CDirectSoundBuffer_SetNotificationPositions, XRefZero) @@ -4027,9 +4027,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetNotificationPositions, 3936, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream::Pause +// * DirectSound_CDirectSoundStream::Pause // ****************************************************************** -OOVPA_NO_XREF(CDirectSoundStream_Pause, 3936, 6) +OOVPA_NO_XREF(DirectSound_CDirectSoundStream_Pause, 3936, 6) { 0x01, 0x44 }, { 0x04, 0xFF }, @@ -4048,16 +4048,16 @@ OOVPATable DSound_3936[] = { REGISTER_OOVPA(DirectSoundDoWorkB, 3936, XREF), REGISTER_OOVPA(DirectSoundDoWorkA, 3936, XREF), REGISTER_OOVPA(DirectSoundDoWork, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 3936, XREF), REGISTER_OOVPA(IDirectSound8_CreateStream, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 3936, XREF), REGISTER_OOVPA(IDirectSound8_CreateBuffer, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetPitchB, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPitchA, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 3936, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetStatus, 3936, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetVolumeB, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetVolumeA, 3936, XREF), @@ -4074,59 +4074,59 @@ OOVPATable DSound_3936[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetBufferDataA, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 3936, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetMixBins, 3936, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 3936, ALIAS, IDirectSoundStream_SetMixBins), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 3936, ALIAS, IDirectSoundStream_SetMixBins), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 3936, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 3936, XREF), REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition2, 3936, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Play, 3936, PATCH), // REGISTER_OOVPA(IDirectSoundBuffer_Play, 3936, PATCH), // [YESSSS! IT WORKED!] - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Stop, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3936, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetConeAnglesB, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetConeAnglesA, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetConeAngles, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetConeOutsideVolumeB, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetConeOutsideVolumeA, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetConeOutsideVolume, 3936, PATCH), - //REGISTER_OOVPA(CDirectSoundStream_SetAllParametersB, 3936, XREF), - //REGISTER_OOVPA(CDirectSoundStream_SetAllParametersA, 3936, XREF), - //REGISTER_OOVPA(CDirectSoundStream_SetAllParameters, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMaxDistanceC, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMaxDistanceB, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMaxDistanceA, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMaxDistance, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMinDistanceC, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMinDistanceB, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMinDistanceA, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMinDistance, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVelocityC, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetVelocityB, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetVelocityA, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetVelocity, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetConeAnglesB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetConeAnglesA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetConeAngles, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetConeOutsideVolumeB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetConeOutsideVolumeA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetConeOutsideVolume, 3936, PATCH), + //REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetAllParametersB, 3936, XREF), + //REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetAllParametersA, 3936, XREF), + //REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetAllParameters, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMaxDistanceC, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMaxDistanceB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMaxDistanceA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMaxDistance, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMinDistanceC, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMinDistanceB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMinDistanceA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMinDistance, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVelocityC, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVelocityB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVelocityA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVelocity, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVelocity, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetConeOrientationC, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetConeOrientationB, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetConeOrientationA, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetConeOrientation, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPositionC, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetPositionB, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetPositionA, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetPosition, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetConeOrientationC, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetConeOrientationB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetConeOrientationA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetConeOrientation, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPositionC, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPositionB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPositionA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPosition, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPosition, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFrequencyB, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFrequencyA, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFrequencyB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFrequencyA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFrequency, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 3936, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_Set3dMode, 3936, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMode, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 3936, PATCH), // REGISTER_OOVPA(IDirectSoundStream_SetI3DL2SourceA, 3936, XREF), // REGISTER_OOVPA(IDirectSoundStream_SetI3DL2Source, 3936, PATCH), @@ -4134,66 +4134,66 @@ OOVPATable DSound_3936[] = { REGISTER_OOVPA(IDirectSoundStream_SetHeadroomA, 3936, XREF), REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettingsB, 3936, XREF), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettingsA, 3936, XREF), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettingsB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettingsA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactorB, 3936, XREF), - REGISTER_OOVPA(CDirectSound_SetDistanceFactorA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 3936, XREF), REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactorB, 3936, XREF), - REGISTER_OOVPA(CDirectSound_SetRolloffFactorA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactorB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactorA, 3936, XREF), REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroomB, 3936, XREF), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroomA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroomB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroomA, 3936, XREF), REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_SetPositionB, 3936, XREF), - REGISTER_OOVPA(CDirectSound_SetPositionA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetPositionB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetPositionA, 3936, XREF), REGISTER_OOVPA(IDirectSound8_SetPosition, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocityB, 3936, XREF), - REGISTER_OOVPA(CDirectSound_SetVelocityA, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocityB, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocityA, 3936, XREF), REGISTER_OOVPA(IDirectSound8_SetVelocity, 3936, PATCH), REGISTER_OOVPA(CMcpxAPU_Set3dParameters, 3936, XREF), - REGISTER_OOVPA(CDirectSound_SetAllParameters, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParameters, 3936, XREF), REGISTER_OOVPA(IDirectSound8_SetAllParameters, 3936, ALIAS, IDirectSound_SetAllParameters), REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMode, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMode, 3936, PATCH), // REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play, 4361, XREF), REGISTER_OOVPA(CMcpxAPU_Set3dDopplerFactor, 3936, XREF), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 3936, XREF), REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 3936, ALIAS, IDirectSound_SetDopplerFactor), REGISTER_OOVPA(CSensaura3d_GetFullHRTFFilterPair, 3936, XREF), REGISTER_OOVPA(DirectSoundUseFullHRTF, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_GetCaps, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_GetCaps, 3936, XREF), REGISTER_OOVPA(IDirectSound8_GetCaps, 3936, ALIAS, IDirectSound_GetCaps), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetConeAngles, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 3936, PATCH), REGISTER_OOVPA(DirectSoundEnterCriticalSection, 3936, XREF), REGISTER_OOVPA(DirectSoundUseFullHRTF, 3936, ALIAS, DirectSoundUseFullHRTF2), - REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSoundGetSampleTime, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3936, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_Commit3dSettings, 3936, XREF), REGISTER_OOVPA(CMcpxVoiceClient_SetI3DL2Source, 3936, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetI3DL2Source, 3936, ALIAS, CDirectSoundVoice_SetI3DL2Source), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetI3DL2Source, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 3936, XREF), REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 3936, ALIAS, IDirectSound_SetI3DL2Listener), - REGISTER_OOVPA(CDirectSound_EnableHeadphones, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 3936, XREF), REGISTER_OOVPA(IDirectSound_EnableHeadphones, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes, 3936, PATCH), - // REGISTER_OOVPA(CDirectSoundStream_SetI3DL2Source, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 3936, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes, 3936, PATCH), + // REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetI3DL2Source, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetNotificationPositions, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundStream_Pause, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 3936, PATCH), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index e1fd7ac34..529eb97ef 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -113,24 +113,24 @@ OOVPA_NO_XREF(IDirectSound8_CreateSoundBuffer, 4361, 9) OOVPA_END; // ****************************************************************** -// * CDirectSound::CreateSoundStream +// * DirectSound_CDirectSound::CreateSoundStream // ****************************************************************** -OOVPA_XREF(CDirectSound_CreateSoundStream, 4361, 14, +OOVPA_XREF(DirectSound_CDirectSound_CreateSoundStream, 4361, 14, XREF_DSCREATESOUNDSTREAM, XRefZero) - // CDirectSound_CreateSoundStream+0x23 : mov eax, 0x80004005 + // DirectSound_CDirectSound_CreateSoundStream+0x23 : mov eax, 0x80004005 { 0x23, 0xB8 }, // (Offset,Value)-Pair #1 { 0x24, 0x05 }, // (Offset,Value)-Pair #2 { 0x25, 0x40 }, // (Offset,Value)-Pair #3 { 0x27, 0x80 }, // (Offset,Value)-Pair #4 - // CDirectSound_CreateSoundStream+0x2A : push 0x28 + // DirectSound_CDirectSound_CreateSoundStream+0x2A : push 0x28 { 0x2A, 0x6A }, // (Offset,Value)-Pair #5 { 0x2B, 0x28 }, // (Offset,Value)-Pair #6 - // CDirectSound_CreateSoundStream+0x4A : add esi, 0x7FF8FFF2 + // DirectSound_CDirectSound_CreateSoundStream+0x4A : add esi, 0x7FF8FFF2 { 0x4A, 0x81 }, // (Offset,Value)-Pair #7 { 0x4B, 0xE6 }, // (Offset,Value)-Pair #8 { 0x4C, 0xF2 }, // (Offset,Value)-Pair #9 @@ -138,7 +138,7 @@ OOVPA_XREF(CDirectSound_CreateSoundStream, 4361, 14, { 0x4E, 0xF8 }, // (Offset,Value)-Pair #11 { 0x4F, 0x7F }, // (Offset,Value)-Pair #12 - // CDirectSound_CreateSoundStream+0x8E : retn 0x10 + // DirectSound_CDirectSound_CreateSoundStream+0x8E : retn 0x10 { 0x8E, 0xC2 }, // (Offset,Value)-Pair #13 { 0x8F, 0x10 }, // (Offset,Value)-Pair #14 OOVPA_END; @@ -203,51 +203,51 @@ OOVPA_XREF(CMcpxStream_Pause, 4361, 11, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_Pause +// * DirectSound_CDirectSoundStream_Pause // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Pause, 4361, 11, +OOVPA_XREF(DirectSound_CDirectSoundStream_Pause, 4361, 11, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_Pause+0x35 : call [CMcpxStream::Pause] + // DirectSound_CDirectSoundStream_Pause+0x35 : call [CMcpxStream::Pause] XREF_ENTRY( 0x35, XREF_DSSTREAMPAUSE ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_Pause+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSoundStream_Pause+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 { 0x22, 0x05 }, // (Offset,Value)-Pair #3 { 0x23, 0x40 }, // (Offset,Value)-Pair #4 { 0x24, 0x00 }, // (Offset,Value)-Pair #5 { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundStream_Pause+0x2C : mov ecx, [eax+0x24] + // DirectSound_CDirectSoundStream_Pause+0x2C : mov ecx, [eax+0x24] { 0x2C, 0x8B }, // (Offset,Value)-Pair #7 { 0x2D, 0x48 }, // (Offset,Value)-Pair #8 { 0x2E, 0x24 }, // (Offset,Value)-Pair #9 - // CDirectSoundStream_Pause+0x4E : retn 0x08 + // DirectSound_CDirectSoundStream_Pause+0x4E : retn 0x08 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #10 { 0x4F, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetPlayRegion +// * DirectSound_CDirectSoundBuffer::SetPlayRegion // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPlayRegion, 4361, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetPlayRegion, 4361, 10, XREF_DSBUFFERSETPLAYREGIONA, XRefZero) - // CDirectSoundBuffer_SetPlayRegion+0x10 : movzx edi, al + // DirectSound_CDirectSoundBuffer_SetPlayRegion+0x10 : movzx edi, al { 0x10, 0x0F }, // (Offset,Value)-Pair #1 { 0x11, 0xB6 }, // (Offset,Value)-Pair #2 { 0x12, 0xF8 }, // (Offset,Value)-Pair #3 - // CDirectSoundBuffer_SetPlayRegion+0x17 : jz +0x0B + // DirectSound_CDirectSoundBuffer_SetPlayRegion+0x17 : jz +0x0B { 0x17, 0x74 }, // (Offset,Value)-Pair #4 { 0x18, 0x0B }, // (Offset,Value)-Pair #5 - // CDirectSoundBuffer_SetPlayRegion+0x46 : mov esi, 0x88780032 + // DirectSound_CDirectSoundBuffer_SetPlayRegion+0x46 : mov esi, 0x88780032 { 0x46, 0xBE }, // (Offset,Value)-Pair #6 { 0x47, 0x32 }, // (Offset,Value)-Pair #7 { 0x48, 0x00 }, // (Offset,Value)-Pair #8 @@ -276,29 +276,29 @@ OOVPA_XREF(IDirectSoundBuffer_SetPlayRegion, 4361, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetLoopRegion +// * DirectSound_CDirectSoundBuffer::SetLoopRegion // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetLoopRegion, 4361, 11, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4361, 11, XREF_DirectSound_CDirectSoundBuffer_SetLoopRegion, XRefZero) - // CDirectSoundBuffer_SetLoopRegion+0x24 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_SetLoopRegion+0x24 : mov eax, 0x80004005 { 0x24, 0xB8 }, // (Offset,Value)-Pair #1 { 0x25, 0x05 }, // (Offset,Value)-Pair #2 { 0x26, 0x40 }, // (Offset,Value)-Pair #3 { 0x27, 0x00 }, // (Offset,Value)-Pair #4 { 0x28, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSoundBuffer_SetLoopRegion+0x29 : jmp +0x55 + // DirectSound_CDirectSoundBuffer_SetLoopRegion+0x29 : jmp +0x55 { 0x29, 0xEB }, // (Offset,Value)-Pair #6 { 0x2A, 0x55 }, // (Offset,Value)-Pair #7 - // CDirectSoundBuffer_SetLoopRegion+0x56 : sub ecx, esi + // DirectSound_CDirectSoundBuffer_SetLoopRegion+0x56 : sub ecx, esi { 0x56, 0x2B }, // (Offset,Value)-Pair #8 { 0x57, 0xCE }, // (Offset,Value)-Pair #9 - // CDirectSoundBuffer_SetLoopRegion+0x82 : retn 0x0C + // DirectSound_CDirectSoundBuffer_SetLoopRegion+0x82 : retn 0x0C { 0x82, 0xC2 }, // (Offset,Value)-Pair #10 { 0x83, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -324,29 +324,29 @@ OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 4361, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetVolume +// * DirectSound_CDirectSoundBuffer::SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVolume, 4361, 11, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetVolume, 4361, 11, XREF_DirectSound_CDirectSoundBuffer_SetVolume, XRefZero) - // CDirectSoundBuffer_SetVolume+0x0D : movzx esi, al + // DirectSound_CDirectSoundBuffer_SetVolume+0x0D : movzx esi, al { 0x0D, 0x0F }, // (Offset,Value)-Pair #1 { 0x0E, 0xB6 }, // (Offset,Value)-Pair #2 { 0x0F, 0xF0 }, // (Offset,Value)-Pair #3 - // CDirectSoundBuffer_SetVolume+0x26 : jmp +0x22 + // DirectSound_CDirectSoundBuffer_SetVolume+0x26 : jmp +0x22 { 0x26, 0xEB }, // (Offset,Value)-Pair #4 { 0x27, 0x22 }, // (Offset,Value)-Pair #5 - // CDirectSoundBuffer_SetVolume+0x2D : push [esp+0x10] + // DirectSound_CDirectSoundBuffer_SetVolume+0x2D : push [esp+0x10] { 0x2D, 0xFF }, // (Offset,Value)-Pair #6 { 0x2E, 0x74 }, // (Offset,Value)-Pair #7 { 0x2F, 0x24 }, // (Offset,Value)-Pair #8 { 0x30, 0x10 }, // (Offset,Value)-Pair #9 - // CDirectSoundBuffer_SetVolume+0x4B : retn 0x08 + // DirectSound_CDirectSoundBuffer_SetVolume+0x4B : retn 0x08 { 0x4B, 0xC2 }, // (Offset,Value)-Pair #10 { 0x4C, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -397,28 +397,28 @@ OOVPA_XREF(CMcpxBuffer_SetBufferData, 4361, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer_SetBufferData +// * DirectSound_CDirectSoundBuffer_SetBufferData // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 4361, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetBufferData, 4361, 10, XREF_DSSETBUFFERDATA2, XRefOne) - // CDirectSoundBuffer_SetBufferData+0x7A : call [CMcpxBuffer::SetBufferData] + // DirectSound_CDirectSoundBuffer_SetBufferData+0x7A : call [CMcpxBuffer::SetBufferData] XREF_ENTRY( 0x7A, XREF_DSSETBUFFERDATA ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_SetBufferData+0x40 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_SetBufferData+0x40 : mov eax, 0x80004005 { 0x40, 0xB8 }, // (Offset,Value)-Pair #2 { 0x41, 0x05 }, // (Offset,Value)-Pair #3 { 0x42, 0x40 }, // (Offset,Value)-Pair #4 { 0x43, 0x00 }, // (Offset,Value)-Pair #5 { 0x44, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_SetBufferData+0x5F : jz +0x33 + // DirectSound_CDirectSoundBuffer_SetBufferData+0x5F : jz +0x33 { 0x5F, 0x74 }, // (Offset,Value)-Pair #7 { 0x60, 0x33 }, // (Offset,Value)-Pair #8 - // CDirectSoundBuffer_SetBufferData+0xAB : retn 0x0C + // DirectSound_CDirectSoundBuffer_SetBufferData+0xAB : retn 0x0C { 0xAB, 0xC2 }, // (Offset,Value)-Pair #9 { 0xAC, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -473,28 +473,28 @@ OOVPA_XREF(CMcpxBuffer_SetCurrentPosition, 4361, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer_SetCurrentPosition +// * DirectSound_CDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 4361, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 4361, 10, XREF_SETCURRENTPOSITION2, XRefOne) - // CDirectSoundBuffer_SetCurrentPosition+0x35 : call [CMcpxBuffer::SetCurrentPosition] + // DirectSound_CDirectSoundBuffer_SetCurrentPosition+0x35 : call [CMcpxBuffer::SetCurrentPosition] XREF_ENTRY( 0x35, XREF_SETCURRENTPOSITION ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_SetCurrentPosition+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_SetCurrentPosition+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 { 0x22, 0x05 }, // (Offset,Value)-Pair #3 { 0x23, 0x40 }, // (Offset,Value)-Pair #4 { 0x24, 0x00 }, // (Offset,Value)-Pair #5 { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_SetCurrentPosition+0x3D : jz +0x0B + // DirectSound_CDirectSoundBuffer_SetCurrentPosition+0x3D : jz +0x0B { 0x3D, 0x74 }, // (Offset,Value)-Pair #7 { 0x3E, 0x0B }, // (Offset,Value)-Pair #8 - // CDirectSoundBuffer_SetCurrentPosition+0x3D : retn 0x08 + // DirectSound_CDirectSoundBuffer_SetCurrentPosition+0x3D : retn 0x08 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #9 { 0x4F, 0x08 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -553,28 +553,28 @@ OOVPA_XREF(CMcpxBuffer_GetCurrentPosition, 4361, 11, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer_GetCurrentPosition +// * DirectSound_CDirectSoundBuffer_GetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 4361, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 4361, 10, XREF_GETCURRENTPOSITION2, XRefOne) - // CDirectSoundBuffer_GetCurrentPosition+0x39 : call [CMcpxBuffer::GetCurrentPosition] + // DirectSound_CDirectSoundBuffer_GetCurrentPosition+0x39 : call [CMcpxBuffer::GetCurrentPosition] XREF_ENTRY( 0x39, XREF_GETCURRENTPOSITION ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_GetCurrentPosition+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_GetCurrentPosition+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 { 0x22, 0x05 }, // (Offset,Value)-Pair #3 { 0x23, 0x40 }, // (Offset,Value)-Pair #4 { 0x24, 0x00 }, // (Offset,Value)-Pair #5 { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_GetCurrentPosition+0x41 : jz +0x0B + // DirectSound_CDirectSoundBuffer_GetCurrentPosition+0x41 : jz +0x0B { 0x41, 0x74 }, // (Offset,Value)-Pair #7 { 0x42, 0x0B }, // (Offset,Value)-Pair #8 - // CDirectSoundBuffer_GetCurrentPosition+0x3D : retn 0x08 + // DirectSound_CDirectSoundBuffer_GetCurrentPosition+0x3D : retn 0x08 { 0x52, 0xC2 }, // (Offset,Value)-Pair #9 { 0x53, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -628,28 +628,28 @@ OOVPA_XREF(CMcpxBuffer_PlayA, 4361, 10, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer_Play +// * DirectSound_CDirectSoundBuffer_Play // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 4361, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_Play, 4361, 10, XREF_DSOUNDPLAY2, XRefOne) - // CDirectSoundBuffer_Play+0x35 : call [CMcpxBuffer::Play] + // DirectSound_CDirectSoundBuffer_Play+0x35 : call [CMcpxBuffer::Play] XREF_ENTRY( 0x35, XREF_DSOUNDPLAY ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_Play+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_Play+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 { 0x22, 0x05 }, // (Offset,Value)-Pair #3 { 0x23, 0x40 }, // (Offset,Value)-Pair #4 { 0x24, 0x00 }, // (Offset,Value)-Pair #5 { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_Play+0x3D : jz +0x0B + // DirectSound_CDirectSoundBuffer_Play+0x3D : jz +0x0B { 0x3D, 0x74 }, // (Offset,Value)-Pair #7 { 0x3E, 0x0B }, // (Offset,Value)-Pair #8 - // CDirectSoundBuffer_Play+0x4E : retn 0x10 + // DirectSound_CDirectSoundBuffer_Play+0x4E : retn 0x10 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #9 { 0x4F, 0x10 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -705,28 +705,28 @@ OOVPA_XREF(CMcpxBuffer_Stop, 4361, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer_Stop +// * DirectSound_CDirectSoundBuffer_Stop // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Stop, 4361, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_Stop, 4361, 10, XREF_DSOUNDSTOP2, XRefOne) - // CDirectSoundBuffer_Stop+0x33 : call [CMcpxBuffer::Stop] + // DirectSound_CDirectSoundBuffer_Stop+0x33 : call [CMcpxBuffer::Stop] XREF_ENTRY( 0x33, XREF_DSOUNDSTOP ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_Stop+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_Stop+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 { 0x22, 0x05 }, // (Offset,Value)-Pair #3 { 0x23, 0x40 }, // (Offset,Value)-Pair #4 { 0x24, 0x00 }, // (Offset,Value)-Pair #5 { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_Stop+0x3B : jz +0x0B + // DirectSound_CDirectSoundBuffer_Stop+0x3B : jz +0x0B { 0x3B, 0x74 }, // (Offset,Value)-Pair #7 { 0x3C, 0x0B }, // (Offset,Value)-Pair #8 - // CDirectSoundBuffer_Stop+0x4C : retn 0x04 + // DirectSound_CDirectSoundBuffer_Stop+0x4C : retn 0x04 { 0x4C, 0xC2 }, // (Offset,Value)-Pair #9 { 0x4D, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -912,90 +912,90 @@ OOVPA_XREF(IDirectSoundBuffer_StopEx, 4361, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoiceSettings::SetMixBins +// * DirectSound_CDirectSoundVoiceSettings::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 4361, 11, +OOVPA_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4361, 11, XREF_DSSETMIXBINSC, XRefZero) - // CDirectSoundVoiceSettings_SetMixBins+0x06 : jnz +0x1A + // DirectSound_CDirectSoundVoiceSettings_SetMixBins+0x06 : jnz +0x1A { 0x06, 0x75 }, // (Offset,Value)-Pair #1 { 0x07, 0x1A }, // (Offset,Value)-Pair #2 - // CDirectSoundVoiceSettings_SetMixBins+0x08 : test byte ptr [ecx+8], 0x10 + // DirectSound_CDirectSoundVoiceSettings_SetMixBins+0x08 : test byte ptr [ecx+8], 0x10 { 0x08, 0xF6 }, // (Offset,Value)-Pair #3 { 0x09, 0x41 }, // (Offset,Value)-Pair #4 { 0x0A, 0x08 }, // (Offset,Value)-Pair #5 { 0x0B, 0x10 }, // (Offset,Value)-Pair #6 - // CDirectSoundVoiceSettings_SetMixBins+0x19 : shr eax, 1 + // DirectSound_CDirectSoundVoiceSettings_SetMixBins+0x19 : shr eax, 1 { 0x19, 0xD1 }, // (Offset,Value)-Pair #7 { 0x1A, 0xE8 }, // (Offset,Value)-Pair #8 - // CDirectSoundVoiceSettings_SetMixBins+0x53 : cmp [ecx+24h], edx + // DirectSound_CDirectSoundVoiceSettings_SetMixBins+0x53 : cmp [ecx+24h], edx { 0x53, 0x39 }, // (Offset,Value)-Pair #9 { 0x54, 0x51 }, // (Offset,Value)-Pair #10 { 0x55, 0x24 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetMixBins +// * DirectSound_CDirectSoundVoice::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 4361, 17, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMixBins, 4361, 17, XREF_DSSETMIXBINSB, XRefOne) - // CDirectSoundVoice_SetMixBins+0x0D : call [CDirectSoundVoiceSettings::SetMixBins] + // DirectSound_CDirectSoundVoice_SetMixBins+0x0D : call [CDirectSoundVoiceSettings::SetMixBins] XREF_ENTRY( 0x0D, XREF_DSSETMIXBINSC ), // (Offset,Value)-Pair #1 - // CDirectSoundVoice_SetMixBins+0x01 : mov esi, [esp+8] + // DirectSound_CDirectSoundVoice_SetMixBins+0x01 : mov esi, [esp+8] { 0x01, 0x8B }, // (Offset,Value)-Pair #2 { 0x02, 0x74 }, // (Offset,Value)-Pair #3 { 0x03, 0x24 }, // (Offset,Value)-Pair #4 { 0x04, 0x08 }, // (Offset,Value)-Pair #5 - // CDirectSoundVoice_SetMixBins+0x05 : push [esp+0x0C] + // DirectSound_CDirectSoundVoice_SetMixBins+0x05 : push [esp+0x0C] { 0x05, 0xFF }, // (Offset,Value)-Pair #6 { 0x06, 0x74 }, // (Offset,Value)-Pair #7 { 0x07, 0x24 }, // (Offset,Value)-Pair #8 { 0x08, 0x0C }, // (Offset,Value)-Pair #9 - // CDirectSoundVoice_SetMixBins+0x09 : mov ecx, [esi+0x10] + // DirectSound_CDirectSoundVoice_SetMixBins+0x09 : mov ecx, [esi+0x10] { 0x09, 0x8B }, // (Offset,Value)-Pair #10 { 0x0A, 0x4E }, // (Offset,Value)-Pair #11 { 0x0B, 0x10 }, // (Offset,Value)-Pair #12 - // CDirectSoundVoice_SetMixBins+0x11 : mov ecx, [esi+0x0C] + // DirectSound_CDirectSoundVoice_SetMixBins+0x11 : mov ecx, [esi+0x0C] { 0x11, 0x8B }, // (Offset,Value)-Pair #13 { 0x12, 0x4E }, // (Offset,Value)-Pair #14 { 0x13, 0x0C }, // (Offset,Value)-Pair #15 - // CDirectSoundVoice_SetMixBins+0x1A : retn 0x08 + // DirectSound_CDirectSoundVoice_SetMixBins+0x1A : retn 0x08 { 0x1A, 0xC2 }, // (Offset,Value)-Pair #16 { 0x1B, 0x08 }, // (Offset,Value)-Pair #17 OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMixBins +// * DirectSound_CDirectSoundBuffer::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 4361, 17, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMixBins, 4361, 17, XREF_DSSETMIXBINSA, XRefOne) - // CDirectSoundBuffer_SetMixBins+0x32 : call [CDirectSoundVoice::SetMixBins] + // DirectSound_CDirectSoundBuffer_SetMixBins+0x32 : call [CDirectSoundVoice::SetMixBins] XREF_ENTRY( 0x32, XREF_DSSETMIXBINSB ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_SetMixBins+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_SetMixBins+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 { 0x22, 0x05 }, // (Offset,Value)-Pair #3 { 0x23, 0x40 }, // (Offset,Value)-Pair #4 { 0x24, 0x00 }, // (Offset,Value)-Pair #5 { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_SetMixBins+0x29 : push [esp+0x10]; push [esp+0x10] + // DirectSound_CDirectSoundBuffer_SetMixBins+0x29 : push [esp+0x10]; push [esp+0x10] { 0x29, 0xFF }, // (Offset,Value)-Pair #7 { 0x2A, 0x74 }, // (Offset,Value)-Pair #8 { 0x2B, 0x24 }, // (Offset,Value)-Pair #9 @@ -1005,10 +1005,10 @@ OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 4361, 17, { 0x2F, 0x24 }, // (Offset,Value)-Pair #13 { 0x30, 0x10 }, // (Offset,Value)-Pair #14 - // CDirectSoundBuffer_SetMixBins+0x49 : pop edi + // DirectSound_CDirectSoundBuffer_SetMixBins+0x49 : pop edi { 0x49, 0x5F }, // (Offset,Value)-Pair #15 - // CDirectSoundBuffer_SetMixBins+0x4B : retn 0x08 + // DirectSound_CDirectSoundBuffer_SetMixBins+0x4B : retn 0x08 { 0x4B, 0xC2 }, // (Offset,Value)-Pair #16 { 0x4C, 0x08 }, // (Offset,Value)-Pair #17 OOVPA_END; @@ -1052,33 +1052,33 @@ OOVPATable DSound_4361[] = { REGISTER_OOVPA(DirectSoundCreate, 4361, PATCH), REGISTER_OOVPA(DirectSoundDoWork, 4361, PATCH), REGISTER_OOVPA(DirectSoundGetSampleTime, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), REGISTER_OOVPA(IDirectSound8_CreateStream, 3936, PATCH), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 4361, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4361, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4361, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPlayRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4361, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3936, PATCH), REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Play, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_Stop, 4361, XREF), REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Stop, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4361, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 4361, XREF), @@ -1089,9 +1089,9 @@ OOVPATable DSound_4361[] = { REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4361, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4361, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl index 1952a9868..85e8431f9 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl @@ -71,52 +71,52 @@ OOVPA_NO_XREF(IDirectSound8_Release, 4432, 12) OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetMaxDistance +// * DirectSound_CDirectSoundVoice::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 4432, 9, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMaxDistance, 4432, 9, XREF_DSVOICESETMAXDISTANCE, XRefZero) - // CDirectSoundVoice_SetMaxDistance+0x0D : mov edx, [esp+arg_4] + // DirectSound_CDirectSoundVoice_SetMaxDistance+0x0D : mov edx, [esp+arg_4] { 0x0D, 0x8B }, { 0x0E, 0x54 }, { 0x0F, 0x24 }, { 0x10, 0x08 }, - // CDirectSoundVoice_SetMaxDistance+0x11 : mov [eax+38h], edx + // DirectSound_CDirectSoundVoice_SetMaxDistance+0x11 : mov [eax+38h], edx { 0x11, 0x89 }, { 0x12, 0x50 }, { 0x13, 0x38 }, - // CDirectSoundVoice_SetMaxDistance+0x30 : retn 0Ch + // DirectSound_CDirectSoundVoice_SetMaxDistance+0x30 : retn 0Ch { 0x31, 0x0C }, { 0x32, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMaxDistance +// * DirectSound_CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 4432, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMaxDistance, 4432, 10, XREF_DSBUFFERSETMAXDISTANCE, XRefOne) - // CDirectSoundBuffer_SetMaxDistance+0x39 : call [CDirectSoundVoice::SetMaxDistance] + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x39 : call [CDirectSoundVoice::SetMaxDistance] XREF_ENTRY( 0x3A, XREF_DSVOICESETMAXDISTANCE ), - // CDirectSoundBuffer_SetMaxDistance+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetMaxDistance+0x32 : fstp [esp+0Ch+var_C] + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x32 : fstp [esp+0Ch+var_C] { 0x32, 0xD9 }, { 0x33, 0x1C }, { 0x34, 0x24 }, - // CDirectSoundBuffer_SetMaxDistance+0x53 : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x53 : retn 0Ch { 0x54, 0x0C }, { 0x55, 0x00 } OOVPA_END; @@ -149,52 +149,52 @@ OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 4432, 10, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetMinDistance +// * DirectSound_CDirectSoundVoice::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 4432, 9, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMinDistance, 4432, 9, XREF_DSVOICESETMINDISTANCE, XRefZero) - // CDirectSoundVoice_SetMinDistance+0x0D : mov edx, [esp+arg_4] + // DirectSound_CDirectSoundVoice_SetMinDistance+0x0D : mov edx, [esp+arg_4] { 0x0D, 0x8B }, { 0x0E, 0x54 }, { 0x0F, 0x24 }, { 0x10, 0x08 }, - // CDirectSoundVoice_SetMinDistance+0x11 : mov [eax+34h], edx + // DirectSound_CDirectSoundVoice_SetMinDistance+0x11 : mov [eax+34h], edx { 0x11, 0x89 }, { 0x12, 0x50 }, { 0x13, 0x34 }, - // CDirectSoundVoice_SetMinDistance+0x30 : retn 0Ch + // DirectSound_CDirectSoundVoice_SetMinDistance+0x30 : retn 0Ch { 0x31, 0x0C }, { 0x32, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMinDistance +// * DirectSound_CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 4432, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMinDistance, 4432, 10, XREF_DSBUFFERSETMINDISTANCE, XRefOne) - // CDirectSoundBuffer_SetMinDistance+0x39 : call [CDirectSoundVoice::SetMinDistance] + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x39 : call [CDirectSoundVoice::SetMinDistance] XREF_ENTRY( 0x3A, XREF_DSVOICESETMINDISTANCE ), - // CDirectSoundBuffer_SetMinDistance+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetMinDistance+0x32 : fstp [esp+0Ch+var_C] + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x32 : fstp [esp+0Ch+var_C] { 0x32, 0xD9 }, { 0x33, 0x1C }, { 0x34, 0x24 }, - // CDirectSoundBuffer_SetMinDistance+0x53 : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x53 : retn 0Ch { 0x54, 0x0C }, { 0x55, 0x00 } OOVPA_END; @@ -227,26 +227,26 @@ OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 4432, 10, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetI3DL2Listener +// * DirectSound_CDirectSound::SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(CDirectSound_SetI3DL2Listener, 4432, 11, +OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 4432, 11, XREF_DSSETI3DL2LISTENER, XRefZero) - // CDirectSound_SetI3DL2Listener+0x3A : mov edi, 0x88780032 + // DirectSound_CDirectSound_SetI3DL2Listener+0x3A : mov edi, 0x88780032 { 0x3A, 0xBF }, // (Offset,Value)-Pair #1 { 0x3B, 0x32 }, // (Offset,Value)-Pair #2 { 0x3C, 0x00 }, // (Offset,Value)-Pair #3 { 0x3D, 0x78 }, // (Offset,Value)-Pair #4 { 0x3E, 0x88 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetI3DL2Listener+0xA2 : fstp dword ptr[edx+0x94] + // DirectSound_CDirectSound_SetI3DL2Listener+0xA2 : fstp dword ptr[edx+0x94] { 0xA2, 0xD9 }, // (Offset,Value)-Pair #6 { 0xA3, 0x9A }, // (Offset,Value)-Pair #7 { 0xA4, 0x94 }, // (Offset,Value)-Pair #8 - // CDirectSound_SetI3DL2Listener+0xA8 : fld dword ptr[ecx+0x24] + // DirectSound_CDirectSound_SetI3DL2Listener+0xA8 : fld dword ptr[ecx+0x24] { 0xA8, 0xD9 }, // (Offset,Value)-Pair #9 { 0xA9, 0x41 }, // (Offset,Value)-Pair #10 { 0xAA, 0x24 }, // (Offset,Value)-Pair #11 @@ -284,89 +284,89 @@ OOVPA_XREF(IDirectSound8_SetI3DL2Listener, 4432, 12, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoiceSettings::SetMixBins +// * DirectSound_CDirectSoundVoiceSettings::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 4432, 10, +OOVPA_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4432, 10, XREF_DSSETMIXBINSC, XRefZero) - // CDirectSoundVoiceSettings_SetMixBins+0x06 : jnz +0x1A + // DirectSound_CDirectSoundVoiceSettings_SetMixBins+0x06 : jnz +0x1A { 0x06, 0x75 }, // (Offset,Value)-Pair #1 { 0x07, 0x1A }, // (Offset,Value)-Pair #2 - // CDirectSoundVoiceSettings_SetMixBins+0x08 : test byte ptr [ecx+8], 0x10 + // DirectSound_CDirectSoundVoiceSettings_SetMixBins+0x08 : test byte ptr [ecx+8], 0x10 { 0x08, 0xF6 }, // (Offset,Value)-Pair #3 { 0x09, 0x41 }, // (Offset,Value)-Pair #4 { 0x0A, 0x08 }, // (Offset,Value)-Pair #5 { 0x0B, 0x10 }, // (Offset,Value)-Pair #6 - // CDirectSoundVoiceSettings_SetMixBins+0x2B : jbe +0x2B + // DirectSound_CDirectSoundVoiceSettings_SetMixBins+0x2B : jbe +0x2B { 0x2B, 0x76 }, // (Offset,Value)-Pair #7 { 0x2C, 0x2B }, // (Offset,Value)-Pair #8 - // CDirectSoundVoiceSettings_SetMixBins+0xB2 : retn 0x04 + // DirectSound_CDirectSoundVoiceSettings_SetMixBins+0xB2 : retn 0x04 { 0xB2, 0xC2 }, // (Offset,Value)-Pair #9 { 0xB3, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetMixBins +// * DirectSound_CDirectSoundVoice::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 4432, 17, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMixBins, 4432, 17, XREF_DSSETMIXBINSB, XRefOne) - // CDirectSoundVoice_SetMixBins+0x0D : call [CDirectSoundVoiceSettings::SetMixBins] + // DirectSound_CDirectSoundVoice_SetMixBins+0x0D : call [CDirectSoundVoiceSettings::SetMixBins] XREF_ENTRY( 0x0D, XREF_DSSETMIXBINSC ), // (Offset,Value)-Pair #1 - // CDirectSoundVoice_SetMixBins+0x01 : mov esi, [esp+8] + // DirectSound_CDirectSoundVoice_SetMixBins+0x01 : mov esi, [esp+8] { 0x01, 0x8B }, // (Offset,Value)-Pair #2 { 0x02, 0x74 }, // (Offset,Value)-Pair #3 { 0x03, 0x24 }, // (Offset,Value)-Pair #4 { 0x04, 0x08 }, // (Offset,Value)-Pair #5 - // CDirectSoundVoice_SetMixBins+0x05 : push [esp+0x0C] + // DirectSound_CDirectSoundVoice_SetMixBins+0x05 : push [esp+0x0C] { 0x05, 0xFF }, // (Offset,Value)-Pair #6 { 0x06, 0x74 }, // (Offset,Value)-Pair #7 { 0x07, 0x24 }, // (Offset,Value)-Pair #8 { 0x08, 0x0C }, // (Offset,Value)-Pair #9 - // CDirectSoundVoice_SetMixBins+0x09 : mov ecx, [esi+0x10] + // DirectSound_CDirectSoundVoice_SetMixBins+0x09 : mov ecx, [esi+0x10] { 0x09, 0x8B }, // (Offset,Value)-Pair #10 { 0x0A, 0x4E }, // (Offset,Value)-Pair #11 { 0x0B, 0x10 }, // (Offset,Value)-Pair #12 - // CDirectSoundVoice_SetMixBins+0x11 : mov ecx, [esi+0x0C] + // DirectSound_CDirectSoundVoice_SetMixBins+0x11 : mov ecx, [esi+0x0C] { 0x11, 0x8B }, // (Offset,Value)-Pair #13 { 0x12, 0x4E }, // (Offset,Value)-Pair #14 { 0x13, 0x0C }, // (Offset,Value)-Pair #15 - // CDirectSoundVoice_SetMixBins+0x1A : retn 0x08 + // DirectSound_CDirectSoundVoice_SetMixBins+0x1A : retn 0x08 { 0x1A, 0xC2 }, // (Offset,Value)-Pair #16 { 0x1B, 0x08 }, // (Offset,Value)-Pair #17 OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMixBins +// * DirectSound_CDirectSoundBuffer::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 4432, 17, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMixBins, 4432, 17, XREF_DSSETMIXBINSA, XRefOne) - // CDirectSoundBuffer_SetMixBins+0x32 : call [CDirectSoundVoice::SetMixBins] + // DirectSound_CDirectSoundBuffer_SetMixBins+0x32 : call [CDirectSoundVoice::SetMixBins] XREF_ENTRY( 0x32, XREF_DSSETMIXBINSB ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_SetMixBins+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_SetMixBins+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 { 0x22, 0x05 }, // (Offset,Value)-Pair #3 { 0x23, 0x40 }, // (Offset,Value)-Pair #4 { 0x24, 0x00 }, // (Offset,Value)-Pair #5 { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_SetMixBins+0x29 : push [esp+0x10]; push [esp+0x10] + // DirectSound_CDirectSoundBuffer_SetMixBins+0x29 : push [esp+0x10]; push [esp+0x10] { 0x29, 0xFF }, // (Offset,Value)-Pair #7 { 0x2A, 0x74 }, // (Offset,Value)-Pair #8 { 0x2B, 0x24 }, // (Offset,Value)-Pair #9 @@ -376,10 +376,10 @@ OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 4432, 17, { 0x2F, 0x24 }, // (Offset,Value)-Pair #13 { 0x30, 0x10 }, // (Offset,Value)-Pair #14 - // CDirectSoundBuffer_SetMixBins+0x49 : pop edi + // DirectSound_CDirectSoundBuffer_SetMixBins+0x49 : pop edi { 0x49, 0x5F }, // (Offset,Value)-Pair #15 - // CDirectSoundBuffer_SetMixBins+0x4B : retn 0x08 + // DirectSound_CDirectSoundBuffer_SetMixBins+0x4B : retn 0x08 { 0x4B, 0xC2 }, // (Offset,Value)-Pair #16 { 0x4C, 0x08 }, // (Offset,Value)-Pair #17 OOVPA_END; @@ -416,52 +416,52 @@ OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 4432, 12, OOVPA_END; // ****************************************************************** -// * CDirectSound::CommitDeferredSettings +// * DirectSound_CDirectSound::CommitDeferredSettings // ****************************************************************** -OOVPA_NO_XREF(CDirectSound_CommitDeferredSettings, 4432, 11) +OOVPA_NO_XREF(DirectSound_CDirectSound_CommitDeferredSettings, 4432, 11) - // CDirectSound_CommitDeferredSettings+0x10 : movzx eax, al + // DirectSound_CDirectSound_CommitDeferredSettings+0x10 : movzx eax, al { 0x10, 0x0F }, // (Offset,Value)-Pair #1 { 0x11, 0xB6 }, // (Offset,Value)-Pair #2 { 0x12, 0xC0 }, // (Offset,Value)-Pair #3 - // CDirectSound_CommitDeferredSettings+0x27 : mov eax, 0x80004005 + // DirectSound_CDirectSound_CommitDeferredSettings+0x27 : mov eax, 0x80004005 { 0x27, 0xB8 }, // (Offset,Value)-Pair #4 { 0x28, 0x05 }, // (Offset,Value)-Pair #5 { 0x29, 0x40 }, // (Offset,Value)-Pair #6 { 0x2B, 0x80 }, // (Offset,Value)-Pair #7 - // CDirectSound_CommitDeferredSettings+0x5C : and [eax+0xA4], esi + // DirectSound_CDirectSound_CommitDeferredSettings+0x5C : and [eax+0xA4], esi { 0x5C, 0x21 }, // (Offset,Value)-Pair #8 { 0x5D, 0xB0 }, // (Offset,Value)-Pair #9 { 0x5E, 0xA4 }, // (Offset,Value)-Pair #10 - // CDirectSound_CommitDeferredSettings+0x78 : leave + // DirectSound_CDirectSound_CommitDeferredSettings+0x78 : leave { 0x78, 0xC9 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetDistanceFactorA +// * DirectSound_CDirectSound::SetDistanceFactorA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDistanceFactorA, 4432, 11, +OOVPA_XREF(DirectSound_CDirectSound_SetDistanceFactorA, 4432, 11, XREF_SETDISTANCEFACTORA, XRefZero) - // CDirectSound_SetDistanceFactorA+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetDistanceFactorA+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 { 0x22, 0x05 }, // (Offset,Value)-Pair #2 { 0x23, 0x40 }, // (Offset,Value)-Pair #3 { 0x24, 0x00 }, // (Offset,Value)-Pair #4 { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetDistanceFactorA+0x39 : or dword ptr[eax+0xA4], 0x60 + // DirectSound_CDirectSound_SetDistanceFactorA+0x39 : or dword ptr[eax+0xA4], 0x60 { 0x39, 0x83 }, // (Offset,Value)-Pair #6 { 0x3A, 0x88 }, // (Offset,Value)-Pair #7 { 0x3B, 0xA4 }, // (Offset,Value)-Pair #8 { 0x3F, 0x60 }, // (Offset,Value)-Pair #9 - // CDirectSound_SetDistanceFactorA+0x4F : jz +0x0B + // DirectSound_CDirectSound_SetDistanceFactorA+0x4F : jz +0x0B { 0x4F, 0x74 }, // (Offset,Value)-Pair #10 { 0x50, 0x0B }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -497,24 +497,24 @@ OOVPA_XREF(IDirectSound8_SetDistanceFactor, 4432, 11, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetPositionA +// * DirectSound_CDirectSound::SetPositionA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetPositionA, 4432, 11, +OOVPA_XREF(DirectSound_CDirectSound_SetPositionA, 4432, 11, XREF_DSSETPOSITIONA, XRefZero) - // CDirectSound_SetPositionA+0x2B : mov ecx, [ebp+0x08] + // DirectSound_CDirectSound_SetPositionA+0x2B : mov ecx, [ebp+0x08] { 0x2B, 0x8B }, // (Offset,Value)-Pair #1 { 0x2C, 0x4D }, // (Offset,Value)-Pair #2 { 0x2D, 0x08 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetPositionA+0x3F : mov [edx+0x3C], edi + // DirectSound_CDirectSound_SetPositionA+0x3F : mov [edx+0x3C], edi { 0x3F, 0x89 }, // (Offset,Value)-Pair #4 { 0x40, 0x7A }, // (Offset,Value)-Pair #5 { 0x41, 0x3C }, // (Offset,Value)-Pair #6 - // CDirectSound_SetPositionA+0x4C : or word ptr [eax+0xA4], 0x01FF + // DirectSound_CDirectSound_SetPositionA+0x4C : or word ptr [eax+0xA4], 0x01FF { 0x4C, 0x80 }, // (Offset,Value)-Pair #7 { 0x4D, 0x88 }, // (Offset,Value)-Pair #8 { 0x4E, 0xA4 }, // (Offset,Value)-Pair #9 @@ -523,56 +523,56 @@ OOVPA_XREF(CDirectSound_SetPositionA, 4432, 11, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetVelocity +// * DirectSound_CDirectSound::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSound_SetVelocity, 4432, 15, +OOVPA_XREF(DirectSound_CDirectSound_SetVelocity, 4432, 15, XREF_DSSETVELOCITYA, XRefZero) - // CDirectSound_SetVelocity+0x24 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetVelocity+0x24 : mov eax, 0x80004005 { 0x24, 0xB8 }, // (Offset,Value)-Pair #1 { 0x25, 0x05 }, // (Offset,Value)-Pair #2 { 0x26, 0x40 }, // (Offset,Value)-Pair #3 { 0x27, 0x00 }, // (Offset,Value)-Pair #4 { 0x28, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetVelocity+0x37 : mov [edx+0x44], edi + // DirectSound_CDirectSound_SetVelocity+0x37 : mov [edx+0x44], edi { 0x37, 0x89 }, // (Offset,Value)-Pair #6 { 0x38, 0x7A }, // (Offset,Value)-Pair #7 { 0x39, 0x44 }, // (Offset,Value)-Pair #8 - // CDirectSound_SetVelocity+0x4C : or dword ptr [eax+0x0A4], 0x40 + // DirectSound_CDirectSound_SetVelocity+0x4C : or dword ptr [eax+0x0A4], 0x40 { 0x4C, 0x83 }, // (Offset,Value)-Pair #9 { 0x4D, 0x88 }, // (Offset,Value)-Pair #10 { 0x4E, 0xA4 }, // (Offset,Value)-Pair #11 { 0x4F, 0x00 }, // (Offset,Value)-Pair #12 { 0x52, 0x40 }, // (Offset,Value)-Pair #13 - // CDirectSound_SetVelocity+0x73 : retn 0x14 + // DirectSound_CDirectSound_SetVelocity+0x73 : retn 0x14 { 0x73, 0xC2 }, // (Offset,Value)-Pair #14 { 0x74, 0x14 }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetPosition +// * DirectSound_CDirectSoundVoice::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetPosition, 4432, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetPosition, 4432, 8, XREF_DSVOICESETPOSITION, XRefZero) - // CDirectSoundVoice_SetPosition+0x0F : mov edx, [ebp+arg_4] + // DirectSound_CDirectSoundVoice_SetPosition+0x0F : mov edx, [ebp+arg_4] { 0x0F, 0x8B }, { 0x10, 0x55 }, { 0x11, 0x0C }, - // CDirectSoundVoice_SetPosition+0x12 : mov [ecx+04h], edx + // DirectSound_CDirectSoundVoice_SetPosition+0x12 : mov [ecx+04h], edx { 0x12, 0x89 }, { 0x13, 0x51 }, { 0x14, 0x04 }, - // CDirectSoundVoice_SetPosition+0x4F : retn 14h + // DirectSound_CDirectSoundVoice_SetPosition+0x4F : retn 14h { 0x4F, 0xC2 }, { 0x50, 0x14 } OOVPA_END; @@ -586,43 +586,43 @@ OOVPATable DSound_4432[] = { REGISTER_OOVPA(DirectSoundDoWork, 4432, PATCH), REGISTER_OOVPA(DirectSoundGetSampleTime, 4432, PATCH), REGISTER_OOVPA(IDirectSound8_CreateStream, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 4361, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4361, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_Release, 4432, PATCH), REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4361, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_Stop, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Stop, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4361, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 4432, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 4432, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 4432, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 4432, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4432, XREF), REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 4432, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4432, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4432, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4432, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 4432, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactorA, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 4432, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 4432, XREF), REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPlayRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 2af665d37..e75f76a69 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -43,24 +43,24 @@ #define DirectSoundGetSampleTime_4627 DirectSoundGetSampleTime_4361 // ****************************************************************** -// * CDirectSound::CreateSoundBuffer +// * DirectSound_CDirectSound::CreateSoundBuffer // ****************************************************************** -OOVPA_XREF(CDirectSound_CreateSoundBuffer, 4627, 14, +OOVPA_XREF(DirectSound_CDirectSound_CreateSoundBuffer, 4627, 14, XREF_DSCREATESOUNDBUFFER, XRefZero) - // CDirectSound_CreateSoundBuffer+0x23 : mov eax, 0x80004005 + // DirectSound_CDirectSound_CreateSoundBuffer+0x23 : mov eax, 0x80004005 { 0x23, 0xB8 }, // (Offset,Value)-Pair #1 { 0x24, 0x05 }, // (Offset,Value)-Pair #2 { 0x25, 0x40 }, // (Offset,Value)-Pair #3 { 0x27, 0x80 }, // (Offset,Value)-Pair #4 - // CDirectSound_CreateSoundBuffer+0x2A : push 0x24 + // DirectSound_CDirectSound_CreateSoundBuffer+0x2A : push 0x24 { 0x2A, 0x6A }, // (Offset,Value)-Pair #5 { 0x2B, 0x24 }, // (Offset,Value)-Pair #6 - // CDirectSound_CreateSoundBuffer+0x4A : add esi, 0x7FF8FFF2 + // DirectSound_CDirectSound_CreateSoundBuffer+0x4A : add esi, 0x7FF8FFF2 { 0x4A, 0x81 }, // (Offset,Value)-Pair #7 { 0x4B, 0xE6 }, // (Offset,Value)-Pair #8 { 0x4C, 0xF2 }, // (Offset,Value)-Pair #9 @@ -68,39 +68,39 @@ OOVPA_XREF(CDirectSound_CreateSoundBuffer, 4627, 14, { 0x4E, 0xF8 }, // (Offset,Value)-Pair #11 { 0x4F, 0x7F }, // (Offset,Value)-Pair #12 - // CDirectSound_CreateSoundBuffer+0x99 : retn 0x10 + // DirectSound_CDirectSound_CreateSoundBuffer+0x99 : retn 0x10 { 0x99, 0xC2 }, // (Offset,Value)-Pair #13 { 0x9A, 0x10 }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetMixBinHeadroom +// * DirectSound_CDirectSound::SetMixBinHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSound_SetMixBinHeadroom, 4627, 15, +OOVPA_XREF(DirectSound_CDirectSound_SetMixBinHeadroom, 4627, 15, XREF_DSSETMIXBINHEADROOMA, XRefZero) - // CDirectSound_SetMixBinHeadroom+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetMixBinHeadroom+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 { 0x22, 0x05 }, // (Offset,Value)-Pair #2 { 0x23, 0x40 }, // (Offset,Value)-Pair #3 { 0x24, 0x00 }, // (Offset,Value)-Pair #4 { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetMixBinHeadroom+0x34 : mov bl, [esp+0x14] + // DirectSound_CDirectSound_SetMixBinHeadroom+0x34 : mov bl, [esp+0x14] { 0x34, 0x8A }, // (Offset,Value)-Pair #6 { 0x35, 0x5C }, // (Offset,Value)-Pair #7 { 0x36, 0x24 }, // (Offset,Value)-Pair #8 { 0x37, 0x14 }, // (Offset,Value)-Pair #9 - // CDirectSound_SetMixBinHeadroom+0x39 : mov [edx+ecx+0x14], bl + // DirectSound_CDirectSound_SetMixBinHeadroom+0x39 : mov [edx+ecx+0x14], bl { 0x39, 0x88 }, // (Offset,Value)-Pair #10 { 0x3A, 0x5C }, // (Offset,Value)-Pair #11 { 0x3B, 0x0A }, // (Offset,Value)-Pair #12 { 0x3C, 0x14 }, // (Offset,Value)-Pair #13 - // CDirectSound_SetMixBinHeadroom+0x5C : retn 0x0C + // DirectSound_CDirectSound_SetMixBinHeadroom+0x5C : retn 0x0C { 0x5C, 0xC2 }, // (Offset,Value)-Pair #14 { 0x5D, 0x0C }, // (Offset,Value)-Pair #15 OOVPA_END; @@ -174,41 +174,41 @@ OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 4928, 8, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetVelocity +// * DirectSound_CDirectSound::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSound_SetVelocity, 4627, 15, +OOVPA_XREF(DirectSound_CDirectSound_SetVelocity, 4627, 15, XREF_DSSETVELOCITYA, XRefZero) - // CDirectSound_SetVelocity+0x24 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetVelocity+0x24 : mov eax, 0x80004005 { 0x24, 0xB8 }, // (Offset,Value)-Pair #1 { 0x25, 0x05 }, // (Offset,Value)-Pair #2 { 0x26, 0x40 }, // (Offset,Value)-Pair #3 { 0x27, 0x00 }, // (Offset,Value)-Pair #4 { 0x28, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetVelocity+0x37 : mov [edx+0x44], edi + // DirectSound_CDirectSound_SetVelocity+0x37 : mov [edx+0x44], edi { 0x37, 0x89 }, // (Offset,Value)-Pair #6 { 0x38, 0x7A }, // (Offset,Value)-Pair #7 { 0x39, 0x44 }, // (Offset,Value)-Pair #8 - // CDirectSound_SetVelocity+0x4C : or byte ptr [eax+0x0x00A4], 0x80 + // DirectSound_CDirectSound_SetVelocity+0x4C : or byte ptr [eax+0x0x00A4], 0x80 { 0x4C, 0x80 }, // (Offset,Value)-Pair #9 { 0x4D, 0x88 }, // (Offset,Value)-Pair #10 { 0x4E, 0xA4 }, // (Offset,Value)-Pair #11 { 0x4F, 0x00 }, // (Offset,Value)-Pair #12 { 0x52, 0x80 }, // (Offset,Value)-Pair #13 - // CDirectSound_SetVelocity+0x73 : retn 0x14 + // DirectSound_CDirectSound_SetVelocity+0x73 : retn 0x14 { 0x73, 0xC2 }, // (Offset,Value)-Pair #14 { 0x74, 0x14 }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetAllParametersA +// * DirectSound_CDirectSound::SetAllParametersA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParametersA, 4627, 10, +OOVPA_XREF(DirectSound_CDirectSound_SetAllParametersA, 4627, 10, XREF_DSSETALLPARAMETERSA, XRefZero) @@ -228,9 +228,9 @@ OOVPA_XREF(CDirectSound_SetAllParametersA, 4627, 10, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetAllParametersA +// * DirectSound_CDirectSound::SetAllParametersA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParametersA, 4721, 10, +OOVPA_XREF(DirectSound_CDirectSound_SetAllParametersA, 4721, 10, XREF_DSSETALLPARAMETERSA, XRefZero) @@ -268,89 +268,89 @@ OOVPA_XREF(DirectSound_CDirectSound_SetAllParameters, 4928, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoiceSettings::SetMixBinVolumes +// * DirectSound_CDirectSoundVoiceSettings::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, 10, +OOVPA_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, 10, XREF_DSSETMIXBINVOLUMESC, XRefZero) - // CDirectSoundVoiceSettings_SetMixBinVolumes+0x09 : jbe +0x16 + // DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes+0x09 : jbe +0x16 { 0x09, 0x76 }, // (Offset,Value)-Pair #1 { 0x0A, 0x16 }, // (Offset,Value)-Pair #2 - // CDirectSoundVoiceSettings_SetMixBinVolumes+0x18 : mov [ecx+edi*4+0x30], eax + // DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes+0x18 : mov [ecx+edi*4+0x30], eax { 0x18, 0x89 }, // (Offset,Value)-Pair #3 { 0x19, 0x44 }, // (Offset,Value)-Pair #4 { 0x1A, 0xB9 }, // (Offset,Value)-Pair #5 { 0x1B, 0x30 }, // (Offset,Value)-Pair #6 - // CDirectSoundVoiceSettings_SetMixBinVolumes+0x1E : jb +0xEC + // DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes+0x1E : jb +0xEC { 0x1E, 0x72 }, // (Offset,Value)-Pair #7 { 0x1F, 0xEC }, // (Offset,Value)-Pair #8 - // CDirectSoundVoiceSettings_SetMixBinVolumes+0x22 : retn 0x04 + // DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes+0x22 : retn 0x04 { 0x22, 0xC2 }, // (Offset,Value)-Pair #9 { 0x23, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetMixBinVolumes +// * DirectSound_CDirectSoundVoice::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 4627, 17, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 4627, 17, XREF_DSSETMIXBINVOLUMESB, XRefOne) - // CDirectSoundVoice_SetMixBinVolumes+0x0D : call [CDirectSoundVoiceSettings::SetMixBinVolumes] + // DirectSound_CDirectSoundVoice_SetMixBinVolumes+0x0D : call [CDirectSoundVoiceSettings::SetMixBinVolumes] XREF_ENTRY( 0x0D, XREF_DSSETMIXBINVOLUMESC ), // (Offset,Value)-Pair #1 - // CDirectSoundVoice_SetMixBinVolumes+0x01 : mov esi, [esp+8] + // DirectSound_CDirectSoundVoice_SetMixBinVolumes+0x01 : mov esi, [esp+8] { 0x01, 0x8B }, // (Offset,Value)-Pair #2 { 0x02, 0x74 }, // (Offset,Value)-Pair #3 { 0x03, 0x24 }, // (Offset,Value)-Pair #4 { 0x04, 0x08 }, // (Offset,Value)-Pair #5 - // CDirectSoundVoice_SetMixBinVolumes+0x05 : push [esp+0x0C] + // DirectSound_CDirectSoundVoice_SetMixBinVolumes+0x05 : push [esp+0x0C] { 0x05, 0xFF }, // (Offset,Value)-Pair #6 { 0x06, 0x74 }, // (Offset,Value)-Pair #7 { 0x07, 0x24 }, // (Offset,Value)-Pair #8 { 0x08, 0x0C }, // (Offset,Value)-Pair #9 - // CDirectSoundVoice_SetMixBinVolumes+0x09 : mov ecx, [esi+0x10] + // DirectSound_CDirectSoundVoice_SetMixBinVolumes+0x09 : mov ecx, [esi+0x10] { 0x09, 0x8B }, // (Offset,Value)-Pair #10 { 0x0A, 0x4E }, // (Offset,Value)-Pair #11 { 0x0B, 0x10 }, // (Offset,Value)-Pair #12 - // CDirectSoundVoice_SetMixBinVolumes+0x11 : mov ecx, [esi+0x0C] + // DirectSound_CDirectSoundVoice_SetMixBinVolumes+0x11 : mov ecx, [esi+0x0C] { 0x11, 0x8B }, // (Offset,Value)-Pair #13 { 0x12, 0x4E }, // (Offset,Value)-Pair #14 { 0x13, 0x0C }, // (Offset,Value)-Pair #15 - // CDirectSoundVoice_SetMixBinVolumes+0x1A : retn 0x08 + // DirectSound_CDirectSoundVoice_SetMixBinVolumes+0x1A : retn 0x08 { 0x1A, 0xC2 }, // (Offset,Value)-Pair #16 { 0x1B, 0x08 }, // (Offset,Value)-Pair #17 OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMixBinVolumes +// * DirectSound_CDirectSoundBuffer::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMixBinVolumes, 4627, 17, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4627, 17, XREF_DSSETMIXBINVOLUMESA, XRefOne) - // CDirectSoundBuffer_SetMixBinVolumes+0x32 : call [CDirectSoundVoice::SetMixBinVolumes] + // DirectSound_CDirectSoundBuffer_SetMixBinVolumes+0x32 : call [CDirectSoundVoice::SetMixBinVolumes] XREF_ENTRY( 0x32, XREF_DSSETMIXBINVOLUMESB ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_SetMixBinVolumes+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_SetMixBinVolumes+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 { 0x22, 0x05 }, // (Offset,Value)-Pair #3 { 0x23, 0x40 }, // (Offset,Value)-Pair #4 { 0x24, 0x00 }, // (Offset,Value)-Pair #5 { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_SetMixBinVolumes+0x29 : push [esp+0x10]; push [esp+0x10] + // DirectSound_CDirectSoundBuffer_SetMixBinVolumes+0x29 : push [esp+0x10]; push [esp+0x10] { 0x29, 0xFF }, // (Offset,Value)-Pair #7 { 0x2A, 0x74 }, // (Offset,Value)-Pair #8 { 0x2B, 0x24 }, // (Offset,Value)-Pair #9 @@ -360,10 +360,10 @@ OOVPA_XREF(CDirectSoundBuffer_SetMixBinVolumes, 4627, 17, { 0x2F, 0x24 }, // (Offset,Value)-Pair #13 { 0x30, 0x10 }, // (Offset,Value)-Pair #14 - // CDirectSoundBuffer_SetMixBinVolumes+0x49 : pop edi + // DirectSound_CDirectSoundBuffer_SetMixBinVolumes+0x49 : pop edi { 0x49, 0x5F }, // (Offset,Value)-Pair #15 - // CDirectSoundBuffer_SetMixBinVolumes+0x4B : retn 0x08 + // DirectSound_CDirectSoundBuffer_SetMixBinVolumes+0x4B : retn 0x08 { 0x4B, 0xC2 }, // (Offset,Value)-Pair #16 { 0x4C, 0x08 }, // (Offset,Value)-Pair #17 OOVPA_END; @@ -400,24 +400,24 @@ OOVPA_XREF(IDirectSoundBuffer_SetMixBinVolumes, 4627, 12, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetPositionA +// * DirectSound_CDirectSound::SetPositionA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetPositionA, 4627, 11, +OOVPA_XREF(DirectSound_CDirectSound_SetPositionA, 4627, 11, XREF_DSSETPOSITIONA, XRefZero) - // CDirectSound_SetPositionA+0x2B : mov ecx, [ebp+0x08] + // DirectSound_CDirectSound_SetPositionA+0x2B : mov ecx, [ebp+0x08] { 0x2B, 0x8B }, // (Offset,Value)-Pair #1 { 0x2C, 0x4D }, // (Offset,Value)-Pair #2 { 0x2D, 0x08 }, // (Offset,Value)-Pair #3 - // CDirectSound_SetPositionA+0x3F : mov [edx+0x3C], edi + // DirectSound_CDirectSound_SetPositionA+0x3F : mov [edx+0x3C], edi { 0x3F, 0x89 }, // (Offset,Value)-Pair #4 { 0x40, 0x7A }, // (Offset,Value)-Pair #5 { 0x41, 0x3C }, // (Offset,Value)-Pair #6 - // CDirectSound_SetPositionA+0x4C : or word ptr [eax+0xA4], 0x01FF + // DirectSound_CDirectSound_SetPositionA+0x4C : or word ptr [eax+0xA4], 0x01FF { 0x4C, 0x66 }, // (Offset,Value)-Pair #7 { 0x4D, 0x81 }, // (Offset,Value)-Pair #8 { 0x4E, 0x88 }, // (Offset,Value)-Pair #9 @@ -488,52 +488,52 @@ OOVPA_XREF(IDirectSound8_CreateSoundBuffer, 4627, 12, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetFrequency +// * DirectSound_CDirectSoundVoice::SetFrequency // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetFrequency, 4627, 11, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetFrequency, 4627, 11, XREF_DSBUFFERSETFREQUENCYB, XRefZero) - // CDirectSoundVoice_SetFrequency+0x0D : mov eax, [esi+0x10] + // DirectSound_CDirectSoundVoice_SetFrequency+0x0D : mov eax, [esi+0x10] { 0x0D, 0x8B }, // (Offset,Value)-Pair #1 { 0x0E, 0x46 }, // (Offset,Value)-Pair #2 { 0x0F, 0x10 }, // (Offset,Value)-Pair #3 - // CDirectSoundVoice_SetFrequency+0x10 : mov eax, [eax+0x10] + // DirectSound_CDirectSoundVoice_SetFrequency+0x10 : mov eax, [eax+0x10] { 0x10, 0x8B }, // (Offset,Value)-Pair #4 { 0x11, 0x40 }, // (Offset,Value)-Pair #5 { 0x12, 0x10 }, // (Offset,Value)-Pair #6 - // CDirectSoundVoice_SetFrequency+0x14 : call [abs]; push eax; push esi + // DirectSound_CDirectSoundVoice_SetFrequency+0x14 : call [abs]; push eax; push esi { 0x14, 0xE8 }, // (Offset,Value)-Pair #7 { 0x19, 0x50 }, // (Offset,Value)-Pair #8 { 0x1A, 0x56 }, // (Offset,Value)-Pair #9 - // CDirectSoundVoice_SetFrequency+0x22 : retn 0x08 + // DirectSound_CDirectSoundVoice_SetFrequency+0x22 : retn 0x08 { 0x21, 0xC2 }, // (Offset,Value)-Pair #10 { 0x22, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetFrequency +// * DirectSound_CDirectSoundBuffer::SetFrequency // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetFrequency, 4627, 17, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, 17, XREF_DSBUFFERSETFREQUENCYA, XRefOne) - // CDirectSoundBuffer_SetFrequency+0x32 : call [CDirectSoundVoice::SetFrequency] + // DirectSound_CDirectSoundBuffer_SetFrequency+0x32 : call [CDirectSoundVoice::SetFrequency] XREF_ENTRY( 0x32, XREF_DSBUFFERSETFREQUENCYB ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_SetFrequency+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_SetFrequency+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 { 0x22, 0x05 }, // (Offset,Value)-Pair #3 { 0x23, 0x40 }, // (Offset,Value)-Pair #4 { 0x24, 0x00 }, // (Offset,Value)-Pair #5 { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_SetFrequency+0x29 : push [esp+0x10]; push [esp+0x10] + // DirectSound_CDirectSoundBuffer_SetFrequency+0x29 : push [esp+0x10]; push [esp+0x10] { 0x29, 0xFF }, // (Offset,Value)-Pair #7 { 0x2A, 0x74 }, // (Offset,Value)-Pair #8 { 0x2B, 0x24 }, // (Offset,Value)-Pair #9 @@ -543,10 +543,10 @@ OOVPA_XREF(CDirectSoundBuffer_SetFrequency, 4627, 17, { 0x2F, 0x24 }, // (Offset,Value)-Pair #13 { 0x30, 0x10 }, // (Offset,Value)-Pair #14 - // CDirectSoundBuffer_SetFrequency+0x49 : pop edi + // DirectSound_CDirectSoundBuffer_SetFrequency+0x49 : pop edi { 0x49, 0x5F }, // (Offset,Value)-Pair #15 - // CDirectSoundBuffer_SetFrequency+0x4B : retn 0x08 + // DirectSound_CDirectSoundBuffer_SetFrequency+0x4B : retn 0x08 { 0x4B, 0xC2 }, // (Offset,Value)-Pair #16 { 0x4C, 0x08 }, // (Offset,Value)-Pair #17 OOVPA_END; @@ -613,28 +613,28 @@ OOVPA_XREF(CMcpxVoiceClient_SetVolume, 4627, 13, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetVolume +// * DirectSound_CDirectSoundStream_SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVolume, 4627, 11, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetVolume, 4627, 11, XRefNoSaveIndex, XRefOne) - // CDirectSoundStream_SetVolume+0x15 : call [CMcpxVoiceClient::SetVolume] + // DirectSound_CDirectSoundStream_SetVolume+0x15 : call [CMcpxVoiceClient::SetVolume] XREF_ENTRY( 0x15, XREF_DSSTREAMSETVOLUME ), // (Offset,Value)-Pair #1 - // CDirectSoundStream_SetVolume+0x00 : mov ecx, [esp+0x04] + // DirectSound_CDirectSoundStream_SetVolume+0x00 : mov ecx, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #2 { 0x01, 0x4C }, // (Offset,Value)-Pair #3 { 0x02, 0x24 }, // (Offset,Value)-Pair #4 { 0x03, 0x04 }, // (Offset,Value)-Pair #5 - // CDirectSoundStream_SetVolume+0x0B : sub edx, [eax+0x20] + // DirectSound_CDirectSoundStream_SetVolume+0x0B : sub edx, [eax+0x20] { 0x0B, 0x2B }, // (Offset,Value)-Pair #6 { 0x0C, 0x50 }, // (Offset,Value)-Pair #7 { 0x0D, 0x20 }, // (Offset,Value)-Pair #8 - // CDirectSoundStream_SetVolume+0x11 : mov ecx, [ecx+0x0C] + // DirectSound_CDirectSoundStream_SetVolume+0x11 : mov ecx, [ecx+0x0C] { 0x11, 0x8B }, // (Offset,Value)-Pair #9 { 0x12, 0x49 }, // (Offset,Value)-Pair #10 { 0x13, 0x0C }, // (Offset,Value)-Pair #11 @@ -775,28 +775,28 @@ OOVPA_XREF(CMcpxBuffer_GetStatusB, 4627, 12, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer_GetStatus +// * DirectSound_CDirectSoundBuffer_GetStatus // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetStatus, 4627, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_GetStatus, 4627, 10, XREF_DSBUFFERGETSTATUSB, XRefOne) - // CDirectSoundBuffer_GetStatus+0x35 : call [CMcpxBuffer::GetStatus] + // DirectSound_CDirectSoundBuffer_GetStatus+0x35 : call [CMcpxBuffer::GetStatus] XREF_ENTRY( 0x35, XREF_DSBUFFERGETSTATUSA ), // (Offset,Value)-Pair #1 - // CDirectSoundBuffer_GetStatus+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSoundBuffer_GetStatus+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 { 0x22, 0x05 }, // (Offset,Value)-Pair #3 { 0x23, 0x40 }, // (Offset,Value)-Pair #4 { 0x24, 0x00 }, // (Offset,Value)-Pair #5 { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - // CDirectSoundBuffer_GetStatus+0x3D : jz +0x0B + // DirectSound_CDirectSoundBuffer_GetStatus+0x3D : jz +0x0B { 0x3D, 0x74 }, // (Offset,Value)-Pair #7 { 0x3E, 0x0B }, // (Offset,Value)-Pair #8 - // CDirectSoundBuffer_GetStatus+0x4E : retn 0x08 + // DirectSound_CDirectSoundBuffer_GetStatus+0x4E : retn 0x08 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #9 { 0x4F, 0x08 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -828,9 +828,9 @@ OOVPA_XREF(IDirectSoundBuffer_GetStatus, 4627, 9, OOVPA_END; // ****************************************************************** -// * CDirectSound_GetSpeakerConfig +// * DirectSound_CDirectSound_GetSpeakerConfig // ****************************************************************** -OOVPA_NO_XREF(CDirectSound_GetSpeakerConfig, 4627, 7) +OOVPA_NO_XREF(DirectSound_CDirectSound_GetSpeakerConfig, 4627, 7) { 0x0B, 0x00 }, { 0x14, 0x0B }, @@ -897,79 +897,79 @@ OOVPA_END; #define CMcpxBuffer_PlayA_4627 CMcpxBuffer_PlayA_4361 // ****************************************************************** -// * CDirectSound::SetDistanceFactorA +// * DirectSound_CDirectSound::SetDistanceFactorA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDistanceFactorA, 4627, 11, +OOVPA_XREF(DirectSound_CDirectSound_SetDistanceFactorA, 4627, 11, XREF_SETDISTANCEFACTORA, XRefZero) - // CDirectSound_SetDistanceFactorA+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetDistanceFactorA+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 { 0x22, 0x05 }, // (Offset,Value)-Pair #2 { 0x23, 0x40 }, // (Offset,Value)-Pair #3 { 0x24, 0x00 }, // (Offset,Value)-Pair #4 { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetDistanceFactorA+0x39 : or byte ptr[eax+0xA4], 0xE0 + // DirectSound_CDirectSound_SetDistanceFactorA+0x39 : or byte ptr[eax+0xA4], 0xE0 { 0x39, 0x80 }, // (Offset,Value)-Pair #6 { 0x3A, 0x88 }, // (Offset,Value)-Pair #7 { 0x3B, 0xA4 }, // (Offset,Value)-Pair #8 { 0x3F, 0xE0 }, // (Offset,Value)-Pair #9 - // CDirectSound_SetDistanceFactorA+0x4F : jz +0x0B + // DirectSound_CDirectSound_SetDistanceFactorA+0x4F : jz +0x0B { 0x4F, 0x74 }, // (Offset,Value)-Pair #10 { 0x50, 0x0B }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetDistanceFactorA +// * DirectSound_CDirectSound::SetDistanceFactorA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDistanceFactorA, 4531, 11, +OOVPA_XREF(DirectSound_CDirectSound_SetDistanceFactorA, 4531, 11, XREF_SETDISTANCEFACTORA, XRefZero) - // CDirectSound_SetDistanceFactorA+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetDistanceFactorA+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 { 0x22, 0x05 }, // (Offset,Value)-Pair #2 { 0x23, 0x40 }, // (Offset,Value)-Pair #3 { 0x24, 0x00 }, // (Offset,Value)-Pair #4 { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetDistanceFactorA+0x39 : or dword ptr[eax+0xA4], 0x60 + // DirectSound_CDirectSound_SetDistanceFactorA+0x39 : or dword ptr[eax+0xA4], 0x60 { 0x39, 0x83 }, // (Offset,Value)-Pair #6 { 0x3A, 0x88 }, // (Offset,Value)-Pair #7 { 0x3B, 0xA4 }, // (Offset,Value)-Pair #8 { 0x3F, 0x60 }, // (Offset,Value)-Pair #9 - // CDirectSound_SetDistanceFactorA+0x4F : jz +0x0B + // DirectSound_CDirectSound_SetDistanceFactorA+0x4F : jz +0x0B { 0x4F, 0x74 }, // (Offset,Value)-Pair #10 { 0x50, 0x0B }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetRolloffFactor +// * DirectSound_CDirectSound::SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetRolloffFactor, 4627, 11, +OOVPA_XREF(DirectSound_CDirectSound_SetRolloffFactor, 4627, 11, XREF_SETROLLOFFFACTORA, XRefZero) - // CDirectSound_SetRolloffFactor+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetRolloffFactor+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 { 0x22, 0x05 }, // (Offset,Value)-Pair #2 { 0x23, 0x40 }, // (Offset,Value)-Pair #3 { 0x24, 0x00 }, // (Offset,Value)-Pair #4 { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetRolloffFactor+0x39 : or dword ptr[eax+0xA4], 0x04 + // DirectSound_CDirectSound_SetRolloffFactor+0x39 : or dword ptr[eax+0xA4], 0x04 { 0x39, 0x83 }, // (Offset,Value)-Pair #6 { 0x3A, 0x88 }, // (Offset,Value)-Pair #7 { 0x3B, 0xA4 }, // (Offset,Value)-Pair #8 { 0x3F, 0x04 }, // (Offset,Value)-Pair #9 - // CDirectSound_SetRolloffFactor+0x4F : jz +0x0B + // DirectSound_CDirectSound_SetRolloffFactor+0x4F : jz +0x0B { 0x4F, 0x74 }, // (Offset,Value)-Pair #10 { 0x50, 0x0B }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -1005,63 +1005,63 @@ OOVPA_XREF(IDirectSound8_SetRolloffFactor, 4627, 11, OOVPA_END; // ****************************************************************** -// * CDirectSound::SetDopplerFactor +// * DirectSound_CDirectSound::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDopplerFactor, 4531, 14, +OOVPA_XREF(DirectSound_CDirectSound_SetDopplerFactor, 4531, 14, XREF_SETDOPPLERFACTOR, XRefZero) - // CDirectSound_SetDopplerFactor+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetDopplerFactor+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 { 0x22, 0x05 }, // (Offset,Value)-Pair #2 { 0x23, 0x40 }, // (Offset,Value)-Pair #3 { 0x24, 0x00 }, // (Offset,Value)-Pair #4 { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetDopplerFactor+0x33 : mov [eax+0x70], edx + // DirectSound_CDirectSound_SetDopplerFactor+0x33 : mov [eax+0x70], edx { 0x33, 0x89 }, // (Offset,Value)-Pair #6 { 0x34, 0x50 }, // (Offset,Value)-Pair #7 { 0x35, 0x70 }, // (Offset,Value)-Pair #8 - // CDirectSound_SetDopplerFactor+0x39 : or dword ptr[eax+0xA4], 0x40 + // DirectSound_CDirectSound_SetDopplerFactor+0x39 : or dword ptr[eax+0xA4], 0x40 { 0x39, 0x83 }, // (Offset,Value)-Pair #9 { 0x3A, 0x88 }, // (Offset,Value)-Pair #10 { 0x3B, 0xA4 }, // (Offset,Value)-Pair #11 { 0x3F, 0x40 }, // (Offset,Value)-Pair #12 - // CDirectSound_SetDopplerFactor+0x4F : jz +0x0B + // DirectSound_CDirectSound_SetDopplerFactor+0x4F : jz +0x0B { 0x4F, 0x74 }, // (Offset,Value)-Pair #13 { 0x50, 0x0B }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetDopplerFactor +// * DirectSound_CDirectSound::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDopplerFactor, 4627, 14, +OOVPA_XREF(DirectSound_CDirectSound_SetDopplerFactor, 4627, 14, XREF_SETDOPPLERFACTOR, XRefZero) - // CDirectSound_SetDopplerFactor+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetDopplerFactor+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 { 0x22, 0x05 }, // (Offset,Value)-Pair #2 { 0x23, 0x40 }, // (Offset,Value)-Pair #3 { 0x24, 0x00 }, // (Offset,Value)-Pair #4 { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetDopplerFactor+0x33 : mov [eax+0x70], edx + // DirectSound_CDirectSound_SetDopplerFactor+0x33 : mov [eax+0x70], edx { 0x33, 0x89 }, // (Offset,Value)-Pair #6 { 0x34, 0x50 }, // (Offset,Value)-Pair #7 { 0x35, 0x70 }, // (Offset,Value)-Pair #8 - // CDirectSound_SetDopplerFactor+0x39 : or byte ptr[eax+0xA4], 0x80 + // DirectSound_CDirectSound_SetDopplerFactor+0x39 : or byte ptr[eax+0xA4], 0x80 { 0x39, 0x80 }, // (Offset,Value)-Pair #9 { 0x3A, 0x88 }, // (Offset,Value)-Pair #10 { 0x3B, 0xA4 }, // (Offset,Value)-Pair #11 { 0x3F, 0x80 }, // (Offset,Value)-Pair #12 - // CDirectSound_SetDopplerFactor+0x4F : jz +0x0B + // DirectSound_CDirectSound_SetDopplerFactor+0x4F : jz +0x0B { 0x4F, 0x74 }, // (Offset,Value)-Pair #13 { 0x50, 0x0B }, // (Offset,Value)-Pair #14 OOVPA_END; @@ -1097,52 +1097,52 @@ OOVPA_XREF(IDirectSound8_SetDopplerFactor, 4627, 11, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetRolloffFactor +// * DirectSound_CDirectSoundVoice::SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 4627, 9, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetRolloffFactor, 4627, 9, XREF_DSVOICESETROLLOFFFACTOR, XRefZero) - // CDirectSoundVoice_SetRolloffFactor+0x0D : mov edx, [esp+arg_4] + // DirectSound_CDirectSoundVoice_SetRolloffFactor+0x0D : mov edx, [esp+arg_4] { 0x0D, 0x8B }, { 0x0E, 0x54 }, { 0x0F, 0x24 }, { 0x10, 0x08 }, - // CDirectSoundVoice_SetRolloffFactor+0x11 : mov [eax+44h], edx + // DirectSound_CDirectSoundVoice_SetRolloffFactor+0x11 : mov [eax+44h], edx { 0x11, 0x89 }, { 0x12, 0x50 }, { 0x13, 0x44 }, - // CDirectSoundVoice_SetRolloffFactor+0x30 : retn 0Ch + // DirectSound_CDirectSoundVoice_SetRolloffFactor+0x30 : retn 0Ch { 0x31, 0x0C }, { 0x32, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetRolloffFactor +// * DirectSound_CDirectSoundBuffer::SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 4627, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetRolloffFactor, 4627, 10, XREF_DSBUFFERSETROLLOFFFACTOR, XRefOne) - // CDirectSoundBuffer_SetRolloffFactor+0x39 : call [CDirectSoundVoice::SetRolloffFactor] + // DirectSound_CDirectSoundBuffer_SetRolloffFactor+0x39 : call [CDirectSoundVoice::SetRolloffFactor] XREF_ENTRY( 0x3A, XREF_DSVOICESETROLLOFFFACTOR ), - // CDirectSoundBuffer_SetRolloffFactor+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetRolloffFactor+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetRolloffFactor+0x32 : fstp [esp+0Ch+var_C] + // DirectSound_CDirectSoundBuffer_SetRolloffFactor+0x32 : fstp [esp+0Ch+var_C] { 0x32, 0xD9 }, { 0x33, 0x1C }, { 0x34, 0x24 }, - // CDirectSoundBuffer_SetRolloffFactor+0x53 : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetRolloffFactor+0x53 : retn 0Ch { 0x54, 0x0C }, { 0x55, 0x00 } OOVPA_END; @@ -1175,52 +1175,52 @@ OOVPA_XREF(IDirectSoundBuffer_SetRolloffFactor, 4627, 10, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetDistanceFactor +// * DirectSound_CDirectSoundVoice::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 4627, 9, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetDistanceFactor, 4627, 9, XREF_DSVOICESETDISTANCEFACTOR, XRefZero) - // CDirectSoundVoice_SetDistanceFactor+0x0D : mov edx, [esp+arg_4] + // DirectSound_CDirectSoundVoice_SetDistanceFactor+0x0D : mov edx, [esp+arg_4] { 0x0D, 0x8B }, { 0x0E, 0x54 }, { 0x0F, 0x24 }, { 0x10, 0x08 }, - // CDirectSoundVoice_SetDistanceFactor+0x11 : mov [eax+40h], edx + // DirectSound_CDirectSoundVoice_SetDistanceFactor+0x11 : mov [eax+40h], edx { 0x11, 0x89 }, { 0x12, 0x50 }, { 0x13, 0x40 }, - // CDirectSoundVoice_SetDistanceFactor+0x30 : retn 0Ch + // DirectSound_CDirectSoundVoice_SetDistanceFactor+0x30 : retn 0Ch { 0x31, 0x0C }, { 0x32, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetDistanceFactor +// * DirectSound_CDirectSoundBuffer::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 4627, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 4627, 10, XREF_DSBUFFERSETDISTANCEFACTOR, XRefOne) - // CDirectSoundBuffer_SetDistanceFactor+0x39 : call [CDirectSoundVoice::SetDistanceFactor] + // DirectSound_CDirectSoundBuffer_SetDistanceFactor+0x39 : call [CDirectSoundVoice::SetDistanceFactor] XREF_ENTRY( 0x3A, XREF_DSVOICESETDISTANCEFACTOR ), - // CDirectSoundBuffer_SetDistanceFactor+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetDistanceFactor+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetDistanceFactor+0x32 : fstp [esp+0Ch+var_C] + // DirectSound_CDirectSoundBuffer_SetDistanceFactor+0x32 : fstp [esp+0Ch+var_C] { 0x32, 0xD9 }, { 0x33, 0x1C }, { 0x34, 0x24 }, - // CDirectSoundBuffer_SetDistanceFactor+0x53 : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetDistanceFactor+0x53 : retn 0Ch { 0x54, 0x0C }, { 0x55, 0x00 } OOVPA_END; @@ -1253,53 +1253,53 @@ OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 4627, 10, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetConeAngles +// * DirectSound_CDirectSoundVoice::SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 4627, 9, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetConeAngles, 4627, 9, XREF_DSVOICESETCONEANGLES, XRefZero) - // CDirectSoundVoice_SetConeAngles+0x0D : mov edx, [esp+arg_4] + // DirectSound_CDirectSoundVoice_SetConeAngles+0x0D : mov edx, [esp+arg_4] { 0x0D, 0x8B }, { 0x0E, 0x54 }, { 0x0F, 0x24 }, { 0x10, 0x08 }, - // CDirectSoundVoice_SetConeAngles+0x11 : mov [ecx+1Ch], edx + // DirectSound_CDirectSoundVoice_SetConeAngles+0x11 : mov [ecx+1Ch], edx { 0x11, 0x89 }, { 0x12, 0x51 }, { 0x13, 0x1C }, - // CDirectSoundVoice_SetConeAngles+0x40 : retn 10h + // DirectSound_CDirectSoundVoice_SetConeAngles+0x40 : retn 10h { 0x41, 0x10 }, { 0x42, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetConeAngles +// * DirectSound_CDirectSoundBuffer::SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 4627, 11, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetConeAngles, 4627, 11, XREF_DSBUFFERSETCONEANGLES, XRefOne) - // CDirectSoundBuffer_SetConeAngles+0x39 : call [CDirectSoundVoice::SetConeAngles] + // DirectSound_CDirectSoundBuffer_SetConeAngles+0x39 : call [CDirectSoundVoice::SetConeAngles] XREF_ENTRY( 0x3A, XREF_DSVOICESETCONEANGLES ), - // CDirectSoundBuffer_SetConeAngles+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetConeAngles+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetConeAngles+0x31 : push [esp+0Ch+arg_4] + // DirectSound_CDirectSoundBuffer_SetConeAngles+0x31 : push [esp+0Ch+arg_4] { 0x31, 0xFF }, { 0x32, 0x74 }, { 0x33, 0x24 }, { 0x34, 0x18 }, - // CDirectSoundBuffer_SetConeAngles+0x53 : retn 10h + // DirectSound_CDirectSoundBuffer_SetConeAngles+0x53 : retn 10h { 0x54, 0x10 }, { 0x55, 0x00 } OOVPA_END; @@ -1332,50 +1332,50 @@ OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 4627, 10, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetConeOrientation +// * DirectSound_CDirectSoundVoice::SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 4627, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetConeOrientation, 4627, 8, XREF_DSVOICESETCONEORIENTATION, XRefZero) - // CDirectSoundVoice_SetConeOrientation+0x0F : mov edx, [ebp+arg_4] + // DirectSound_CDirectSoundVoice_SetConeOrientation+0x0F : mov edx, [ebp+arg_4] { 0x0F, 0x8B }, { 0x10, 0x55 }, { 0x11, 0x0C }, - // CDirectSoundVoice_SetConeOrientation+0x12 : mov [ecx+24h], edx + // DirectSound_CDirectSoundVoice_SetConeOrientation+0x12 : mov [ecx+24h], edx { 0x12, 0x89 }, { 0x13, 0x51 }, { 0x14, 0x24 }, - // CDirectSoundVoice_SetConeOrientation+0x4F : retn 14h + // DirectSound_CDirectSoundVoice_SetConeOrientation+0x4F : retn 14h { 0x50, 0x14 }, { 0x51, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetConeOrientation +// * DirectSound_CDirectSoundBuffer::SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeOrientation, 4627, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetConeOrientation, 4627, 9, XREF_DSBUFFERSETCONEORIENTATION, XRefOne) - // CDirectSoundBuffer_SetConeOrientation+0x49 : call [CDirectSoundVoice::SetConeOrientation] + // DirectSound_CDirectSoundBuffer_SetConeOrientation+0x49 : call [CDirectSoundVoice::SetConeOrientation] XREF_ENTRY( 0x4A, XREF_DSVOICESETCONEORIENTATION ), - // CDirectSoundBuffer_SetConeOrientation+0x2B : fld [ebp+arg_C] + // DirectSound_CDirectSoundBuffer_SetConeOrientation+0x2B : fld [ebp+arg_C] { 0x2B, 0xD9 }, { 0x2C, 0x45 }, { 0x2D, 0x14 }, - // CDirectSoundBuffer_SetConeOrientation+0x43 : fstp [esp+18h+var_18] + // DirectSound_CDirectSoundBuffer_SetConeOrientation+0x43 : fstp [esp+18h+var_18] { 0x43, 0xD9 }, { 0x44, 0x1C }, { 0x45, 0x24 }, - // CDirectSoundBuffer_SetConeOrientation+0x64 : retn 14h + // DirectSound_CDirectSoundBuffer_SetConeOrientation+0x64 : retn 14h { 0x65, 0x14 }, { 0x66, 0x00 } OOVPA_END; @@ -1407,53 +1407,53 @@ OOVPA_XREF(IDirectSoundBuffer_SetConeOrientation, 4627, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetConeOutsideVolume +// * DirectSound_CDirectSoundVoice::SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeOutsideVolume, 4627, 9, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetConeOutsideVolume, 4627, 9, XREF_DSVOICESETCONEOUTSIDEVOLUME, XRefZero) - // CDirectSoundVoice_SetConeOutsideVolume+0x0D : mov edx, [esp+arg_4] + // DirectSound_CDirectSoundVoice_SetConeOutsideVolume+0x0D : mov edx, [esp+arg_4] { 0x0D, 0x8B }, { 0x0E, 0x54 }, { 0x0F, 0x24 }, { 0x10, 0x08 }, - // CDirectSoundVoice_SetConeOutsideVolume+0x11 : mov [eax+30h], edx + // DirectSound_CDirectSoundVoice_SetConeOutsideVolume+0x11 : mov [eax+30h], edx { 0x11, 0x89 }, { 0x12, 0x50 }, { 0x13, 0x30 }, - // CDirectSoundVoice_SetConeOutsideVolume+0x30 : retn 0Ch + // DirectSound_CDirectSoundVoice_SetConeOutsideVolume+0x30 : retn 0Ch { 0x31, 0x0C }, { 0x32, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetConeOutsideVolume +// * DirectSound_CDirectSoundBuffer::SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeOutsideVolume, 4627, 11, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetConeOutsideVolume, 4627, 11, XREF_DSBUFFERSETCONEOUTSIDEVOLUME, XRefOne) - // CDirectSoundBuffer_SetConeOutsideVolume+0x35 : call [CDirectSoundVoice::SetConeOutsideVolume] + // DirectSound_CDirectSoundBuffer_SetConeOutsideVolume+0x35 : call [CDirectSoundVoice::SetConeOutsideVolume] XREF_ENTRY( 0x36, XREF_DSVOICESETCONEOUTSIDEVOLUME ), - // CDirectSoundBuffer_SetConeOutsideVolume+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetConeOutsideVolume+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetConeOutsideVolume+0x31 : push [esp+0Ch+arg_0] + // DirectSound_CDirectSoundBuffer_SetConeOutsideVolume+0x31 : push [esp+0Ch+arg_0] { 0x31, 0xFF }, { 0x32, 0x74 }, { 0x33, 0x24 }, { 0x34, 0x14 }, - // CDirectSoundBuffer_SetConeOutsideVolume+0x4F : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetConeOutsideVolume+0x4F : retn 0Ch { 0x50, 0x0C }, { 0x51, 0x00 } OOVPA_END; @@ -1485,150 +1485,150 @@ OOVPA_XREF(IDirectSoundBuffer_SetConeOutsideVolume, 4627, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetPosition +// * DirectSound_CDirectSoundVoice::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetPosition, 4627, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetPosition, 4627, 8, XREF_DSVOICESETPOSITION, XRefZero) - // CDirectSoundVoice_SetPosition+0x0F : mov edx, [ebp+arg_4] + // DirectSound_CDirectSoundVoice_SetPosition+0x0F : mov edx, [ebp+arg_4] { 0x0F, 0x8B }, { 0x10, 0x55 }, { 0x11, 0x0C }, - // CDirectSoundVoice_SetPosition+0x12 : mov [ecx+04h], edx + // DirectSound_CDirectSoundVoice_SetPosition+0x12 : mov [ecx+04h], edx { 0x12, 0x89 }, { 0x13, 0x51 }, { 0x14, 0x04 }, - // CDirectSoundVoice_SetPosition+0x51 : retn 14h + // DirectSound_CDirectSoundVoice_SetPosition+0x51 : retn 14h { 0x52, 0x14 }, { 0x53, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetPosition +// * DirectSound_CDirectSoundBuffer::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPosition, 4627, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetPosition, 4627, 9, XREF_DSBUFFERSETPOSITION, XRefOne) - // CDirectSoundBuffer_SetPosition+0x49 : call [CDirectSoundVoice::SetPosition] + // DirectSound_CDirectSoundBuffer_SetPosition+0x49 : call [CDirectSoundVoice::SetPosition] XREF_ENTRY( 0x4A, XREF_DSVOICESETPOSITION ), - // CDirectSoundBuffer_SetPosition+0x2B : fld [ebp+arg_C] + // DirectSound_CDirectSoundBuffer_SetPosition+0x2B : fld [ebp+arg_C] { 0x2B, 0xD9 }, { 0x2C, 0x45 }, { 0x2D, 0x14 }, - // CDirectSoundBuffer_SetPosition+0x43 : fstp [esp+18h+var_18] + // DirectSound_CDirectSoundBuffer_SetPosition+0x43 : fstp [esp+18h+var_18] { 0x43, 0xD9 }, { 0x44, 0x1C }, { 0x45, 0x24 }, - // CDirectSoundBuffer_SetPosition+0x64 : retn 14h + // DirectSound_CDirectSoundBuffer_SetPosition+0x64 : retn 14h { 0x65, 0x14 }, { 0x66, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetVelocity +// * DirectSound_CDirectSoundVoice::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVelocity, 4627, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetVelocity, 4627, 8, XREF_DSVOICESETVELOCITY, XRefZero) - // CDirectSoundVoice_SetVelocity+0x0F : mov edx, [ebp+arg_4] + // DirectSound_CDirectSoundVoice_SetVelocity+0x0F : mov edx, [ebp+arg_4] { 0x0F, 0x8B }, { 0x10, 0x55 }, { 0x11, 0x0C }, - // CDirectSoundVoice_SetVelocity+0x12 : mov [ecx+10h], edx + // DirectSound_CDirectSoundVoice_SetVelocity+0x12 : mov [ecx+10h], edx { 0x12, 0x89 }, { 0x13, 0x51 }, { 0x14, 0x10 }, - // CDirectSoundVoice_SetVelocity+0x4F : retn 14h + // DirectSound_CDirectSoundVoice_SetVelocity+0x4F : retn 14h { 0x50, 0x14 }, { 0x51, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetVelocity +// * DirectSound_CDirectSoundBuffer::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 4627, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetVelocity, 4627, 9, XREF_DSBUFFERSETVELOCITY, XRefOne) - // CDirectSoundBuffer_SetVelocity+0x49 : call [CDirectSoundVoice::SetVelocity] + // DirectSound_CDirectSoundBuffer_SetVelocity+0x49 : call [CDirectSoundVoice::SetVelocity] XREF_ENTRY( 0x4A, XREF_DSVOICESETVELOCITY ), - // CDirectSoundBuffer_SetVelocity+0x2B : fld [ebp+arg_C] + // DirectSound_CDirectSoundBuffer_SetVelocity+0x2B : fld [ebp+arg_C] { 0x2B, 0xD9 }, { 0x2C, 0x45 }, { 0x2D, 0x14 }, - // CDirectSoundBuffer_SetVelocity+0x43 : fstp [esp+18h+var_18] + // DirectSound_CDirectSoundBuffer_SetVelocity+0x43 : fstp [esp+18h+var_18] { 0x43, 0xD9 }, { 0x44, 0x1C }, { 0x45, 0x24 }, - // CDirectSoundBuffer_SetVelocity+0x64 : retn 14h + // DirectSound_CDirectSoundBuffer_SetVelocity+0x64 : retn 14h { 0x65, 0x14 }, { 0x66, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetDopplerFactor +// * DirectSound_CDirectSoundVoice::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 4627, 9, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetDopplerFactor, 4627, 9, XREF_DSVOICESETDOPPLERFACTOR, XRefZero) - // CDirectSoundVoice_SetDopplerFactor+0x0D : mov edx, [esp+arg_4] + // DirectSound_CDirectSoundVoice_SetDopplerFactor+0x0D : mov edx, [esp+arg_4] { 0x0D, 0x8B }, { 0x0E, 0x54 }, { 0x0F, 0x24 }, { 0x10, 0x08 }, - // CDirectSoundVoice_SetDopplerFactor+0x12 : mov [eax+48h], edx + // DirectSound_CDirectSoundVoice_SetDopplerFactor+0x12 : mov [eax+48h], edx { 0x11, 0x89 }, { 0x12, 0x50 }, { 0x13, 0x48 }, - // CDirectSoundVoice_SetDopplerFactor+0x31 : retn 0Ch + // DirectSound_CDirectSoundVoice_SetDopplerFactor+0x31 : retn 0Ch { 0x31, 0x0C }, { 0x32, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetDopplerFactor +// * DirectSound_CDirectSoundBuffer::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDopplerFactor, 4627, 10, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 4627, 10, XREF_DSBUFFERSETDOPPLERFACTOR, XRefOne) - // CDirectSoundBuffer_SetDopplerFactor+0x39 : call [CDirectSoundVoice::SetDopplerFactor] + // DirectSound_CDirectSoundBuffer_SetDopplerFactor+0x39 : call [CDirectSoundVoice::SetDopplerFactor] XREF_ENTRY( 0x3A, XREF_DSVOICESETDOPPLERFACTOR ), - // CDirectSoundBuffer_SetDopplerFactor+0x2D : push [esp+4+arg_8] + // DirectSound_CDirectSoundBuffer_SetDopplerFactor+0x2D : push [esp+4+arg_8] { 0x2D, 0xFF }, { 0x2E, 0x74 }, { 0x2F, 0x24 }, { 0x30, 0x14 }, - // CDirectSoundBuffer_SetDopplerFactor+0x32 : fstp [esp+0Ch+var_C] + // DirectSound_CDirectSoundBuffer_SetDopplerFactor+0x32 : fstp [esp+0Ch+var_C] { 0x32, 0xD9 }, { 0x33, 0x1C }, { 0x34, 0x24 }, - // CDirectSoundBuffer_SetDopplerFactor+0x53 : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetDopplerFactor+0x53 : retn 0Ch { 0x54, 0x0C }, { 0x55, 0x00 } OOVPA_END; @@ -1660,56 +1660,56 @@ OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 4627, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetI3DL2Source +// * DirectSound_CDirectSoundVoice::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetI3DL2Source, 4627, 10, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetI3DL2Source, 4627, 10, XREF_DSVOICESETI3DL2SOURCE, XRefZero) - // CDirectSoundVoice_SetI3DL2Source+0x12 : mov esi, [ecx] + // DirectSound_CDirectSoundVoice_SetI3DL2Source+0x12 : mov esi, [ecx] { 0x12, 0x8B }, { 0x13, 0x31 }, - // CDirectSoundVoice_SetI3DL2Source+0x14 : mov [edx+4Ch], esi + // DirectSound_CDirectSoundVoice_SetI3DL2Source+0x14 : mov [edx+4Ch], esi { 0x14, 0x89 }, { 0x15, 0x72 }, { 0x16, 0x4C }, - // CDirectSoundVoice_SetI3DL2Source+0x44 : fld dword ptr [ecx+10h] + // DirectSound_CDirectSoundVoice_SetI3DL2Source+0x44 : fld dword ptr [ecx+10h] { 0x44, 0xD9 }, { 0x45, 0x41 }, { 0x46, 0x10 }, - // CDirectSoundVoice_SetI3DL2Source+0xAC : retn 0Ch + // DirectSound_CDirectSoundVoice_SetI3DL2Source+0xAC : retn 0Ch { 0xAD, 0x0C }, { 0xAE, 0x00 } OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetI3DL2Source +// * DirectSound_CDirectSoundBuffer::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetI3DL2Source, 4627, 11, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetI3DL2Source, 4627, 11, XREF_DSBUFFERSETI3DL2SOURCE, XRefOne) - // CDirectSoundBuffer_SetI3DL2Source+0x35 : call [CDirectSoundVoice::SetI3DL2Source] + // DirectSound_CDirectSoundBuffer_SetI3DL2Source+0x35 : call [CDirectSoundVoice::SetI3DL2Source] XREF_ENTRY( 0x36, XREF_DSVOICESETI3DL2SOURCE ), - // CDirectSoundBuffer_SetI3DL2Source+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetI3DL2Source+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetI3DL2Source+0x31 : push [esp+0Ch+arg_0] + // DirectSound_CDirectSoundBuffer_SetI3DL2Source+0x31 : push [esp+0Ch+arg_0] { 0x31, 0xFF }, { 0x32, 0x74 }, { 0x33, 0x24 }, { 0x34, 0x14 }, - // CDirectSoundBuffer_SetI3DL2Source+0x4F : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetI3DL2Source+0x4F : retn 0Ch { 0x50, 0x0C }, { 0x51, 0x00 } OOVPA_END; @@ -1852,9 +1852,9 @@ OOVPA_XREF(CMcpxStream_Pause, 4928, 11, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_SetMixBinVolumes (untested) +// * DirectSound_CDirectSoundStream_SetMixBinVolumes (untested) // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes, 4627, 12, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBinVolumes, 4627, 12, XRefNoSaveIndex, XRefOne) @@ -1882,26 +1882,26 @@ OOVPA_XREF(X_DirectSound_CDirectSound_EnableHeadphones, 4627, 15, XREF_DirectSound_CDirectSound_EnableHeadphones, XRefZero) - // CDirectSound_EnableHeadphones+0x12 : movzx eax, al + // DirectSound_CDirectSound_EnableHeadphones+0x12 : movzx eax, al { 0x12, 0x0F }, // (Offset,Value)-Pair #1 { 0x13, 0xB6 }, // (Offset,Value)-Pair #2 { 0x14, 0xC0 }, // (Offset,Value)-Pair #3 - // CDirectSound_EnableHeadphones+0x29 : mov eax, 0x80004005 + // DirectSound_CDirectSound_EnableHeadphones+0x29 : mov eax, 0x80004005 { 0x29, 0xB8 }, // (Offset,Value)-Pair #4 { 0x2A, 0x05 }, // (Offset,Value)-Pair #5 { 0x2B, 0x40 }, // (Offset,Value)-Pair #6 { 0x2C, 0x00 }, // (Offset,Value)-Pair #7 { 0x2D, 0x80 }, // (Offset,Value)-Pair #8 - // CDirectSound_EnableHeadphones+0x59 : and eax, 0x7FFFFFFF + // DirectSound_CDirectSound_EnableHeadphones+0x59 : and eax, 0x7FFFFFFF { 0x59, 0x25 }, // (Offset,Value)-Pair #9 { 0x5A, 0xFF }, // (Offset,Value)-Pair #10 { 0x5B, 0xFF }, // (Offset,Value)-Pair #11 { 0x5C, 0xFF }, // (Offset,Value)-Pair #12 { 0x5D, 0x7F }, // (Offset,Value)-Pair #13 - // CDirectSound_EnableHeadphones+0x97 : leave + // DirectSound_CDirectSound_EnableHeadphones+0x97 : leave //{ 0x97, 0xC9 }, // (Offset,Value)-Pair #14 { 0x98, 0xC2 }, { 0x99, 0x08 }, @@ -1935,9 +1935,9 @@ OOVPA_END; /* // ****************************************************************** -// * CDirectSoundVoice::SetHeadrom +// * DirectSound_CDirectSoundVoice::SetHeadrom // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4627, 9, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetHeadroom, 4627, 9, XREF_DirectSound_CDirectSoundVoice_SetHeadroom, XRefOne) // Note : This was -1, which is used nowhere else and probably an error. @@ -1955,9 +1955,9 @@ OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4627, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream::SetHeadroom +// * DirectSound_CDirectSoundStream::SetHeadroom // ****************************************************************** -OOVPA_NO_XREF(CDirectSoundStream_SetHeadroom, 4627, 12, +OOVPA_NO_XREF(DirectSound_CDirectSoundStream_SetHeadroom, 4627, 12, XRefNoSaveIndex, XRefOne) @@ -1979,9 +1979,9 @@ OOVPA_END; */ // ****************************************************************** -// * CDirectSound::SetAllParametersA +// * DirectSound_CDirectSound::SetAllParametersA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParametersA, 4831, 10, +OOVPA_XREF(DirectSound_CDirectSound_SetAllParametersA, 4831, 10, XREF_DSSETALLPARAMETERSA, XRefZero) @@ -2579,7 +2579,7 @@ OOVPA_XREF(DirectSound_CDirectSoundVoice_SetHeadroom, 4627, 8, XREF_DirectSound_CDirectSoundVoice_SetHeadroom, XRefOne) - // CDirectSoundVoice_SetHeadroom+0x1B : call [CMcpxVoiceClient::SetVolume] + // DirectSound_CDirectSoundVoice_SetHeadroom+0x1B : call [CMcpxVoiceClient::SetVolume] XREF_ENTRY( 0x1B, XREF_DSSTREAMSETVOLUME ), { 0x03, 0x04 }, @@ -2865,9 +2865,9 @@ OOVPA_XREF(CMcpxVoiceClient_SetLFO, 4627, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetLFO +// * DirectSound_CDirectSoundVoice::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetLFO, 4627, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetLFO, 4627, 7, XREF_DirectSound_CDirectSoundVoice_SetLFO, XRefOne) @@ -2883,9 +2883,9 @@ OOVPA_XREF(CDirectSoundVoice_SetLFO, 4627, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetLFO +// * DirectSound_CDirectSoundBuffer::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetLFO, 4627, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetLFO, 4627, 8, XREF_DirectSound_CDirectSoundBuffer_SetLFO, XRefOne) @@ -2944,9 +2944,9 @@ OOVPA_XREF(DirectSound_CDirectSoundStream_SetPitch, 4627, 12, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetVolume +// * DirectSound_CDirectSoundBuffer::SetVolume // ****************************************************************** -#define CDirectSoundBuffer_SetVolume_4627 CDirectSoundBuffer_SetVolume_4361 +#define DirectSound_CDirectSoundBuffer_SetVolume_4627 DirectSound_CDirectSoundBuffer_SetVolume_4361 // ****************************************************************** // * IDirectSoundBuffer8::SetVolume @@ -2961,127 +2961,127 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(DirectSoundCreate, 4361, PATCH), REGISTER_OOVPA(DirectSoundDoWork, 4627, PATCH), REGISTER_OOVPA(DirectSoundGetSampleTime, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPlayRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4432, XREF), REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 4432, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 4627, XREF), REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroomA, 4928, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 4928, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 4627, XREF), REGISTER_OOVPA(IDirectSound8_SetVelocity, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_SetAllParametersA, 4627, XREF), - REGISTER_OOVPA(CDirectSound_SetAllParametersA, 4721, XREF), - REGISTER_OOVPA(CDirectSound_SetAllParametersA, 4831, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParametersA, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParametersA, 4721, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParametersA, 4831, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParameters, 4928, XREF), REGISTER_OOVPA(IDirectSound8_SetAllParameters, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4361, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4432, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4432, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_SetPositionA, 4627, XREF), - REGISTER_OOVPA(CDirectSound_SetPositionA, 4432, XREF), // TODO: Find a cure for laziness... + REGISTER_OOVPA(DirectSound_CDirectSound_SetPositionA, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetPositionA, 4432, XREF), // TODO: Find a cure for laziness... REGISTER_OOVPA(IDirectSound8_SetPosition, 3936, PATCH), REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH), REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4627, PATCH), REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4627, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4627, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_LockA, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), REGISTER_OOVPA(IDirectSound8_CreateStream, 3936, PATCH), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 4361, XREF), REGISTER_OOVPA(CMcpxStream_Pause, 4928, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4361, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4627, XREF), REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4721, XREF), // REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4928, XREF) REGISTER_OOVPA(CMcpxBuffer_GetStatusB, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4627, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_GetSpeakerConfig, 4627, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_GetSpeakerConfig, 4627, PATCH), REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF), REGISTER_OOVPA(CMcpxBuffer_Play, 4721, XREF), REGISTER_OOVPA(CMcpxBuffer_Play, 4928, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Play, 4361, PATCH), REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactorA, 4531, XREF), - REGISTER_OOVPA(CDirectSound_SetDistanceFactorA, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 4531, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 4627, XREF), REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 4627, XREF), REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 4531, XREF), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 4531, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 4627, XREF), REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 4432, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 4432, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 4432, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 4432, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 4432, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 4432, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 4627, XREF), // s+ - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffFactor, 4627, XREF), // s+ + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffFactor, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDistanceFactor, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetConeAngles, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetConeAngles, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOrientation, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetConeOrientation, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetConeOrientation, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOutsideVolume, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetConeOutsideVolume, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetConeOutsideVolume, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeOutsideVolume, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPosition, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPosition, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVelocity, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVelocity, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDopplerFactor, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetI3DL2Source, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetI3DL2Source, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), // +s REGISTER_OOVPA(X_DirectSound_CDirectSoundVoice_SetFormat, 4627, XREF), REGISTER_OOVPA(X_DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, ALIAS, X_IDirectSoundBuffer_SetFormat), - REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(X_DirectSound_CDirectSound_EnableHeadphones, 4627, XREF), REGISTER_OOVPA(IDirectSound_EnableHeadphones, 4627, ALIAS, EmuIDirectSound_EnableHeadphones), - // REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 4627, XREF), - // REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 4627, ALIAS, CDirectSoundStream_SetHeadroom), + // REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 4627, XREF), + // REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 4627, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_GetOutputLevels, 4627, XREF), REGISTER_OOVPA(IDirectSound8_GetOutputLevels, 4627, ALIAS, IDirectSound_GetOutputLevels), @@ -3094,10 +3094,10 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(DirectSound_CMcpxBuffer_GetStatus, 4721, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 4721, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4721, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 4627, ALIAS, DirectSound_CDirectSoundStream_SetMixBins), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 4627, PATCH), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetEG, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetEG, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4627, ALIAS, DirectSound_CDirectSoundStream_SetEG), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetEG, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetEG, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_FlushEx, 4627, XREF), @@ -3109,15 +3109,15 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetFilter, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFilter, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFilter, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4627, ALIAS, DirectSound_CDirectSoundStream_SetFilter), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFilter, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 4432, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPosition, 4432, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPitch, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPitch, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4627, PATCH), @@ -3126,7 +3126,7 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetOutputBuffer, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetOutputBuffer, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4627, ALIAS, DirectSound_CDirectSoundStream_SetOutputBuffer), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetOutputBuffer, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffCurve, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetRolloffCurve, 4627, XREF), @@ -3136,11 +3136,11 @@ OOVPATable DSound_4627[] = { // REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetNotificationPositions, 4627, XREF), // REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 4627, XREF), REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4627, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetLFO, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLFO, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4627, ALIAS, DirectSound_CDirectSoundStream_SetPitch), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPitch, 4627, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4627, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index e90f938af..c250741ce 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -35,7 +35,7 @@ // ****************************************************************** // * DirectSound::CDirectSound::EnableHeadphones // ****************************************************************** -OOVPA_XREF(CDirectSound_EnableHeadphones, 5233, 8, +OOVPA_XREF(DirectSound_CDirectSound_EnableHeadphones, 5233, 8, XREF_DSENABLEHEADPHONES, XRefZero) @@ -75,9 +75,9 @@ OOVPA_XREF(IDirectSound8_EnableHeadphones, 5233, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream_FlushEx +// * DirectSound_CDirectSoundStream_FlushEx // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_FlushEx, 5233, 11, +OOVPA_XREF(DirectSound_CDirectSoundStream_FlushEx, 5233, 11, XREF_DSFLUSHEX2, XRefZero) @@ -168,27 +168,27 @@ OOVPA_XREF(CMcpxAPU_SynchPlayback, 5233, 8, OOVPA_END; // ****************************************************************** -// * CDirectSound::SynchPlayback +// * DirectSound_CDirectSound::SynchPlayback // ****************************************************************** -OOVPA_XREF(CDirectSound_SynchPlayback, 5233, 10, +OOVPA_XREF(DirectSound_CDirectSound_SynchPlayback, 5233, 10, XREF_DSSYNCHPLAYBACKA, XRefOne) XREF_ENTRY( 0x08, XREF_DSSYNCHPLAYBACKB ), // (Offset,Value)-Pair #1 - // CDirectSound_SynchPlayback+0x00 : mov eax, [esp+0x04] + // DirectSound_CDirectSound_SynchPlayback+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #2 { 0x01, 0x44 }, // (Offset,Value)-Pair #3 { 0x02, 0x24 }, // (Offset,Value)-Pair #4 { 0x03, 0x04 }, // (Offset,Value)-Pair #5 - // CDirectSound_SynchPlayback+0x04 : mov ecx, [eax+0x0C] + // DirectSound_CDirectSound_SynchPlayback+0x04 : mov ecx, [eax+0x0C] { 0x04, 0x8B }, // (Offset,Value)-Pair #6 { 0x05, 0x48 }, // (Offset,Value)-Pair #7 { 0x06, 0x0C }, // (Offset,Value)-Pair #8 - // CDirectSound_SynchPlayback+0x0C : retn 0x04 + // DirectSound_CDirectSound_SynchPlayback+0x0C : retn 0x04 { 0x0C, 0xC2 }, // (Offset,Value)-Pair #9 { 0x0D, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -236,9 +236,9 @@ OOVPA_XREF(X_DirectSound_CDirectSoundVoice_SetFormat, 5233, 8, OOVPA_END; // ****************************************************************** -// CDirectSoundVoice::SetMode +// DirectSound_CDirectSoundVoice::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMode, 5233, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMode, 5233, 8, XREF_DSBUFFERSETMODEB, XRefZero) @@ -254,9 +254,9 @@ OOVPA_XREF(CDirectSoundVoice_SetMode, 5233, 8, OOVPA_END; // ****************************************************************** -// CDirectSoundVoice::SetMode +// DirectSound_CDirectSoundVoice::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMode, 5344, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMode, 5344, 8, XREF_DSBUFFERSETMODEB, XRefZero) @@ -272,9 +272,9 @@ OOVPA_XREF(CDirectSoundVoice_SetMode, 5344, 8, OOVPA_END; // ****************************************************************** -// CDirectSoundBuffer::SetMode +// DirectSound_CDirectSoundBuffer::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMode, 5233, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMode, 5233, 8, XREF_DSBUFFERSETMODEA, XRefOne) @@ -315,9 +315,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetMode, 5233, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetVolume +// * DirectSound_CDirectSoundVoice::SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVolume, 5233, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetVolume, 5233, 8, XREF_DirectSound_CDirectSoundVoice_SetVolume, XRefOne) @@ -334,9 +334,9 @@ OOVPA_XREF(CDirectSoundVoice_SetVolume, 5233, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetVolume +// * DirectSound_CDirectSoundBuffer::SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVolume, 5233, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetVolume, 5233, 8, XREF_DirectSound_CDirectSoundBuffer_SetVolume, XRefOne) @@ -372,9 +372,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetVolume, 5233, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream::SetVolume +// * DirectSound_CDirectSoundStream::SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVolume, 5233, 9, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetVolume, 5233, 9, XRefNoSaveIndex, XRefOne) @@ -392,9 +392,9 @@ OOVPA_XREF(CDirectSoundStream_SetVolume, 5233, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream::SetFrequency +// * DirectSound_CDirectSoundStream::SetFrequency // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFrequency, 5233, 8, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetFrequency, 5233, 8, XRefNoSaveIndex, XRefOne) @@ -411,9 +411,9 @@ OOVPA_XREF(CDirectSoundStream_SetFrequency, 5233, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundStream::SetMixBins +// * DirectSound_CDirectSoundStream::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBins, 5233, 8, +OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBins, 5233, 8, XRefNoSaveIndex, XRefOne) @@ -430,9 +430,9 @@ OOVPA_XREF(CDirectSoundStream_SetMixBins, 5233, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetRolloffCurve +// * DirectSound_CDirectSoundVoice::SetRolloffCurve // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 5233, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5233, 8, XREF_DSVOICESETROLLOFFCURVE, XRefZero) @@ -448,9 +448,9 @@ OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 5233, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetRolloffCurve +// * DirectSound_CDirectSoundBuffer::SetRolloffCurve // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetRolloffCurve, 5233, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, 8, XREF_DSBUFFERSETROLLOFFCURVE, XRefOne) @@ -488,7 +488,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 5344, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMaxDistance, 5344, 7, XREF_DSVOICESETMAXDISTANCE, XRefZero) @@ -502,29 +502,29 @@ OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 5344, 7, { 0x2F, 0xC0 }, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMaxDistance +// * DirectSound_CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 5344, 11, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5344, 11, XREF_DSBUFFERSETMAXDISTANCE, XRefOne) - // CDirectSoundBuffer_SetMaxDistance+0x39 : call [CDirectSoundVoice::SetMaxDistance] + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x39 : call [CDirectSoundVoice::SetMaxDistance] XREF_ENTRY( 0x3A, XREF_DSVOICESETMAXDISTANCE ), { 0x00, 0x56 }, - // CDirectSoundBuffer_SetMaxDistance+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetMaxDistance+0x32 : fstp [esp+0Ch+var_C] + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x32 : fstp [esp+0Ch+var_C] { 0x32, 0xD9 }, { 0x33, 0x1C }, { 0x34, 0x24 }, - // CDirectSoundBuffer_SetMaxDistance+0x53 : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x53 : retn 0Ch { 0x54, 0x0C }, { 0x55, 0x00 } OOVPA_END; @@ -560,7 +560,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 5344, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMinDistance, 5344, 7, XREF_DSVOICESETMINDISTANCE, XRefZero) @@ -574,29 +574,29 @@ OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 5344, 7, { 0x2F, 0xC0 }, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMinDistance +// * DirectSound_CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 5344, 11, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMinDistance, 5344, 11, XREF_DSBUFFERSETMINDISTANCE, XRefOne) - // CDirectSoundBuffer_SetMinDistance+0x39 : call [CDirectSoundVoice::SetMinDistance] + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x39 : call [CDirectSoundVoice::SetMinDistance] XREF_ENTRY( 0x3A, XREF_DSVOICESETMINDISTANCE ), { 0x00, 0x56 }, - // CDirectSoundBuffer_SetMinDistance+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetMinDistance+0x32 : fstp [esp+0Ch+var_C] + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x32 : fstp [esp+0Ch+var_C] { 0x32, 0xD9 }, { 0x33, 0x1C }, { 0x34, 0x24 }, - // CDirectSoundBuffer_SetMinDistance+0x53 : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x53 : retn 0Ch { 0x54, 0x0C }, { 0x55, 0x00 } OOVPA_END; @@ -725,9 +725,9 @@ OOVPA_XREF(IDirectSound_SetRolloffFactor, 5344, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetDistanceFactor +// * DirectSound_CDirectSoundVoice::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5344, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetDistanceFactor, 5344, 7, XREF_DSVOICESETDISTANCEFACTOR, XRefZero) @@ -742,9 +742,9 @@ OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5344, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetDistanceFactor +// * DirectSound_CDirectSoundBuffer::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 5344, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 5344, 8, XREF_DSBUFFERSETDISTANCEFACTOR, XRefOne) @@ -863,112 +863,112 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(DirectSoundCreate, 4361, PATCH), REGISTER_OOVPA(DirectSoundDoWork, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 4627, XREF), REGISTER_OOVPA(CMcpxAPU_SynchPlayback, 5233, XREF), - REGISTER_OOVPA(CDirectSound_SynchPlayback, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5233, XREF), REGISTER_OOVPA(IDirectSound8_SynchPlayback, 5233, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 5233, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4432, XREF), REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 4432, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 4627, XREF), REGISTER_OOVPA(IDirectSound8_SetVelocity, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4361, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4432, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4432, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 5233, PATCH), - REGISTER_OOVPA(CDirectSound_SetPositionA, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5233, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetPositionA, 4627, XREF), REGISTER_OOVPA(IDirectSound8_SetPosition, 3936, PATCH), REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH), REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5233, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFrequency, 5233, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4627, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVolume, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 5233, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4627, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_LockA, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetStatusB, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4627, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 4361, XREF), REGISTER_OOVPA(CMcpxBuffer_Play, 4928, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Play, 4361, PATCH), - REGISTER_OOVPA(CDirectSoundStream_FlushEx, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_FlushEx, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5233, PATCH), - REGISTER_OOVPA(CDirectSound_EnableHeadphones, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 5233, XREF), REGISTER_OOVPA(IDirectSound8_EnableHeadphones, 5233, PATCH), REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactor, 5344, XREF), REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 5344, ALIAS, IDirectSound_SetDistanceFactor), - REGISTER_OOVPA(CDirectSound_SetDistanceFactorA, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 4627, XREF), REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 4627, XREF), REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5344, XREF), REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 5344, ALIAS, IDirectSound_SetDopplerFactor), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 4627, XREF), REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 4432, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 5344, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 4432, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5344, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5344, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 5344, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 5344, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 5344, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 5344, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 5344, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 4432, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 4432, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 4432, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 4432, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPosition, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPosition, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVelocity, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVelocity, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetI3DL2Source, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetI3DL2Source, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), - REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, CDirectSoundStream_SetVolume), // (This is actually the XREF we are using) + REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, DirectSound_CDirectSoundStream_SetVolume), // (This is actually the XREF we are using) REGISTER_OOVPA(X_DirectSound_CDirectSoundVoice_SetFormat, 5233, XREF), REGISTER_OOVPA(X_DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, ALIAS, X_IDirectSoundBuffer_SetFormat), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 5233, XREF), - //REGISTER_OOVPA(CDirectSoundVoice_SetMode, 5344, XREF), // Add when needed... - REGISTER_OOVPA(CDirectSoundBuffer_SetMode, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMode, 5233, XREF), + //REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMode, 5344, XREF), // Add when needed... + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMode, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 5233, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 5233, PATCH), REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5344, XREF), REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 5344, ALIAS, IDirectSound_SetI3DL2Listener), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5344, XREF), REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 5344, ALIAS, IDirectSound_SetRolloffFactor), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 4361, PATCH), - // REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 5558, XREF), // Add when needed... - // REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), // Add when needed... + // REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDistanceFactor, 5558, XREF), // Add when needed... + // REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), // Add when needed... // REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 5558, PATCH), // Add when needed... }; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index 0baa4aedc..2b241d114 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -33,9 +33,9 @@ // ****************************************************************** // ****************************************************************** -// * CDirectSound::SynchPlayback +// * DirectSound_CDirectSound::SynchPlayback // ****************************************************************** -OOVPA_NO_XREF(CDirectSound_SynchPlayback, 5558, 7) +OOVPA_NO_XREF(DirectSound_CDirectSound_SynchPlayback, 5558, 7) { 0x0C, 0x00 }, { 0x12, 0x85 }, @@ -75,109 +75,109 @@ OOVPA_XREF(CMcpxStream_Pause, 5558, 11, OOVPA_END; // ****************************************************************** -// * CDirectSound::CommitDeferredSettings +// * DirectSound_CDirectSound::CommitDeferredSettings // ****************************************************************** -OOVPA_NO_XREF(CDirectSound_CommitDeferredSettings, 5558, 11) +OOVPA_NO_XREF(DirectSound_CDirectSound_CommitDeferredSettings, 5558, 11) - // CDirectSound_CommitDeferredSettings+0x10 : movzx eax, al + // DirectSound_CDirectSound_CommitDeferredSettings+0x10 : movzx eax, al { 0x10, 0x0F }, // (Offset,Value)-Pair #1 { 0x11, 0xB6 }, // (Offset,Value)-Pair #2 { 0x12, 0xC0 }, // (Offset,Value)-Pair #3 - // CDirectSound_CommitDeferredSettings+0x27 : mov eax, 0x80004005 + // DirectSound_CDirectSound_CommitDeferredSettings+0x27 : mov eax, 0x80004005 { 0x27, 0xB8 }, // (Offset,Value)-Pair #4 { 0x28, 0x05 }, // (Offset,Value)-Pair #5 { 0x29, 0x40 }, // (Offset,Value)-Pair #6 { 0x2B, 0x80 }, // (Offset,Value)-Pair #7 - // CDirectSound_CommitDeferredSettings+0x6D : mov [eax+0x30], edi + // DirectSound_CDirectSound_CommitDeferredSettings+0x6D : mov [eax+0x30], edi { 0x6D, 0x89 }, // (Offset,Value)-Pair #8 { 0x6E, 0x78 }, // (Offset,Value)-Pair #9 { 0x6F, 0x30 }, // (Offset,Value)-Pair #10 - // CDirectSound_CommitDeferredSettings+0x96 : leave + // DirectSound_CDirectSound_CommitDeferredSettings+0x96 : leave { 0x96, 0xC9 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetDistanceFactorA +// * DirectSound_CDirectSound::SetDistanceFactorA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDistanceFactorA, 5558, 11, +OOVPA_XREF(DirectSound_CDirectSound_SetDistanceFactorA, 5558, 11, XREF_SETDISTANCEFACTORA, XRefZero) - // CDirectSound_SetDistanceFactorA+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetDistanceFactorA+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 { 0x22, 0x05 }, // (Offset,Value)-Pair #2 { 0x23, 0x40 }, // (Offset,Value)-Pair #3 { 0x24, 0x00 }, // (Offset,Value)-Pair #4 { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetDistanceFactorA+0x39 : or dword ptr[eax+0x30], 0x08 + // DirectSound_CDirectSound_SetDistanceFactorA+0x39 : or dword ptr[eax+0x30], 0x08 { 0x39, 0x83 }, // (Offset,Value)-Pair #6 { 0x3A, 0x48 }, // (Offset,Value)-Pair #7 { 0x3B, 0x30 }, // (Offset,Value)-Pair #8 { 0x3C, 0x08 }, // (Offset,Value)-Pair #9 - // CDirectSound_SetDistanceFactorA+0x4C : jz +0x0B + // DirectSound_CDirectSound_SetDistanceFactorA+0x4C : jz +0x0B { 0x4C, 0x74 }, // (Offset,Value)-Pair #10 { 0x4D, 0x0B }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetRolloffFactor +// * DirectSound_CDirectSound::SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetRolloffFactor, 5558, 11, +OOVPA_XREF(DirectSound_CDirectSound_SetRolloffFactor, 5558, 11, XREF_SETROLLOFFFACTORA, XRefZero) - // CDirectSound_SetRolloffFactor+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetRolloffFactor+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 { 0x22, 0x05 }, // (Offset,Value)-Pair #2 { 0x23, 0x40 }, // (Offset,Value)-Pair #3 { 0x24, 0x00 }, // (Offset,Value)-Pair #4 { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetRolloffFactor+0x39 : or dword ptr[eax+0x30], 0x10 + // DirectSound_CDirectSound_SetRolloffFactor+0x39 : or dword ptr[eax+0x30], 0x10 { 0x39, 0x83 }, // (Offset,Value)-Pair #6 { 0x3A, 0x48 }, // (Offset,Value)-Pair #7 { 0x3B, 0x30 }, // (Offset,Value)-Pair #8 { 0x3C, 0x10 }, // (Offset,Value)-Pair #9 - // CDirectSound_SetRolloffFactor+0x4C : jz +0x0B + // DirectSound_CDirectSound_SetRolloffFactor+0x4C : jz +0x0B { 0x4C, 0x74 }, // (Offset,Value)-Pair #10 { 0x4D, 0x0B }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * CDirectSound::SetDopplerFactor +// * DirectSound_CDirectSound::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDopplerFactor, 5558, 14, +OOVPA_XREF(DirectSound_CDirectSound_SetDopplerFactor, 5558, 14, XREF_SETDOPPLERFACTOR, XRefZero) - // CDirectSound_SetDopplerFactor+0x21 : mov eax, 0x80004005 + // DirectSound_CDirectSound_SetDopplerFactor+0x21 : mov eax, 0x80004005 { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 { 0x22, 0x05 }, // (Offset,Value)-Pair #2 { 0x23, 0x40 }, // (Offset,Value)-Pair #3 { 0x24, 0x00 }, // (Offset,Value)-Pair #4 { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - // CDirectSound_SetDopplerFactor+0x33 : mov [eax+0x70], edx + // DirectSound_CDirectSound_SetDopplerFactor+0x33 : mov [eax+0x70], edx { 0x33, 0x89 }, // (Offset,Value)-Pair #6 { 0x34, 0x50 }, // (Offset,Value)-Pair #7 { 0x35, 0x70 }, // (Offset,Value)-Pair #8 - // CDirectSound_SetDopplerFactor+0x39 : or dword ptr[eax+0x30], 0x20 + // DirectSound_CDirectSound_SetDopplerFactor+0x39 : or dword ptr[eax+0x30], 0x20 { 0x39, 0x83 }, // (Offset,Value)-Pair #9 { 0x3A, 0x48 }, // (Offset,Value)-Pair #10 { 0x3B, 0x30 }, // (Offset,Value)-Pair #11 { 0x3C, 0x20 }, // (Offset,Value)-Pair #12 - // CDirectSound_SetDopplerFactor+0x4C : jz +0x0B + // DirectSound_CDirectSound_SetDopplerFactor+0x4C : jz +0x0B { 0x4C, 0x74 }, // (Offset,Value)-Pair #13 { 0x4D, 0x0B }, // (Offset,Value)-Pair #14 OOVPA_END; @@ -203,9 +203,9 @@ OOVPA_XREF(IDirectSound8_SetMixBinHeadroom, 5558, 9, OOVPA_END; // ****************************************************************** -// * CDirectSound_SetI3DL2Listener +// * DirectSound_CDirectSound_SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(CDirectSound_SetI3DL2Listener, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 5558, 8, XREF_DSSETI3DL2LISTENER, XRefZero) @@ -313,7 +313,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetBufferData // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetBufferData, 5558, 7, XREF_DSSETBUFFERDATA, XRefZero) @@ -365,9 +365,9 @@ OOVPA_XREF(CMcpxBuffer_SetCurrentPosition, 5558, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetCurrentPosition +// * DirectSound_CDirectSoundBuffer::SetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 5558, 8, XREF_SETCURRENTPOSITION2, XRefOne) @@ -421,9 +421,9 @@ OOVPA_XREF(CMcpxVoiceClient_SetLFO, 5558, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetLFO +// * DirectSound_CDirectSoundVoice::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetLFO, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetLFO, 5558, 7, XREF_DirectSound_CDirectSoundVoice_SetLFO, XRefOne) @@ -439,9 +439,9 @@ OOVPA_XREF(CDirectSoundVoice_SetLFO, 5558, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetLFO +// * DirectSound_CDirectSoundBuffer::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetLFO, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetLFO, 5558, 8, XREF_DirectSound_CDirectSoundBuffer_SetLFO, XRefOne) @@ -507,9 +507,9 @@ OOVPA_XREF(CMcpxVoiceClient_SetVolume, 5558, 13, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoiceSettings::SetMixBins +// * DirectSound_CDirectSoundVoiceSettings::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 5558, 7, XREF_DSSETMIXBINSC, XRefZero) @@ -524,9 +524,9 @@ OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 5558, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetMixBins +// * DirectSound_CDirectSoundVoice::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMixBins, 5558, 8, XREF_DSSETMIXBINSB, XRefOne) @@ -543,9 +543,9 @@ OOVPA_XREF(CDirectSoundVoice_SetMixBins, 5558, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMixBins +// * DirectSound_CDirectSoundBuffer::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMixBins, 5558, 8, XREF_DSSETMIXBINSA, XRefOne) @@ -581,9 +581,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 5558, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetPlayRegion +// * DirectSound_CDirectSoundBuffer::SetPlayRegion // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPlayRegion, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetPlayRegion, 5558, 8, XREF_DSBUFFERSETPLAYREGIONA, XRefZero) @@ -619,9 +619,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetPlayRegion, 5558, 9, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetLoopRegion +// * DirectSound_CDirectSoundBuffer::SetLoopRegion // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetLoopRegion, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5558, 7, XREF_DirectSound_CDirectSoundBuffer_SetLoopRegion, XRefZero) @@ -674,9 +674,9 @@ OOVPA_XREF(CMcpxBuffer_Play, 5558, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::Play +// * DirectSound_CDirectSoundBuffer::Play // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 5558, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_Play, 5558, 9, XREF_DSOUNDPLAY2, XRefZero) // TODO : Use XRefOne here if XREF_DSOUNDPLAY is enabled below @@ -772,9 +772,9 @@ OOVPA_XREF(XAudioCreateAdpcmFormat, 5558, 2, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetFormat +// * DirectSound_CDirectSoundVoice::SetFormat // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetFormat, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetFormat, 5558, 7, XREF_DirectSound_CDirectSoundVoice_SetFormat, XRefZero) @@ -789,9 +789,9 @@ OOVPA_XREF(CDirectSoundVoice_SetFormat, 5558, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetFormat +// * DirectSound_CDirectSoundBuffer::SetFormat // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetFormat, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetFormat, 5558, 8, XREF_DirectSound_CDirectSoundBuffer_SetFormat, XRefOne) @@ -827,9 +827,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetFormat, 5558, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetConeAngles +// * DirectSound_CDirectSoundVoice::SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetConeAngles, 5558, 8, XREF_DirectSound_CDirectSoundVoice_SetConeAngles, XRefZero) @@ -845,9 +845,9 @@ OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 5558, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetConeAngles +// * DirectSound_CDirectSoundBuffer::SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetConeAngles, 5558, 8, XREF_DirectSound_CDirectSoundBuffer_SetConeAngles, XRefOne) @@ -885,7 +885,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMaxDistance, 5558, 7, XREF_DSVOICESETMAXDISTANCE, XRefZero) @@ -900,29 +900,29 @@ OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 5558, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMaxDistance +// * DirectSound_CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 5558, 11, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5558, 11, XREF_DSBUFFERSETMAXDISTANCE, XRefOne) - // CDirectSoundBuffer_SetMaxDistance+0x39 : call [CDirectSoundVoice::SetMaxDistance] + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x39 : call [CDirectSoundVoice::SetMaxDistance] XREF_ENTRY( 0x3A, XREF_DSVOICESETMAXDISTANCE ), { 0x00, 0x56 }, - // CDirectSoundBuffer_SetMaxDistance+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetMaxDistance+0x32 : fstp [esp+0Ch+var_C] + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x32 : fstp [esp+0Ch+var_C] { 0x32, 0xD9 }, { 0x33, 0x1C }, { 0x34, 0x24 }, - // CDirectSoundBuffer_SetMaxDistance+0x53 : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x53 : retn 0Ch { 0x54, 0x0C }, { 0x55, 0x00 } OOVPA_END; @@ -958,7 +958,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMinDistance, 5558, 7, XREF_DSVOICESETMINDISTANCE, XRefZero) @@ -973,29 +973,29 @@ OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 5558, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetMinDistance +// * DirectSound_CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 5558, 11, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMinDistance, 5558, 11, XREF_DSBUFFERSETMINDISTANCE, XRefOne) - // CDirectSoundBuffer_SetMinDistance+0x39 : call [CDirectSoundVoice::SetMinDistance] + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x39 : call [CDirectSoundVoice::SetMinDistance] XREF_ENTRY( 0x3A, XREF_DSVOICESETMINDISTANCE ), { 0x00, 0x56 }, - // CDirectSoundBuffer_SetMinDistance+0x21 : mov eax, 80004005h + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, { 0x24, 0x00 }, { 0x25, 0x80 }, - // CDirectSoundBuffer_SetMinDistance+0x32 : fstp [esp+0Ch+var_C] + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x32 : fstp [esp+0Ch+var_C] { 0x32, 0xD9 }, { 0x33, 0x1C }, { 0x34, 0x24 }, - // CDirectSoundBuffer_SetMinDistance+0x53 : retn 0Ch + // DirectSound_CDirectSoundBuffer_SetMinDistance+0x53 : retn 0Ch { 0x54, 0x0C }, { 0x55, 0x00 } OOVPA_END; @@ -1048,9 +1048,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 5558, 11, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::CommitDeferredSettings +// * DirectSound_CDirectSoundVoice::CommitDeferredSettings // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_CommitDeferredSettings, 5558, 6, +OOVPA_XREF(DirectSound_CDirectSoundVoice_CommitDeferredSettings, 5558, 6, XREF_DirectSound_CDirectSoundVoice_CommitDeferredSettings, XRefZero) @@ -1128,9 +1128,9 @@ OOVPA_XREF(IDirectSoundBuffer8_SetAllParameters, 5558, 9, OOVPA_END; */ // ****************************************************************** -// * CDirectSoundVoice::SetPosition +// * DirectSound_CDirectSoundVoice::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetPosition, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetPosition, 5558, 7, XREF_DSVOICESETPOSITION, XRefZero) @@ -1145,9 +1145,9 @@ OOVPA_XREF(CDirectSoundVoice_SetPosition, 5558, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetPosition +// * DirectSound_CDirectSoundBuffer::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPosition, 5558, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetPosition, 5558, 9, XREF_DSBUFFERSETPOSITION, XRefOne) @@ -1184,9 +1184,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetPosition, 5558, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetVelocity +// * DirectSound_CDirectSoundVoice::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVelocity, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetVelocity, 5558, 7, XREF_DSVOICESETVELOCITY, XRefZero) @@ -1201,9 +1201,9 @@ OOVPA_XREF(CDirectSoundVoice_SetVelocity, 5558, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetVelocity +// * DirectSound_CDirectSoundBuffer::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 5558, 9, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetVelocity, 5558, 9, XREF_DSBUFFERSETVELOCITY, XRefOne) @@ -1257,9 +1257,9 @@ OOVPA_XREF(DirectSound_CMcpxStream_Pause, 5558, 7, };*/ // ****************************************************************** -// * CDirectSoundStream::Pause +// * DirectSound_CDirectSoundStream::Pause // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Pause, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundStream_Pause, 5558, 8, XRefNoSaveIndex, XRefOne) @@ -1276,9 +1276,9 @@ OOVPA_XREF(CDirectSoundStream_Pause, 5558, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetDistanceFactor +// * DirectSound_CDirectSoundVoice::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetDistanceFactor, 5558, 7, XREF_DSVOICESETDISTANCEFACTOR, XRefZero) @@ -1293,9 +1293,9 @@ OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5558, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetDistanceFactor +// * DirectSound_CDirectSoundBuffer::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 5558, 8, XREF_DSBUFFERSETDISTANCEFACTOR, XRefOne) @@ -1331,9 +1331,9 @@ OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 5558, 8, OOVPA_END; // ****************************************************************** -// * CDirectSoundVoice::SetDopplerFactor +// * DirectSound_CDirectSoundVoice::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 5558, 7, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetDopplerFactor, 5558, 7, XREF_DSVOICESETDOPPLERFACTOR, XRefZero) @@ -1348,9 +1348,9 @@ OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 5558, 7, OOVPA_END; // ****************************************************************** -// * CDirectSoundBuffer::SetDopplerFactor +// * DirectSound_CDirectSoundBuffer::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDopplerFactor, 5558, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 5558, 8, XREF_DSBUFFERSETDOPPLERFACTOR, XRefOne) @@ -2012,111 +2012,111 @@ OOVPA_END; OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSoundCreate, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4627, XREF), - REGISTER_OOVPA(CDirectSound_SynchPlayback, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5558, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 5558, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4361, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 4627, PATCH), REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactorA, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 5558, XREF), REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5558, XREF), REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 5558, XREF), - REGISTER_OOVPA(CDirectSoundStream_FlushEx, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_FlushEx, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5233, PATCH), REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5558, ALIAS, DirectSound_CDirectSoundStream_SetFrequency), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFrequency, 5558, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4627, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 5558, XREF), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetRolloffCurve, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 5558, PATCH), - // REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 4627, XREF), // THESE ARE NOT CORRECT - // REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 4627, XREF), // THESE ARE NOT CORRECT + // REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffFactor, 4627, XREF), // THESE ARE NOT CORRECT + // REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffFactor, 4627, XREF), // THESE ARE NOT CORRECT // REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 4627, PATCH), // THESE ARE NOT CORRECT - REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDopplerFactor, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5558, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4627, PATCH), - // REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4627, XREF), + // REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 4627, XREF), // REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5558, XREF), REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 5558, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), REGISTER_OOVPA(DirectSound_CFullHRTFSource_GetCenterVolume, 5558, XREF), REGISTER_OOVPA(DirectSound_CHRTFSource_SetFullHRTF5Channel, 5558, XREF), REGISTER_OOVPA(DirectSoundUseFullHRTF, 5558, PATCH), REGISTER_OOVPA(DirectSoundDoWork, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 5558, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 5558, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 5558, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetLFO, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLFO, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVolume, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 5233, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 5558, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4627, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPlayRegion, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 5558, PATCH), REGISTER_OOVPA(CMcpxBuffer_Play, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Play, 5558, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4627, PATCH), REGISTER_OOVPA(WaveFormat_CreateXboxAdpcmFormat, 5558, XREF), REGISTER_OOVPA(XAudioCreateAdpcmFormat, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetConeAngles, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetConeAngles, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetRolloffCurve, 5558, ALIAS, DirectSound_CDirectSoundStream_SetRolloffCurve), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetRolloffCurve, 5558, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 5233, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_CommitDeferredSettings, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_CommitDeferredSettings, 5558, XREF), // REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5558, XREF), // REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 5558, XREF), // REGISTER_OOVPA(IDirectSound8_SetAllParameters, 5558, ALIAS, IDirectSoundBuffer8_SetAllParameters), // Use that for now - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPosition, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPosition, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVelocity, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVelocity, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDistanceFactor, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 5558, PATCH), - REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, CDirectSoundStream_SetVolume), // (This is actually the XREF we are using) + REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, DirectSound_CDirectSoundStream_SetVolume), // (This is actually the XREF we are using) REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetI3DL2Source, 5558, XREF), @@ -2131,8 +2131,8 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 5558, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFormat, 5558, ALIAS, DirectSound_CDirectSoundStream_SetFormat), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 5558, ALIAS, DirectSound_CDirectSoundStream_SetMixBins), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5558, XREF), REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 5558, ALIAS, IDirectSound_SetMixBinHeadroom), REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 5558, XREF), @@ -2148,7 +2148,7 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(IDirectSound8_CreateStream, 5558, ALIAS, IDirectSound_CreateSoundStream), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetEG, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetEG, 5558, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 5558, ALIAS, DirectSound_CDirectSoundStream_SetEG), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetEG, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetEG, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 5558, PATCH), REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), @@ -2157,7 +2157,7 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetFilter, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFilter, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFilter, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4627, ALIAS, DirectSound_CDirectSoundStream_SetFilter), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFilter, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4627, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index 55c92346f..53c7c96e9 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -61,9 +61,9 @@ OOVPA_XREF(CMcpxBuffer_GetStatus, 5788, 11, OOVPA_END; // ****************************************************************** -// * CDirectSound_SetI3DL2Listener +// * DirectSound_CDirectSound_SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(CDirectSound_SetI3DL2Listener, 5788, 8, +OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 5788, 8, XREF_DSSETI3DL2LISTENER, XRefZero) @@ -1596,14 +1596,14 @@ OOVPA_END; // ****************************************************************** -// CDirectSoundVoice::SetMode +// DirectSound_CDirectSoundVoice::SetMode // ****************************************************************** -#define CDirectSoundVoice_SetMode_5788 CDirectSoundVoice_SetMode_5344 +#define DirectSound_CDirectSoundVoice_SetMode_5788 DirectSound_CDirectSoundVoice_SetMode_5344 // ****************************************************************** -// CDirectSoundBuffer::SetMode +// DirectSound_CDirectSoundBuffer::SetMode // ****************************************************************** -#define CDirectSoundBuffer_SetMode_5788 CDirectSoundBuffer_SetMode_5233 +#define DirectSound_CDirectSoundBuffer_SetMode_5788 DirectSound_CDirectSoundBuffer_SetMode_5233 // ****************************************************************** // * IDirectSoundBuffer_SetMode @@ -1616,36 +1616,36 @@ OOVPA_END; OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSoundCreate, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 5788, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5788, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 5788, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5788, XREF), REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5788, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetConeAngles, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetConeAngles, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes2, 5788, ALIAS, DirectSound_CDirectSoundStream_SetMixBinVolumes), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetRolloffCurve, 5558, ALIAS, DirectSound_CDirectSoundStream_SetRolloffCurve), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5788, ALIAS, DirectSound_CDirectSoundStream_SetMixBinVolumes), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetRolloffCurve, 5558, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 5233, PATCH), REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4627, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4627, PATCH), REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), @@ -1676,35 +1676,35 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 5788, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 5788, ALIAS, DirectSound_CDirectSoundStream_SetMixBins), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5788, XREF), REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 5788, ALIAS, IDirectSound_SetMixBinHeadroom), REGISTER_OOVPA(DirectSound_CDirectSound_SetPosition, 5788, XREF), REGISTER_OOVPA(IDirectSound8_SetPosition, 5788, ALIAS, IDirectSound_SetPosition), REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5788, XREF), REGISTER_OOVPA(IDirectSound8_SetVelocity, 5788, ALIAS, IDirectSound_SetVelocity), - REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDistanceFactor, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 5788, ALIAS, DirectSound_CDirectSound_CommitDeferredSettings), + REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 5788, PATCH), REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH), REGISTER_OOVPA(DirectSound_CMcpxBuffer_SetCurrentPosition, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 5788, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 5558, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetLFO, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLFO, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 5788, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPlayRegion, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 5788, PATCH), REGISTER_OOVPA(DirectSound_CMcpxBuffer_Stop, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5788, ALIAS, DirectSound_CDirectSoundBuffer_StopEx), - REGISTER_OOVPA(CDirectSound_SetDistanceFactorA, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 5558, XREF), REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5788, XREF), REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 4627, PATCH), @@ -1714,18 +1714,18 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPitch, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 5788, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 5558, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVolume, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 5233, PATCH), - REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, CDirectSoundStream_SetVolume), // This is actually the XREF we are using + REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, DirectSound_CDirectSoundStream_SetVolume), // This is actually the XREF we are using REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffFactor, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffFactor, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 5788, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5558, ALIAS, DirectSound_CDirectSoundStream_SetFrequency), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFrequency, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDopplerFactor, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5788, PATCH), @@ -1738,14 +1738,14 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSound_CMcpxBuffer_Pause, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Pause, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Pause, 5788, PATCH), - REGISTER_OOVPA(DirectSoundCreateStream, 5788, ALIAS, DirectSound_CDirectSound_CreateSoundStream), + REGISTER_OOVPA(DirectSoundCreateStream, 5788, PATCH), REGISTER_OOVPA(DirectSoundCreateStream, 5788, PATCH), REGISTER_OOVPA(DirectSound_CMcpxStream_Pause, 5788, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 5788, ALIAS, DirectSound_CDirectSoundStream_Pause), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_FlushEx, 5788, XREF), REGISTER_OOVPA(IDirectSoundStream_FlushEx, 5788, PATCH), REGISTER_OOVPA(DirectSoundDoWork, 5788, PATCH), - REGISTER_OOVPA(CDirectSound_SynchPlayback, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 5558, XREF), REGISTER_OOVPA(IDirectSound8_EnableHeadphones, 5558, ALIAS, IDirectSound_EnableHeadphones), REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), @@ -1757,8 +1757,8 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(XFileCreateMediaObjectAsync, 5788, PATCH), REGISTER_OOVPA(WaveFormat_CreateXboxAdpcmFormat, 5558, XREF), REGISTER_OOVPA(XAudioCreateAdpcmFormat, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFormat, 5558, ALIAS, DirectSound_CDirectSoundStream_SetFormat), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 5788, ALIAS, DirectSound_CDirectSoundStream_SetPitch), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 5558, PATCH), + 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), @@ -1767,7 +1767,7 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(IDirectSoundBuffer_Play, 5788, PATCH), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetEG, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetEG, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4627, ALIAS, DirectSound_CDirectSoundStream_SetEG), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetEG, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetEG, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4627, PATCH), REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), @@ -1776,10 +1776,10 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetFilter, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFilter, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFilter, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4627, ALIAS, DirectSound_CDirectSoundStream_SetFilter), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFilter, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 5788, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMode, 5788, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMode, 5788, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMode, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 5788, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl index 2a7a3de82..89a887422 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl @@ -61,9 +61,9 @@ OOVPA_XREF(CMcpxBuffer_GetStatus, 5849, 11, OOVPA_END; // ****************************************************************** -// * CDirectSound_SetI3DL2Listener +// * DirectSound_CDirectSound_SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(CDirectSound_SetI3DL2Listener, 5849, 8, +OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 5849, 8, XREF_DSSETI3DL2LISTENER, XRefZero) @@ -1651,14 +1651,14 @@ OOVPA_END; #define IDirectSoundBuffer_SetEG_5849 IDirectSoundBuffer_SetEG_4627 // ****************************************************************** -// CDirectSoundVoice::SetMode +// DirectSound_CDirectSoundVoice::SetMode // ****************************************************************** -#define CDirectSoundVoice_SetMode_5849 CDirectSoundVoice_SetMode_5344 +#define DirectSound_CDirectSoundVoice_SetMode_5849 DirectSound_CDirectSoundVoice_SetMode_5344 // ****************************************************************** -// CDirectSoundBuffer::SetMode +// DirectSound_CDirectSoundBuffer::SetMode // ****************************************************************** -#define CDirectSoundBuffer_SetMode_5849 CDirectSoundBuffer_SetMode_5233 +#define DirectSound_CDirectSoundBuffer_SetMode_5849 DirectSound_CDirectSoundBuffer_SetMode_5233 // ****************************************************************** // * IDirectSoundBuffer_SetMode @@ -1701,30 +1701,30 @@ OOVPA_END; OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSoundCreate, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 5849, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4361, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5849, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 5849, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5849, XREF), REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5849, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes2, 5849, ALIAS, DirectSound_CDirectSoundStream_SetMixBinVolumes), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5849, ALIAS, DirectSound_CDirectSoundStream_SetMixBinVolumes), REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4627, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4627, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4627, PATCH), REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), @@ -1746,14 +1746,14 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 5849, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 5849, ALIAS, DirectSound_CDirectSoundStream_SetMixBins), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5849, XREF), REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 5849, ALIAS, IDirectSound_SetMixBinHeadroom), REGISTER_OOVPA(DirectSound_CDirectSound_SetPosition, 5849, XREF), REGISTER_OOVPA(IDirectSound8_SetPosition, 5849, ALIAS, IDirectSound_SetPosition), REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5849, XREF), REGISTER_OOVPA(IDirectSound8_SetVelocity, 5849, ALIAS, IDirectSound_SetVelocity), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 5849, ALIAS, DirectSound_CDirectSound_CommitDeferredSettings), + REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 5849, PATCH), REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH), REGISTER_OOVPA(DirectSound_CMcpxBuffer_SetCurrentPosition, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 5849, XREF), @@ -1796,38 +1796,38 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSoundCreateStream, 5849, ALIAS, DirectSound_CDirectSound_CreateSoundStream), REGISTER_OOVPA(DirectSoundCreateStream, 5849, PATCH), REGISTER_OOVPA(DirectSound_CMcpxStream_Pause, 5849, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 5849, ALIAS, DirectSound_CDirectSoundStream_Pause), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_FlushEx, 5849, XREF), REGISTER_OOVPA(IDirectSoundStream_FlushEx, 5849, PATCH), REGISTER_OOVPA(DirectSoundDoWork, 5849, PATCH), - REGISTER_OOVPA(CDirectSound_SynchPlayback, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5558, PATCH), REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), REGISTER_OOVPA(IDirectSound8_SetEffectData, 5849, ALIAS, IDirectSound_SetEffectData), REGISTER_OOVPA(DirectSound_CMemoryManager_PoolAlloc, 5849, XREF), REGISTER_OOVPA(XFileCreateMediaObjectAsync, 5849, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFormat, 5558, ALIAS, DirectSound_CDirectSoundStream_SetFormat), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 5849, ALIAS, DirectSound_CDirectSoundStream_SetPitch), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPitch, 5849, PATCH), REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 5849, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom), REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play2, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Play, 5849, PATCH), REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactorA, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 5558, XREF), REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParameters, 5849, XREF), REGISTER_OOVPA(IDirectSound8_SetAllParameters, 3936, PATCH), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetFilter, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFilter, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFilter, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4627, ALIAS, DirectSound_CDirectSoundStream_SetFilter), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFilter, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4627, PATCH), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetEG, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetEG, 5849, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 5849, ALIAS, DirectSound_CDirectSoundStream_SetEG), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetEG, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetEG, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 5849, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 5849, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMode, 5849, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMode, 5849, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMode, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetI3DL2Source, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetI3DL2Source, 5849, XREF), From 3f8ffae31dc99b05379e987d0c9fd68696214434 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Thu, 16 Feb 2017 17:59:02 +0900 Subject: [PATCH 2/7] Renamed X_DirectSound_CDirectSound prefix to DirectSound_CDirectSound --- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 12 ++++++------ src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index e75f76a69..0655db2a2 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -1770,7 +1770,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetFormat // ****************************************************************** -OOVPA_XREF(X_DirectSound_CDirectSoundVoice_SetFormat, 4627, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetFormat, 4627, 8, XREF_DirectSound_CDirectSoundVoice_SetFormat, XRefZero) @@ -1788,7 +1788,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetFormat // ****************************************************************** -OOVPA_XREF(X_DirectSound_CDirectSoundBuffer_SetFormat, 4627, 8, +OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetFormat, 4627, 8, XREF_DirectSound_CDirectSoundBuffer_SetFormat, XRefOne) @@ -1877,7 +1877,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSound::EnableHeadphones (incorrect?) // ****************************************************************** -OOVPA_XREF(X_DirectSound_CDirectSound_EnableHeadphones, 4627, 15, +OOVPA_XREF(DirectSound_CDirectSound_EnableHeadphones, 4627, 15, XREF_DirectSound_CDirectSound_EnableHeadphones, XRefZero) @@ -3074,11 +3074,11 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), // +s - REGISTER_OOVPA(X_DirectSound_CDirectSoundVoice_SetFormat, 4627, XREF), - REGISTER_OOVPA(X_DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, ALIAS, X_IDirectSoundBuffer_SetFormat), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes, 4627, XREF), - REGISTER_OOVPA(X_DirectSound_CDirectSound_EnableHeadphones, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 4627, XREF), REGISTER_OOVPA(IDirectSound_EnableHeadphones, 4627, ALIAS, EmuIDirectSound_EnableHeadphones), // REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 4627, XREF), // REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 4627, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index c250741ce..9984a251f 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -220,7 +220,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetFormat // ****************************************************************** -OOVPA_XREF(X_DirectSound_CDirectSoundVoice_SetFormat, 5233, 8, +OOVPA_XREF(DirectSound_CDirectSoundVoice_SetFormat, 5233, 8, XREF_DirectSound_CDirectSoundVoice_SetFormat, XRefZero) @@ -947,8 +947,8 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, DirectSound_CDirectSoundStream_SetVolume), // (This is actually the XREF we are using) - REGISTER_OOVPA(X_DirectSound_CDirectSoundVoice_SetFormat, 5233, XREF), - REGISTER_OOVPA(X_DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, ALIAS, X_IDirectSoundBuffer_SetFormat), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMode, 5233, XREF), //REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMode, 5344, XREF), // Add when needed... From 90689c298179a00328bbdfaf77390df035596dfa Mon Sep 17 00:00:00 2001 From: jarupxx Date: Thu, 16 Feb 2017 18:02:44 +0900 Subject: [PATCH 3/7] Renamed X_IDirect prefix to IDirect --- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 4 ++-- src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 0655db2a2..1d944f0ea 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -1807,7 +1807,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetFormat // ****************************************************************** -OOVPA_XREF(X_IDirectSoundBuffer_SetFormat, 4627, 8, +OOVPA_XREF(IDirectSoundBuffer_SetFormat, 4627, 8, XRefNoSaveIndex, XRefOne) @@ -3076,7 +3076,7 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), // +s REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, ALIAS, X_IDirectSoundBuffer_SetFormat), + REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 4627, XREF), REGISTER_OOVPA(IDirectSound_EnableHeadphones, 4627, ALIAS, EmuIDirectSound_EnableHeadphones), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index 9984a251f..475d54e67 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -949,7 +949,7 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, DirectSound_CDirectSoundStream_SetVolume), // (This is actually the XREF we are using) REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, ALIAS, X_IDirectSoundBuffer_SetFormat), + REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMode, 5233, XREF), //REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMode, 5344, XREF), // Add when needed... REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMode, 5233, XREF), From c0fdb98cf24f15aa49d8deaf3fec9a648821e7e5 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Fri, 17 Feb 2017 16:03:57 +0900 Subject: [PATCH 4/7] 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), From f22565e3afe30a0aa45e6cb5f96a198ee6ad3907 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Fri, 17 Feb 2017 16:28:19 +0900 Subject: [PATCH 5/7] Renamed IDirectSound8_ prefix to IDirectSound_ --- src/CxbxKrnl/EmuDSound.cpp | 116 ++++++------- src/CxbxKrnl/EmuDSound.h | 76 ++++----- src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl | 162 +++++++++---------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl | 22 +-- src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl | 16 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl | 54 +++---- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 86 +++++----- src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl | 40 ++--- src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl | 36 ++--- src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl | 34 ++-- src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl | 32 ++-- 11 files changed, 337 insertions(+), 337 deletions(-) diff --git a/src/CxbxKrnl/EmuDSound.cpp b/src/CxbxKrnl/EmuDSound.cpp index c98aa8cf2..dec45c03a 100644 --- a/src/CxbxKrnl/EmuDSound.cpp +++ b/src/CxbxKrnl/EmuDSound.cpp @@ -312,16 +312,16 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreate) } // ****************************************************************** -// * patch: IDirectSound8_AddRef +// * patch: IDirectSound_AddRef // ****************************************************************** -ULONG WINAPI XTL::EMUPATCH(IDirectSound8_AddRef) +ULONG WINAPI XTL::EMUPATCH(IDirectSound_AddRef) ( LPDIRECTSOUND8 pThis ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_AddRef\n" + DbgPrintf("EmuDSound: EmuIDirectSound_AddRef\n" "(\n" " pThis : 0x%.08X\n" ");\n", @@ -335,16 +335,16 @@ ULONG WINAPI XTL::EMUPATCH(IDirectSound8_AddRef) } // ****************************************************************** -// * patch: IDirectSound8_Release +// * patch: IDirectSound_Release // ****************************************************************** -ULONG WINAPI XTL::EMUPATCH(IDirectSound8_Release) +ULONG WINAPI XTL::EMUPATCH(IDirectSound_Release) ( LPDIRECTSOUND8 pThis ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_Release\n" + DbgPrintf("EmuDSound: EmuIDirectSound_Release\n" "(\n" " pThis : 0x%.08X\n" ");\n", @@ -413,22 +413,22 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_EnableHeadphones) } // ****************************************************************** -// * patch: IDirectSound8_SynchPlayback +// * patch: IDirectSound_SynchPlayback // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SynchPlayback) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SynchPlayback) ( LPDIRECTSOUND8 pThis ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SynchPlayback\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SynchPlayback\n" "(\n" " pThis : 0x%.08X\n" ");\n", pThis); - EmuWarning("EmuIDirectSound8_SynchPlayback ignored"); + EmuWarning("EmuIDirectSound_SynchPlayback ignored"); @@ -436,9 +436,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SynchPlayback) } // ****************************************************************** -// * patch: IDirectSound8_DownloadEffectsImage +// * patch: IDirectSound_DownloadEffectsImage // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_DownloadEffectsImage) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_DownloadEffectsImage) ( LPDIRECTSOUND8 pThis, LPCVOID pvImageBuffer, @@ -449,7 +449,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_DownloadEffectsImage) { - DbgPrintf("EmuDSound: EmuIDirectSound8_DownloadEffectsImage\n" + DbgPrintf("EmuDSound: EmuIDirectSound_DownloadEffectsImage\n" "(\n" " pThis : 0x%.08X\n" " pvImageBuffer : 0x%.08X\n" @@ -484,9 +484,9 @@ VOID WINAPI XTL::EMUPATCH(DirectSoundDoWork)() } // ****************************************************************** -// * patch: IDirectSound8_SetOrientation +// * patch: IDirectSound_SetOrientation // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetOrientation) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SetOrientation) ( LPDIRECTSOUND8 pThis, FLOAT xFront, @@ -500,7 +500,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetOrientation) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SetOrientation\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SetOrientation\n" "(\n" " pThis : 0x%.08X\n" " xFront : %f\n" @@ -521,9 +521,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetOrientation) } // ****************************************************************** -// * patch: IDirectSound8_SetDistanceFactor +// * patch: IDirectSound_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetDistanceFactor) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SetDistanceFactor) ( LPDIRECTSOUND8 pThis, FLOAT fDistanceFactor, @@ -532,7 +532,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetDistanceFactor) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SetDistanceFactor\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SetDistanceFactor\n" "(\n" " pThis : 0x%.08X\n" " fDistanceFactor : %f\n" @@ -548,9 +548,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetDistanceFactor) } // ****************************************************************** -// * patch: IDirectSound8_SetRolloffFactor +// * patch: IDirectSound_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetRolloffFactor) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SetRolloffFactor) ( LPDIRECTSOUND8 pThis, FLOAT fRolloffFactor, @@ -559,7 +559,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetRolloffFactor) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SetRolloffFactor\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SetRolloffFactor\n" "(\n" " pThis : 0x%.08X\n" " fRolloffFactor : %f\n" @@ -575,9 +575,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetRolloffFactor) } // ****************************************************************** -// * patch: IDirectSound8_SetDopplerFactor +// * patch: IDirectSound_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetDopplerFactor) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SetDopplerFactor) ( LPDIRECTSOUND8 pThis, FLOAT fDopplerFactor, @@ -586,7 +586,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetDopplerFactor) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SetDopplerFactor\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SetDopplerFactor\n" "(\n" " pThis : 0x%.08X\n" " fDopplerFactor : %f\n" @@ -602,16 +602,16 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetDopplerFactor) } // ****************************************************************** -// * patch: IDirectSound8_SetI3DL2Listener +// * patch: IDirectSound_SetI3DL2Listener // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetI3DL2Listener) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SetI3DL2Listener) ( LPDIRECTSOUND8 pThis, PVOID pDummy, // TODO: fill this out DWORD dwApply ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SetI3DL2Listener\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SetI3DL2Listener\n" "(\n" " pThis : 0x%.08X\n" " pDummy : 0x%.08X\n" @@ -625,16 +625,16 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetI3DL2Listener) } // ****************************************************************** -// * patch: IDirectSound8_SetMixBinHeadroom +// * patch: IDirectSound_SetMixBinHeadroom // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetMixBinHeadroom) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SetMixBinHeadroom) ( LPDIRECTSOUND8 pThis, DWORD dwMixBinMask, DWORD dwHeadroom ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SetMixBinHeadroom\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SetMixBinHeadroom\n" "(\n" " pThis : 0x%.08X\n" " dwMixBinMask : 0x%.08X\n" @@ -690,9 +690,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes) } // ****************************************************************** -// * patch: IDirectSound8_SetPosition +// * patch: IDirectSound_SetPosition // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetPosition) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SetPosition) ( LPDIRECTSOUND8 pThis, FLOAT x, @@ -701,7 +701,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetPosition) DWORD dwApply ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SetPosition\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SetPosition\n" "(\n" " pThis : 0x%.08X\n" " x : %f\n" @@ -717,9 +717,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetPosition) } // ****************************************************************** -// * patch: IDirectSound8_SetPosition +// * patch: IDirectSound_SetPosition // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetVelocity) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SetVelocity) ( LPDIRECTSOUND8 pThis, FLOAT x, @@ -728,7 +728,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetVelocity) DWORD dwApply ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SetVelocity\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SetVelocity\n" "(\n" " pThis : 0x%.08X\n" " x : %f\n" @@ -744,16 +744,16 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetVelocity) } // ****************************************************************** -// * patch: IDirectSound8_SetAllParameters +// * patch: IDirectSound_SetAllParameters // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetAllParameters) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SetAllParameters) ( LPDIRECTSOUND8 pThis, LPVOID pTodo, // TODO: LPCDS3DLISTENER DWORD dwApply ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SetAllParameters\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SetAllParameters\n" "(\n" " pThis : 0x%.08X\n" " pTodo : 0x%.08X\n" @@ -958,9 +958,9 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreateBuffer) } // ****************************************************************** -// * patch: IDirectSound8_CreateBuffer +// * patch: IDirectSound_CreateBuffer // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_CreateBuffer) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_CreateBuffer) ( LPDIRECTSOUND8 pThis, X_DSBUFFERDESC *pdssd, @@ -968,7 +968,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_CreateBuffer) PVOID pUnknown ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_CreateBuffer\n" + DbgPrintf("EmuDSound: EmuIDirectSound_CreateBuffer\n" "(\n" " pThis : 0x%.08X\n" " pdssd : 0x%.08X\n" @@ -983,9 +983,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_CreateBuffer) } // ****************************************************************** -// * patch: IDirectSound8_CreateSoundBuffer +// * patch: IDirectSound_CreateSoundBuffer // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_CreateSoundBuffer) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_CreateSoundBuffer) ( LPDIRECTSOUND8 pThis, X_DSBUFFERDESC *pdsbd, @@ -993,7 +993,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_CreateSoundBuffer) LPUNKNOWN pUnkOuter ) { - DbgPrintf("EmuDSound: EmuIDirectSound8_CreateSoundBuffer\n" + DbgPrintf("EmuDSound: EmuIDirectSound_CreateSoundBuffer\n" "(\n" " pdsbd : 0x%.08X\n" " ppBuffer : 0x%.08X\n" @@ -2979,9 +2979,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_Pause) //} // ****************************************************************** -// * patch: IDirectSound8_GetOutputLevels +// * patch: IDirectSound_GetOutputLevels // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetOutputLevels) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_GetOutputLevels) ( LPDIRECTSOUND8 *pThis, X_DSOUTPUTLEVELS *pOutputLevels, @@ -2990,7 +2990,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetOutputLevels) { - DbgPrintf("EmuDSound: EmuIDirectSound8_GetOutputLevels\n" + DbgPrintf("EmuDSound: EmuIDirectSound_GetOutputLevels\n" "(\n" " pThis : 0x%.08X\n" " pOutputLevels : 0x%.08X\n" @@ -3219,9 +3219,9 @@ extern "C" HRESULT __stdcall XTL::EMUPATCH(IDirectSoundBuffer_PlayEx) } // ****************************************************************** -// * patch: IDirectSound8_GetCaps +// * patch: IDirectSound_GetCaps // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetCaps) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_GetCaps) ( X_CDirectSound* pThis, X_DSCAPS* pDSCaps @@ -3229,7 +3229,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetCaps) { - DbgPrintf("EmuDSound: EmuIDirectSound8_GetCaps\n" + DbgPrintf("EmuDSound: EmuIDirectSound_GetCaps\n" "(\n" " pThis : 0x%.08X\n" " pDSCaps : 0x%.08X\n" @@ -3577,9 +3577,9 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_SetEG) } // ****************************************************************** -// * patch: IDirectSound8_GetEffectData +// * patch: IDirectSound_GetEffectData // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetEffectData) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_GetEffectData) ( X_CDirectSound* pThis, DWORD dwEffectIndex, @@ -3590,7 +3590,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetEffectData) { - DbgPrintf("EmuDSound: EmuIDirectSound8_GetEffectData\n" + DbgPrintf("EmuDSound: EmuIDirectSound_GetEffectData\n" "(\n" " pThis : 0x%.08X\n" " dwEffectIndex : 0x%.08X\n" @@ -3691,9 +3691,9 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetRolloffCurve) } // ****************************************************************** -// * patch: IDirectSound8_SetEffectData +// * patch: IDirectSound_SetEffectData // ****************************************************************** -HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetEffectData) +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_SetEffectData) ( LPVOID pThis, DWORD dwEffectIndex, @@ -3705,7 +3705,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetEffectData) { - DbgPrintf("EmuDSound: EmuIDirectSound8_SetEffectData\n" + DbgPrintf("EmuDSound: EmuIDirectSound_SetEffectData\n" "(\n" " pThis : 0x%.08X\n" " dwEfectIndex : 0x%.08X\n" diff --git a/src/CxbxKrnl/EmuDSound.h b/src/CxbxKrnl/EmuDSound.h index b38451997..b7506ca66 100644 --- a/src/CxbxKrnl/EmuDSound.h +++ b/src/CxbxKrnl/EmuDSound.h @@ -440,17 +440,17 @@ HRESULT WINAPI EMUPATCH(DirectSoundCreate) VOID WINAPI EMUPATCH(DirectSoundDoWork)(); // ****************************************************************** -// * patch: IDirectSound8_AddRef +// * patch: IDirectSound_AddRef // ****************************************************************** -ULONG WINAPI EMUPATCH(IDirectSound8_AddRef) +ULONG WINAPI EMUPATCH(IDirectSound_AddRef) ( LPDIRECTSOUND8 pThis ); // ****************************************************************** -// * patch: IDirectSound8_Release +// * patch: IDirectSound_Release // ****************************************************************** -ULONG WINAPI EMUPATCH(IDirectSound8_Release) +ULONG WINAPI EMUPATCH(IDirectSound_Release) ( LPDIRECTSOUND8 pThis ); @@ -474,17 +474,17 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_EnableHeadphones) ); // ****************************************************************** -// * patch: IDirectSound8_SynchPlayback +// * patch: IDirectSound_SynchPlayback // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SynchPlayback) +HRESULT WINAPI EMUPATCH(IDirectSound_SynchPlayback) ( LPDIRECTSOUND8 pThis ); // ****************************************************************** -// * patch: IDirectSound8_DownloadEffectsImage +// * patch: IDirectSound_DownloadEffectsImage // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_DownloadEffectsImage) +HRESULT WINAPI EMUPATCH(IDirectSound_DownloadEffectsImage) ( LPDIRECTSOUND8 pThis, LPCVOID pvImageBuffer, @@ -494,9 +494,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_DownloadEffectsImage) ); // ****************************************************************** -// * patch: IDirectSound8_SetOrientation +// * patch: IDirectSound_SetOrientation // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SetOrientation) +HRESULT WINAPI EMUPATCH(IDirectSound_SetOrientation) ( LPDIRECTSOUND8 pThis, FLOAT xFront, @@ -509,9 +509,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_SetOrientation) ); // ****************************************************************** -// * patch: IDirectSound8_SetDistanceFactor +// * patch: IDirectSound_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SetDistanceFactor) +HRESULT WINAPI EMUPATCH(IDirectSound_SetDistanceFactor) ( LPDIRECTSOUND8 pThis, FLOAT fDistanceFactor, @@ -519,9 +519,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_SetDistanceFactor) ); // ****************************************************************** -// * patch: IDirectSound8_SetRolloffFactor +// * patch: IDirectSound_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SetRolloffFactor) +HRESULT WINAPI EMUPATCH(IDirectSound_SetRolloffFactor) ( LPDIRECTSOUND8 pThis, FLOAT fRolloffFactor, @@ -529,9 +529,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_SetRolloffFactor) ); // ****************************************************************** -// * patch: IDirectSound8_SetDopplerFactor +// * patch: IDirectSound_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SetDopplerFactor) +HRESULT WINAPI EMUPATCH(IDirectSound_SetDopplerFactor) ( LPDIRECTSOUND8 pThis, FLOAT fDopplerFactor, @@ -539,9 +539,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_SetDopplerFactor) ); // ****************************************************************** -// * patch: IDirectSound8_SetI3DL2Listener +// * patch: IDirectSound_SetI3DL2Listener // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SetI3DL2Listener) +HRESULT WINAPI EMUPATCH(IDirectSound_SetI3DL2Listener) ( LPDIRECTSOUND8 pThis, PVOID pDummy, // TODO: fill this out @@ -549,9 +549,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_SetI3DL2Listener) ); // ****************************************************************** -// * patch: IDirectSound8_SetMixBinHeadroom +// * patch: IDirectSound_SetMixBinHeadroom // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SetMixBinHeadroom) +HRESULT WINAPI EMUPATCH(IDirectSound_SetMixBinHeadroom) ( LPDIRECTSOUND8 pThis, DWORD dwMixBinMask, @@ -577,9 +577,9 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes) ); // ****************************************************************** -// * patch: IDirectSound8_SetPosition +// * patch: IDirectSound_SetPosition // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SetPosition) +HRESULT WINAPI EMUPATCH(IDirectSound_SetPosition) ( LPDIRECTSOUND8 pThis, FLOAT x, @@ -589,9 +589,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_SetPosition) ); // ****************************************************************** -// * patch: IDirectSound8_SetVelocity +// * patch: IDirectSound_SetVelocity // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SetVelocity) +HRESULT WINAPI EMUPATCH(IDirectSound_SetVelocity) ( LPDIRECTSOUND8 pThis, FLOAT x, @@ -601,9 +601,9 @@ HRESULT WINAPI EMUPATCH(IDirectSound8_SetVelocity) ); // ****************************************************************** -// * patch: IDirectSound8_SetAllParameters +// * patch: IDirectSound_SetAllParameters // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SetAllParameters) +HRESULT WINAPI EMUPATCH(IDirectSound_SetAllParameters) ( LPDIRECTSOUND8 pThis, LPVOID pTodo, // TODO: LPCDS3DLISTENER @@ -619,9 +619,9 @@ HRESULT WINAPI EMUPATCH(DirectSound_CDirectSound_CommitDeferredSettings) ); // ****************************************************************** -// * patch: IDirectSound8_CreateSoundBuffer +// * patch: IDirectSound_CreateSoundBuffer // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_CreateSoundBuffer) +HRESULT WINAPI EMUPATCH(IDirectSound_CreateSoundBuffer) ( LPDIRECTSOUND8 pThis, X_DSBUFFERDESC *pdsbd, @@ -639,9 +639,9 @@ HRESULT WINAPI EMUPATCH(DirectSoundCreateBuffer) ); // ****************************************************************** -// * patch: IDirectSound8_CreateBuffer +// * patch: IDirectSound_CreateBuffer // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_CreateBuffer) +HRESULT WINAPI EMUPATCH(IDirectSound_CreateBuffer) ( LPDIRECTSOUND8 pThis, X_DSBUFFERDESC *pdssd, @@ -1273,9 +1273,9 @@ extern "C" HRESULT __stdcall EmuIDirectSoundBuffer_PauseEx ); // ****************************************************************** -// * patch: IDirectSound8_GetOutputLevels +// * patch: IDirectSound_GetOutputLevels // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_GetOutputLevels) +HRESULT WINAPI EMUPATCH(IDirectSound_GetOutputLevels) ( LPDIRECTSOUND8 *pThis, X_DSOUTPUTLEVELS *pOutputLevels, @@ -1346,9 +1346,9 @@ HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetFilter) ); // ****************************************************************** -// * patch: IDirectSound8_GetCaps +// * patch: IDirectSound_GetCaps // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_GetCaps) +HRESULT WINAPI EMUPATCH(IDirectSound_GetCaps) ( X_CDirectSound* pThis, X_DSCAPS* pDSCaps @@ -1463,9 +1463,9 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetEG) ); // ****************************************************************** -// * patch: IDirectSound8_GetEffectData +// * patch: IDirectSound_GetEffectData // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_GetEffectData) +HRESULT WINAPI EMUPATCH(IDirectSound_GetEffectData) ( X_CDirectSound* pThis, DWORD dwEffectIndex, @@ -1496,9 +1496,9 @@ HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetRolloffCurve) ); // ****************************************************************** -// * patch: IDirectSound8_SetEffectData +// * patch: IDirectSound_SetEffectData // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound8_SetEffectData) +HRESULT WINAPI EMUPATCH(IDirectSound_SetEffectData) ( LPVOID pThis, DWORD dwEffectIndex, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl index 4bb577c37..a1f71ac6c 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl @@ -230,30 +230,30 @@ OOVPA_XREF(DirectSound_CDirectSound_CreateSoundBuffer, 3936, 16, OOVPA_END; // ****************************************************************** -// * IDirectSound8_CreateBuffer +// * IDirectSound_CreateBuffer // ****************************************************************** -OOVPA_XREF(IDirectSound8_CreateBuffer, 3936, 10, +OOVPA_XREF(IDirectSound_CreateBuffer, 3936, 10, XRefNoSaveIndex, XRefOne) // TODO: tidy up the xref names (are probably not accurate) - // IDirectSound8_CreateBuffer+0x1D : call [CDirectSound::CreateSoundStream] + // IDirectSound_CreateBuffer+0x1D : call [CDirectSound::CreateSoundStream] XREF_ENTRY( 0x1D, XREF_DSCREATESOUNDBUFFER ), // (Offset,Value)-Pair #1 - // IDirectSound8_CreateBuffer+0x04 : mov eax, [esp+0x08] + // IDirectSound_CreateBuffer+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_CreateBuffer+0x12 : and eax, 0xFFFFFFF8 + // IDirectSound_CreateBuffer+0x12 : and eax, 0xFFFFFFF8 { 0x12, 0x83 }, // (Offset,Value)-Pair #6 { 0x13, 0xC0 }, // (Offset,Value)-Pair #7 { 0x14, 0xF8 }, // (Offset,Value)-Pair #8 - // IDirectSound8_CreateBuffer+0x21 : retn 0x10 + // IDirectSound_CreateBuffer+0x21 : retn 0x10 { 0x21, 0xC2 }, // (Offset,Value)-Pair #9 { 0x22, 0x10 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -2569,30 +2569,30 @@ OOVPA_XREF(IDirectSoundStream_SetHeadroom, 3936, 10, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetOrientation +// * IDirectSound_SetOrientation // ****************************************************************** -OOVPA_NO_XREF(IDirectSound8_SetOrientation, 3936, 13) +OOVPA_NO_XREF(IDirectSound_SetOrientation, 3936, 13) - // IDirectSound8_SetOrientation+0x06 : fld [ebp+0x20] + // IDirectSound_SetOrientation+0x06 : fld [ebp+0x20] { 0x06, 0xD9 }, // (Offset,Value)-Pair #1 { 0x07, 0x45 }, // (Offset,Value)-Pair #2 { 0x08, 0x20 }, // (Offset,Value)-Pair #3 - // IDirectSound8_SetOrientation+0x0C : sub esp, 0x18 + // IDirectSound_SetOrientation+0x0C : sub esp, 0x18 { 0x0C, 0x83 }, // (Offset,Value)-Pair #4 { 0x0D, 0xEC }, // (Offset,Value)-Pair #5 { 0x0E, 0x18 }, // (Offset,Value)-Pair #6 - // IDirectSound8_SetOrientation+0x18 : add eax, 0xFFFFFFF8 + // IDirectSound_SetOrientation+0x18 : add eax, 0xFFFFFFF8 { 0x18, 0x83 }, // (Offset,Value)-Pair #7 { 0x19, 0xC0 }, // (Offset,Value)-Pair #8 { 0x1A, 0xF8 }, // (Offset,Value)-Pair #9 - // IDirectSound8_SetOrientation+0x1F : neg ecx + // IDirectSound_SetOrientation+0x1F : neg ecx { 0x1F, 0xF7 }, // (Offset,Value)-Pair #10 { 0x20, 0xD9 }, // (Offset,Value)-Pair #11 - // IDirectSound8_SetOrientation+0x47 : retn 0x20 + // IDirectSound_SetOrientation+0x47 : retn 0x20 { 0x47, 0xC2 }, // (Offset,Value)-Pair #12 { 0x48, 0x20 }, // (Offset,Value)-Pair #13 OOVPA_END; @@ -2678,25 +2678,25 @@ OOVPA_XREF(DirectSound_CDirectSound_CommitDeferredSettings, 3936, 8, OOVPA_END; // ****************************************************************** -// * IDirectSound8_Release +// * IDirectSound_Release // ****************************************************************** -OOVPA_NO_XREF(IDirectSound8_Release, 3936, 10) +OOVPA_NO_XREF(IDirectSound_Release, 3936, 10) - // IDirectSound8_Release+0x04 : lea ecx, [eax-8] + // IDirectSound_Release+0x04 : lea ecx, [eax-8] { 0x04, 0x8D }, // (Offset,Value)-Pair #1 { 0x05, 0x48 }, // (Offset,Value)-Pair #2 { 0x06, 0xF8 }, // (Offset,Value)-Pair #3 - // IDirectSound8_Release+0x07 : neg eax + // IDirectSound_Release+0x07 : neg eax { 0x07, 0xF7 }, // (Offset,Value)-Pair #4 { 0x08, 0xD8 }, // (Offset,Value)-Pair #5 - // IDirectSound8_Release+0x10 : call dword ptr [ecx+8] + // IDirectSound_Release+0x10 : call dword ptr [ecx+8] { 0x10, 0xFF }, // (Offset,Value)-Pair #6 { 0x11, 0x51 }, // (Offset,Value)-Pair #7 { 0x12, 0x08 }, // (Offset,Value)-Pair #8 - // IDirectSound8_Release+0x13 : retn 0x04 + // IDirectSound_Release+0x13 : retn 0x04 { 0x13, 0xC2 }, // (Offset,Value)-Pair #9 { 0x14, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -2759,33 +2759,33 @@ OOVPA_XREF(DirectSound_CDirectSound_SetDistanceFactorA, 3936, 12, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetDistanceFactor +// * IDirectSound_SetDistanceFactor // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetDistanceFactor, 3936, 11, +OOVPA_XREF(IDirectSound_SetDistanceFactor, 3936, 11, XRefNoSaveIndex, XRefOne) // TODO: Tentative (may not be SetDistanceFactor) - // IDirectSound8_SetDistanceFactor+0x1D : call [CDirectSound::SetDistanceFactorA] + // IDirectSound_SetDistanceFactor+0x1D : call [CDirectSound::SetDistanceFactorA] XREF_ENTRY( 0x1D, XREF_SETDISTANCEFACTORA ), // (Offset,Value)-Pair #1 - // IDirectSound8_SetDistanceFactor+0x04 : fld [esp+0x0C] + // IDirectSound_SetDistanceFactor+0x04 : fld [esp+0x0C] { 0x04, 0xD9 }, // (Offset,Value)-Pair #2 { 0x05, 0x44 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // IDirectSound8_SetDistanceFactor+0x0C : push ecx + // IDirectSound_SetDistanceFactor+0x0C : push ecx { 0x0C, 0x51 }, // (Offset,Value)-Pair #6 - // IDirectSound8_SetDistanceFactor+0x12 : add eax, 0xFFFFFFF8 + // IDirectSound_SetDistanceFactor+0x12 : add eax, 0xFFFFFFF8 { 0x12, 0x83 }, // (Offset,Value)-Pair #7 { 0x13, 0xC0 }, // (Offset,Value)-Pair #8 { 0x14, 0xF8 }, // (Offset,Value)-Pair #9 - // IDirectSound8_SetDistanceFactor+0x21 : retn 0x0C + // IDirectSound_SetDistanceFactor+0x21 : retn 0x0C { 0x21, 0xC2 }, // (Offset,Value)-Pair #10 { 0x22, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -2848,33 +2848,33 @@ OOVPA_XREF(DirectSound_CDirectSound_SetRolloffFactorA, 3936, 12, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetRolloffFactor +// * IDirectSound_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetRolloffFactor, 3936, 11, +OOVPA_XREF(IDirectSound_SetRolloffFactor, 3936, 11, XRefNoSaveIndex, XRefOne) // TODO: Tentative (may not be SetRolloffFactor) - // IDirectSound8_SetRolloffFactor+0x1D : call [CDirectSound::SetRolloffFactorA] + // IDirectSound_SetRolloffFactor+0x1D : call [CDirectSound::SetRolloffFactorA] XREF_ENTRY( 0x1D, XREF_SETROLLOFFFACTORA ), // (Offset,Value)-Pair #1 - // IDirectSound8_SetRolloffFactor+0x04 : fld [esp+0x0C] + // IDirectSound_SetRolloffFactor+0x04 : fld [esp+0x0C] { 0x04, 0xD9 }, // (Offset,Value)-Pair #2 { 0x05, 0x44 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // IDirectSound8_SetRolloffFactor+0x0C : push ecx + // IDirectSound_SetRolloffFactor+0x0C : push ecx { 0x0C, 0x51 }, // (Offset,Value)-Pair #6 - // IDirectSound8_SetRolloffFactor+0x12 : add eax, 0xFFFFFFF8 + // IDirectSound_SetRolloffFactor+0x12 : add eax, 0xFFFFFFF8 { 0x12, 0x83 }, // (Offset,Value)-Pair #7 { 0x13, 0xC0 }, // (Offset,Value)-Pair #8 { 0x14, 0xF8 }, // (Offset,Value)-Pair #9 - // IDirectSound8_SetRolloffFactor+0x21 : retn 0x0C + // IDirectSound_SetRolloffFactor+0x21 : retn 0x0C { 0x21, 0xC2 }, // (Offset,Value)-Pair #10 { 0x22, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -2933,32 +2933,32 @@ OOVPA_XREF(DirectSound_CDirectSound_SetMixBinHeadroomA, 3936, 9, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetMixBinHeadroom +// * IDirectSound_SetMixBinHeadroom // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetMixBinHeadroom, 3936, 12, +OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 3936, 12, XRefNoSaveIndex, XRefOne) - // IDirectSound8_SetMixBinHeadroom+0x19 : call [CDirectSound::SetMixBinHeadroomA] + // IDirectSound_SetMixBinHeadroom+0x19 : call [CDirectSound::SetMixBinHeadroomA] XREF_ENTRY( 0x19, XREF_DSSETMIXBINHEADROOMA ), // (Offset,Value)-Pair #1 - // IDirectSound8_SetMixBinHeadroom+0x04 : push [esp+0x0C] + // IDirectSound_SetMixBinHeadroom+0x04 : push [esp+0x0C] { 0x04, 0xFF }, // (Offset,Value)-Pair #2 { 0x05, 0x74 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // IDirectSound8_SetMixBinHeadroom+0x08 : mov ecx, eax + // IDirectSound_SetMixBinHeadroom+0x08 : mov ecx, eax { 0x08, 0x8B }, // (Offset,Value)-Pair #6 { 0x09, 0xC8 }, // (Offset,Value)-Pair #7 - // IDirectSound8_SetMixBinHeadroom+0x0E : add eax, 0xFFFFFFF8 + // IDirectSound_SetMixBinHeadroom+0x0E : add eax, 0xFFFFFFF8 { 0x0E, 0x83 }, // (Offset,Value)-Pair #8 { 0x0F, 0xC0 }, // (Offset,Value)-Pair #9 { 0x10, 0xF8 }, // (Offset,Value)-Pair #10 - // IDirectSound8_SetMixBinHeadroom+0x1D : retn 0x0C + // IDirectSound_SetMixBinHeadroom+0x1D : retn 0x0C { 0x1D, 0xC2 }, // (Offset,Value)-Pair #11 { 0x1E, 0x0C }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -3018,31 +3018,31 @@ OOVPA_XREF(DirectSound_CDirectSound_SetPositionA, 3936, 10, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetPosition +// * IDirectSound_SetPosition // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetPosition, 3936, 11, +OOVPA_XREF(IDirectSound_SetPosition, 3936, 11, XRefNoSaveIndex, XRefOne) - // IDirectSound8_SetPosition+0x2D : call [CDirectSound::SetPositionA] + // IDirectSound_SetPosition+0x2D : call [CDirectSound::SetPositionA] XREF_ENTRY( 0x2D, XREF_DSSETPOSITIONA ), // (Offset,Value)-Pair #1 - // IDirectSound8_SetPosition+0x06 : fld [ebp+0x14] + // IDirectSound_SetPosition+0x06 : fld [ebp+0x14] { 0x06, 0xD9 }, // (Offset,Value)-Pair #2 { 0x07, 0x45 }, // (Offset,Value)-Pair #3 { 0x08, 0x14 }, // (Offset,Value)-Pair #4 - // IDirectSound8_SetPosition+0x0C : sub esp, 0x0C + // IDirectSound_SetPosition+0x0C : sub esp, 0x0C { 0x0C, 0x83 }, // (Offset,Value)-Pair #5 { 0x0D, 0xEC }, // (Offset,Value)-Pair #6 { 0x0E, 0x0C }, // (Offset,Value)-Pair #7 - // IDirectSound8_SetPosition+0x1B : neg ecx + // IDirectSound_SetPosition+0x1B : neg ecx { 0x1B, 0xF7 }, // (Offset,Value)-Pair #8 { 0x1C, 0xD9 }, // (Offset,Value)-Pair #9 - // IDirectSound8_SetPosition+0x32 : retn 0x14 + // IDirectSound_SetPosition+0x32 : retn 0x14 { 0x32, 0xC2 }, // (Offset,Value)-Pair #10 { 0x33, 0x14 }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -3102,31 +3102,31 @@ OOVPA_XREF(DirectSound_CDirectSound_SetVelocityA, 3936, 10, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetVelocity +// * IDirectSound_SetVelocity // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetVelocity, 3936, 11, +OOVPA_XREF(IDirectSound_SetVelocity, 3936, 11, XRefNoSaveIndex, XRefOne) - // IDirectSound8_SetVelocity+0x2D : call [CDirectSound::SetVelocityA] + // IDirectSound_SetVelocity+0x2D : call [CDirectSound::SetVelocityA] XREF_ENTRY( 0x2D, XREF_DSSETVELOCITYA ), // (Offset,Value)-Pair #1 - // IDirectSound8_SetVelocity+0x06 : fld [ebp+0x14] + // IDirectSound_SetVelocity+0x06 : fld [ebp+0x14] { 0x06, 0xD9 }, // (Offset,Value)-Pair #2 { 0x07, 0x45 }, // (Offset,Value)-Pair #3 { 0x08, 0x14 }, // (Offset,Value)-Pair #4 - // IDirectSound8_SetVelocity+0x0C : sub esp, 0x0C + // IDirectSound_SetVelocity+0x0C : sub esp, 0x0C { 0x0C, 0x83 }, // (Offset,Value)-Pair #5 { 0x0D, 0xEC }, // (Offset,Value)-Pair #6 { 0x0E, 0x0C }, // (Offset,Value)-Pair #7 - // IDirectSound8_SetVelocity+0x1B : neg ecx + // IDirectSound_SetVelocity+0x1B : neg ecx { 0x1B, 0xF7 }, // (Offset,Value)-Pair #8 { 0x1C, 0xD9 }, // (Offset,Value)-Pair #9 - // IDirectSound8_SetVelocity+0x32 : retn 0x14 + // IDirectSound_SetVelocity+0x32 : retn 0x14 { 0x32, 0xC2 }, // (Offset,Value)-Pair #10 { 0x33, 0x14 }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -3218,26 +3218,26 @@ OOVPA_XREF(IDirectSound8_SetAllParameters, 3936, 12, OOVPA_END; // ****************************************************************** -// * IDirectSound8_DownloadEffectsImage +// * IDirectSound_DownloadEffectsImage // ****************************************************************** -OOVPA_NO_XREF(IDirectSound8_DownloadEffectsImage, 3936, 11) +OOVPA_NO_XREF(IDirectSound_DownloadEffectsImage, 3936, 11) - // IDirectSound8_DownloadEffectsImage+0x03 : push [ebp+0x18] + // IDirectSound_DownloadEffectsImage+0x03 : push [ebp+0x18] { 0x03, 0xFF }, // (Offset,Value)-Pair #1 { 0x04, 0x75 }, // (Offset,Value)-Pair #2 { 0x05, 0x18 }, // (Offset,Value)-Pair #3 - // IDirectSound8_DownloadEffectsImage+0x06 : mov eax, [ebp+0x08] + // IDirectSound_DownloadEffectsImage+0x06 : mov eax, [ebp+0x08] { 0x06, 0x8B }, // (Offset,Value)-Pair #4 { 0x07, 0x45 }, // (Offset,Value)-Pair #5 { 0x08, 0x08 }, // (Offset,Value)-Pair #6 - // IDirectSound8_DownloadEffectsImage+0x11 : add eax, 0xFFFFFFF8 + // IDirectSound_DownloadEffectsImage+0x11 : add eax, 0xFFFFFFF8 { 0x11, 0x83 }, // (Offset,Value)-Pair #7 { 0x12, 0xC0 }, // (Offset,Value)-Pair #8 { 0x13, 0xF8 }, // (Offset,Value)-Pair #9 - // IDirectSound8_DownloadEffectsImage+0x24 : retn 0x14 + // IDirectSound_DownloadEffectsImage+0x24 : retn 0x14 { 0x24, 0xC2 }, // (Offset,Value)-Pair #10 { 0x25, 0x14 }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -3563,28 +3563,28 @@ OOVPA_XREF(IDirectSoundBuffer_PlayEx, 3936, 8, OOVPA_END; // ****************************************************************** -// * IDirectSound8_AddRef +// * IDirectSound_AddRef // ****************************************************************** -OOVPA_NO_XREF(IDirectSound8_AddRef, 3936, 12) +OOVPA_NO_XREF(IDirectSound_AddRef, 3936, 12) - // IDirectSound8_AddRef+0x04 : lea ecx, [eax-8] + // IDirectSound_AddRef+0x04 : lea ecx, [eax-8] { 0x04, 0x8D }, // (Offset,Value)-Pair #1 { 0x05, 0x48 }, // (Offset,Value)-Pair #2 { 0x06, 0xF8 }, // (Offset,Value)-Pair #3 - // IDirectSound8_AddRef+0x07 : neg eax + // IDirectSound_AddRef+0x07 : neg eax { 0x07, 0xF7 }, // (Offset,Value)-Pair #4 { 0x08, 0xD8 }, // (Offset,Value)-Pair #5 - // IDirectSound8_AddRef+0x09 : sbb eax, eax + // IDirectSound_AddRef+0x09 : sbb eax, eax { 0x09, 0x1B }, // (Offset,Value)-Pair #6 { 0x0A, 0xC0 }, // (Offset,Value)-Pair #7 - // IDirectSound8_AddRef+0x0D : mov ecx, [eax] + // IDirectSound_AddRef+0x0D : mov ecx, [eax] { 0x0D, 0x8B }, // (Offset,Value)-Pair #8 { 0x0E, 0x08 }, // (Offset,Value)-Pair #9 - // IDirectSound8_AddRef+0x10 : call dword ptr [ecx+4] + // IDirectSound_AddRef+0x10 : call dword ptr [ecx+4] { 0x10, 0xFF }, // (Offset,Value)-Pair #10 { 0x11, 0x51 }, // (Offset,Value)-Pair #11 { 0x12, 0x04 }, // (Offset,Value)-Pair #12 @@ -4051,7 +4051,7 @@ OOVPATable DSound_3936[] = { REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 3936, XREF), REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_CreateBuffer, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_CreateBuffer, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetPitchB, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPitchA, 3936, XREF), @@ -4133,46 +4133,46 @@ OOVPATable DSound_3936[] = { // REGISTER_OOVPA(IDirectSoundStream_Unknown1, 3936, PATCH), REGISTER_OOVPA(IDirectSoundStream_SetHeadroomA, 3936, XREF), REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetOrientation, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettingsB, 3936, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettingsA, 3936, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorB, 3936, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactorB, 3936, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactorA, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroomB, 3936, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroomA, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetPositionB, 3936, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetPositionA, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_SetPosition, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetPosition, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocityB, 3936, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocityA, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_SetVelocity, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetVelocity, 3936, PATCH), REGISTER_OOVPA(CMcpxAPU_Set3dParameters, 3936, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParameters, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_SetAllParameters, 3936, ALIAS, IDirectSound_SetAllParameters), - REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetAllParameters, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMode, 3936, PATCH), // REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play, 4361, XREF), REGISTER_OOVPA(CMcpxAPU_Set3dDopplerFactor, 3936, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 3936, ALIAS, IDirectSound_SetDopplerFactor), + REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3936, PATCH), REGISTER_OOVPA(CSensaura3d_GetFullHRTFFilterPair, 3936, XREF), REGISTER_OOVPA(DirectSoundUseFullHRTF, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_GetCaps, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_GetCaps, 3936, ALIAS, IDirectSound_GetCaps), + REGISTER_OOVPA(IDirectSound_GetCaps, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetConeAngles, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 3936, PATCH), REGISTER_OOVPA(DirectSoundEnterCriticalSection, 3936, XREF), REGISTER_OOVPA(DirectSoundUseFullHRTF, 3936, ALIAS, DirectSoundUseFullHRTF2), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSoundGetSampleTime, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 3936, XREF), @@ -4186,7 +4186,7 @@ OOVPATable DSound_3936[] = { REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 3936, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 3936, XREF), - REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 3936, ALIAS, IDirectSound_SetI3DL2Listener), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 3936, XREF), REGISTER_OOVPA(IDirectSound_EnableHeadphones, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes, 3936, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index 5fdc69210..bfc688dc5 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -58,18 +58,18 @@ OOVPA_NO_XREF(DirectSoundCreate, 4134, 9) OOVPA_END; // ****************************************************************** -// * IDirectSound8_CreateSoundBuffer +// * IDirectSound_CreateSoundBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirectSound8_CreateSoundBuffer, 4134, 9) +OOVPA_NO_XREF(IDirectSound_CreateSoundBuffer, 4134, 9) - // IDirectSound8_CreateSoundBuffer+0x2A : push 0x24 + // IDirectSound_CreateSoundBuffer+0x2A : push 0x24 { 0x2A, 0x6A }, // (Offset,Value)-Pair #1 { 0x2B, 0x24 }, // (Offset,Value)-Pair #2 - // IDirectSound8_CreateSoundBuffer+0x3C : call [addr] + // IDirectSound_CreateSoundBuffer+0x3C : call [addr] { 0x3C, 0xE8 }, // (Offset,Value)-Pair #3 - // IDirectSound8_CreateSoundBuffer+0x4A : and esi, 0x7FF8FFF2 + // IDirectSound_CreateSoundBuffer+0x4A : and esi, 0x7FF8FFF2 { 0x4A, 0x81 }, // (Offset,Value)-Pair #4 { 0x4B, 0xE6 }, // (Offset,Value)-Pair #5 { 0x4C, 0xF2 }, // (Offset,Value)-Pair #6 @@ -389,10 +389,10 @@ OOVPA_END; OOVPATable DSound_4134[] = { REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4134, PATCH), + REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetHeadroom, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 4134, PATCH), @@ -401,9 +401,9 @@ OOVPATable DSound_4134[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4134, XREF), - REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 4134, ALIAS, IDirectSound_SetI3DL2Listener), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_GetEffectData, 4134, XREF), - REGISTER_OOVPA(IDirectSound8_GetEffectData, 4134, ALIAS, IDirectSound_GetEffectData), + REGISTER_OOVPA(IDirectSound_GetEffectData, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3936, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index f9a50e320..ffa427ed2 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -92,18 +92,18 @@ OOVPA_NO_XREF(DirectSoundGetSampleTime, 4361, 8) OOVPA_END; // ****************************************************************** -// * IDirectSound8_CreateSoundBuffer +// * IDirectSound_CreateSoundBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirectSound8_CreateSoundBuffer, 4361, 9) +OOVPA_NO_XREF(IDirectSound_CreateSoundBuffer, 4361, 9) - // IDirectSound8_CreateSoundBuffer+0x2A : push 0x24 + // IDirectSound_CreateSoundBuffer+0x2A : push 0x24 { 0x2A, 0x6A }, // (Offset,Value)-Pair #1 { 0x2B, 0x24 }, // (Offset,Value)-Pair #2 - // IDirectSound8_CreateSoundBuffer+0x3C : call [addr] + // IDirectSound_CreateSoundBuffer+0x3C : call [addr] { 0x3C, 0xE8 }, // (Offset,Value)-Pair #3 - // IDirectSound8_CreateSoundBuffer+0x4A : and esi, 0x7FF8FFF2 + // IDirectSound_CreateSoundBuffer+0x4A : and esi, 0x7FF8FFF2 { 0x4A, 0x81 }, // (Offset,Value)-Pair #4 { 0x4B, 0xE6 }, // (Offset,Value)-Pair #5 { 0x4C, 0xF2 }, // (Offset,Value)-Pair #6 @@ -1057,8 +1057,8 @@ OOVPATable DSound_4361[] = { REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), - REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4361, PATCH), + REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4361, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPlayRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4361, XREF), @@ -1088,7 +1088,7 @@ OOVPATable DSound_4361[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4361, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl index 10b996142..e28c5270a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl @@ -43,28 +43,28 @@ #define DirectSoundGetSampleTime_4432 DirectSoundGetSampleTime_4361 // ****************************************************************** -// * IDirectSound8_Release +// * IDirectSound_Release // ****************************************************************** -OOVPA_NO_XREF(IDirectSound8_Release, 4432, 12) +OOVPA_NO_XREF(IDirectSound_Release, 4432, 12) - // IDirectSound8_Release+0x04 : lea ecx, [eax-8] + // IDirectSound_Release+0x04 : lea ecx, [eax-8] { 0x04, 0x8D }, // (Offset,Value)-Pair #1 { 0x05, 0x48 }, // (Offset,Value)-Pair #2 { 0x06, 0xF8 }, // (Offset,Value)-Pair #3 - // IDirectSound8_Release+0x07 : neg eax + // IDirectSound_Release+0x07 : neg eax { 0x07, 0xF7 }, // (Offset,Value)-Pair #4 { 0x08, 0xD8 }, // (Offset,Value)-Pair #5 - // IDirectSound8_Release+0x09 : sbb eax, eax + // IDirectSound_Release+0x09 : sbb eax, eax { 0x09, 0x1B }, // (Offset,Value)-Pair #6 { 0x0A, 0xC0 }, // (Offset,Value)-Pair #7 - // IDirectSound8_Release+0x0D : mov ecx, [eax] + // IDirectSound_Release+0x0D : mov ecx, [eax] { 0x0D, 0x8B }, // (Offset,Value)-Pair #8 { 0x0E, 0x08 }, // (Offset,Value)-Pair #9 - // IDirectSound8_Release+0x10 : call dword ptr [ecx+8] + // IDirectSound_Release+0x10 : call dword ptr [ecx+8] { 0x10, 0xFF }, // (Offset,Value)-Pair #10 { 0x11, 0x51 }, // (Offset,Value)-Pair #11 { 0x12, 0x08 }, // (Offset,Value)-Pair #12 @@ -253,32 +253,32 @@ OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 4432, 11, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetI3DL2Listener +// * IDirectSound_SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetI3DL2Listener, 4432, 12, +OOVPA_XREF(IDirectSound_SetI3DL2Listener, 4432, 12, XRefNoSaveIndex, XRefOne) - // IDirectSound8_SetI3DL2Listener+0x19 : call [CDirectSound::SetI3DL2Listener] + // IDirectSound_SetI3DL2Listener+0x19 : call [CDirectSound::SetI3DL2Listener] XREF_ENTRY( 0x19, XREF_DSSETI3DL2LISTENER ), // (Offset,Value)-Pair #1 - // IDirectSound8_SetI3DL2Listener+0x04 : push [esp+0x0C] + // IDirectSound_SetI3DL2Listener+0x04 : push [esp+0x0C] { 0x04, 0xFF }, // (Offset,Value)-Pair #2 { 0x05, 0x74 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // IDirectSound8_SetI3DL2Listener+0x0E : add eax, 0xFFFFFFF8 + // IDirectSound_SetI3DL2Listener+0x0E : add eax, 0xFFFFFFF8 { 0x0E, 0x83 }, // (Offset,Value)-Pair #6 { 0x0F, 0xC0 }, // (Offset,Value)-Pair #7 { 0x10, 0xF8 }, // (Offset,Value)-Pair #8 - // IDirectSound8_SetI3DL2Listener+0x13 : sbb ecx, ecx + // IDirectSound_SetI3DL2Listener+0x13 : sbb ecx, ecx { 0x13, 0x1B }, // (Offset,Value)-Pair #9 { 0x14, 0xC9 }, // (Offset,Value)-Pair #10 - // IDirectSound8_SetI3DL2Listener+0x15 : and ecx, eax + // IDirectSound_SetI3DL2Listener+0x15 : and ecx, eax { 0x15, 0x23 }, // (Offset,Value)-Pair #11 { 0x16, 0xC8 }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -467,31 +467,31 @@ OOVPA_XREF(DirectSound_CDirectSound_SetDistanceFactorA, 4432, 11, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetDistanceFactor +// * IDirectSound_SetDistanceFactor // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetDistanceFactor, 4432, 11, +OOVPA_XREF(IDirectSound_SetDistanceFactor, 4432, 11, XRefNoSaveIndex, XRefOne) - // IDirectSound8_SetDistanceFactor+0x1D : call [CDirectSound::SetDistanceFactor] + // IDirectSound_SetDistanceFactor+0x1D : call [CDirectSound::SetDistanceFactor] XREF_ENTRY( 0x1D, XREF_SETDISTANCEFACTORA ), // (Offset,Value)-Pair #1 - // IDirectSound8_SetDistanceFactor+0x04 : fld [esp+0x0C] + // IDirectSound_SetDistanceFactor+0x04 : fld [esp+0x0C] { 0x04, 0xD9 }, // (Offset,Value)-Pair #2 { 0x05, 0x44 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // IDirectSound8_SetDistanceFactor+0x0C : push ecx + // IDirectSound_SetDistanceFactor+0x0C : push ecx { 0x0C, 0x51 }, // (Offset,Value)-Pair #6 - // IDirectSound8_SetDistanceFactor+0x12 : add eax, 0xFFFFFFF8 + // IDirectSound_SetDistanceFactor+0x12 : add eax, 0xFFFFFFF8 { 0x12, 0x83 }, // (Offset,Value)-Pair #7 { 0x13, 0xC0 }, // (Offset,Value)-Pair #8 { 0x14, 0xF8 }, // (Offset,Value)-Pair #9 - // IDirectSound8_SetDistanceFactor+0x21 : retn 0x0C + // IDirectSound_SetDistanceFactor+0x21 : retn 0x0C { 0x21, 0xC2 }, // (Offset,Value)-Pair #10 { 0x22, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -590,9 +590,9 @@ OOVPATable DSound_4432[] = { REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), - REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_Release, 4432, PATCH), - REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4361, PATCH), + REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_Release, 4432, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4361, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4361, PATCH), @@ -612,15 +612,15 @@ OOVPATable DSound_4432[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4432, XREF), - REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 4432, PATCH), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4432, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4432, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 4432, XREF), - REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), - REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4432, PATCH), + REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPlayRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 6c4e5d5e5..0ef460a3d 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -106,32 +106,32 @@ OOVPA_XREF(DirectSound_CDirectSound_SetMixBinHeadroom, 4627, 15, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetMixBinHeadroom +// * IDirectSound_SetMixBinHeadroom // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetMixBinHeadroom, 4627, 12, +OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 4627, 12, XRefNoSaveIndex, XRefOne) - // IDirectSound8_SetMixBinHeadroom+0x19 : call [CDirectSound::SetMixBinHeadroom] + // IDirectSound_SetMixBinHeadroom+0x19 : call [CDirectSound::SetMixBinHeadroom] XREF_ENTRY( 0x19, XREF_DSSETMIXBINHEADROOMA ), // (Offset,Value)-Pair #1 - // IDirectSound8_SetMixBinHeadroom+0x04 : push [esp+0x0C] + // IDirectSound_SetMixBinHeadroom+0x04 : push [esp+0x0C] { 0x04, 0xFF }, // (Offset,Value)-Pair #2 { 0x05, 0x74 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // IDirectSound8_SetMixBinHeadroom+0x0E : add eax, 0xFFFFFFF8 + // IDirectSound_SetMixBinHeadroom+0x0E : add eax, 0xFFFFFFF8 { 0x0E, 0x83 }, // (Offset,Value)-Pair #6 { 0x0F, 0xC0 }, // (Offset,Value)-Pair #7 { 0x10, 0xF8 }, // (Offset,Value)-Pair #8 - // IDirectSound8_SetMixBinHeadroom+0x13 : sbb ecx, ecx + // IDirectSound_SetMixBinHeadroom+0x13 : sbb ecx, ecx { 0x13, 0x1B }, // (Offset,Value)-Pair #9 { 0x14, 0xC9 }, // (Offset,Value)-Pair #10 - // IDirectSound8_SetMixBinHeadroom+0x15 : and ecx, eax + // IDirectSound_SetMixBinHeadroom+0x15 : and ecx, eax { 0x15, 0x23 }, // (Offset,Value)-Pair #11 { 0x16, 0xC8 }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -457,32 +457,32 @@ OOVPA_XREF(DirectSoundCreateBuffer, 4627, 12, OOVPA_END; // ****************************************************************** -// * IDirectSound8_CreateSoundBuffer +// * IDirectSound_CreateSoundBuffer // ****************************************************************** -OOVPA_XREF(IDirectSound8_CreateSoundBuffer, 4627, 12, +OOVPA_XREF(IDirectSound_CreateSoundBuffer, 4627, 12, XRefNoSaveIndex, XRefOne) - // IDirectSound8_CreateSoundBuffer+0x1D : call [CDirectSound::CreateSoundBuffer] + // IDirectSound_CreateSoundBuffer+0x1D : call [CDirectSound::CreateSoundBuffer] XREF_ENTRY( 0x1D, XREF_DSCREATESOUNDBUFFER ), // (Offset,Value)-Pair #1 - // IDirectSound8_CreateSoundBuffer+0x04 : mov eax, [esp+8] + // IDirectSound_CreateSoundBuffer+0x04 : mov eax, [esp+8] { 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_CreateSoundBuffer+0x12 : add eax, 0xFFFFFFF8 + // IDirectSound_CreateSoundBuffer+0x12 : add eax, 0xFFFFFFF8 { 0x12, 0x83 }, // (Offset,Value)-Pair #6 { 0x13, 0xC0 }, // (Offset,Value)-Pair #7 { 0x14, 0xF8 }, // (Offset,Value)-Pair #8 - // IDirectSound8_CreateSoundBuffer+0x17 : sbb ecx, ecx + // IDirectSound_CreateSoundBuffer+0x17 : sbb ecx, ecx { 0x17, 0x1B }, // (Offset,Value)-Pair #9 { 0x18, 0xC9 }, // (Offset,Value)-Pair #10 - // IDirectSound8_CreateSoundBuffer+0x21 : retn 0x10 + // IDirectSound_CreateSoundBuffer+0x21 : retn 0x10 { 0x21, 0xC2 }, // (Offset,Value)-Pair #11 { 0x22, 0x10 }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -975,31 +975,31 @@ OOVPA_XREF(DirectSound_CDirectSound_SetRolloffFactor, 4627, 11, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetRolloffFactor +// * IDirectSound_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetRolloffFactor, 4627, 11, +OOVPA_XREF(IDirectSound_SetRolloffFactor, 4627, 11, XRefNoSaveIndex, XRefOne) - // IDirectSound8_SetRolloffFactor+0x1D : call [CDirectSound::SetRolloffFactor] + // IDirectSound_SetRolloffFactor+0x1D : call [CDirectSound::SetRolloffFactor] XREF_ENTRY( 0x1D, XREF_SETROLLOFFFACTORA ), // (Offset,Value)-Pair #1 - // IDirectSound8_SetRolloffFactor+0x04 : fld [esp+0x0C] + // IDirectSound_SetRolloffFactor+0x04 : fld [esp+0x0C] { 0x04, 0xD9 }, // (Offset,Value)-Pair #2 { 0x05, 0x44 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // IDirectSound8_SetRolloffFactor+0x0C : push ecx + // IDirectSound_SetRolloffFactor+0x0C : push ecx { 0x0C, 0x51 }, // (Offset,Value)-Pair #6 - // IDirectSound8_SetRolloffFactor+0x12 : add eax, 0xFFFFFFF8 + // IDirectSound_SetRolloffFactor+0x12 : add eax, 0xFFFFFFF8 { 0x12, 0x83 }, // (Offset,Value)-Pair #7 { 0x13, 0xC0 }, // (Offset,Value)-Pair #8 { 0x14, 0xF8 }, // (Offset,Value)-Pair #9 - // IDirectSound8_SetRolloffFactor+0x21 : retn 0x0C + // IDirectSound_SetRolloffFactor+0x21 : retn 0x0C { 0x21, 0xC2 }, // (Offset,Value)-Pair #10 { 0x22, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -1067,31 +1067,31 @@ OOVPA_XREF(DirectSound_CDirectSound_SetDopplerFactor, 4627, 14, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetDopplerFactor +// * IDirectSound_SetDopplerFactor // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetDopplerFactor, 4627, 11, +OOVPA_XREF(IDirectSound_SetDopplerFactor, 4627, 11, XRefNoSaveIndex, XRefOne) - // IDirectSound8_SetDopplerFactor+0x1D : call [CDirectSound::SetDopplerFactor] + // IDirectSound_SetDopplerFactor+0x1D : call [CDirectSound::SetDopplerFactor] XREF_ENTRY( 0x1D, XREF_SETDOPPLERFACTOR), // (Offset,Value)-Pair #1 - // IDirectSound8_SetDopplerFactor+0x04 : fld [esp+0x0C] + // IDirectSound_SetDopplerFactor+0x04 : fld [esp+0x0C] { 0x04, 0xD9 }, // (Offset,Value)-Pair #2 { 0x05, 0x44 }, // (Offset,Value)-Pair #3 { 0x06, 0x24 }, // (Offset,Value)-Pair #4 { 0x07, 0x0C }, // (Offset,Value)-Pair #5 - // IDirectSound8_SetDopplerFactor+0x0C : push ecx + // IDirectSound_SetDopplerFactor+0x0C : push ecx { 0x0C, 0x51 }, // (Offset,Value)-Pair #6 - // IDirectSound8_SetDopplerFactor+0x12 : add eax, 0xFFFFFFF8 + // IDirectSound_SetDopplerFactor+0x12 : add eax, 0xFFFFFFF8 { 0x12, 0x83 }, // (Offset,Value)-Pair #7 { 0x13, 0xC0 }, // (Offset,Value)-Pair #8 { 0x14, 0xF8 }, // (Offset,Value)-Pair #9 - // IDirectSound8_SetDopplerFactor+0x21 : retn 0x0C + // IDirectSound_SetDopplerFactor+0x21 : retn 0x0C { 0x21, 0xC2 }, // (Offset,Value)-Pair #10 { 0x22, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -2967,18 +2967,18 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4361, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4432, XREF), - REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 4432, PATCH), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroomA, 4928, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 4928, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetVelocity, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetVelocity, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParametersA, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParametersA, 4721, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParametersA, 4831, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParameters, 4928, XREF), - REGISTER_OOVPA(IDirectSound8_SetAllParameters, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetAllParameters, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4432, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4432, XREF), @@ -2989,10 +2989,10 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetPositionA, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetPositionA, 4432, XREF), // TODO: Find a cure for laziness... - REGISTER_OOVPA(IDirectSound8_SetPosition, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetPosition, 3936, PATCH), REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH), - REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4627, PATCH), - REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4627, PATCH), @@ -3027,17 +3027,17 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(CMcpxBuffer_Play, 4928, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Play, 4361, PATCH), - REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetOrientation, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 4531, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), + REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 4531, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 4432, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 4432, XREF), @@ -3084,10 +3084,10 @@ OOVPATable DSound_4627[] = { // REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 4627, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_GetOutputLevels, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_GetOutputLevels, 4627, ALIAS, IDirectSound_GetOutputLevels), + REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetAllParameters, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetAllParameters, 4627, ALIAS, IDirectSoundBuffer_SetAllParameters), // Use that for now. Okay, it's your call pal... + REGISTER_OOVPA(IDirectSound_SetAllParameters, 4627, ALIAS, IDirectSoundBuffer_SetAllParameters), // Use that for now. Okay, it's your call pal... REGISTER_OOVPA(DirectSound_CMcpxBuffer_Pause, 4928, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Pause, 4928, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index 475d54e67..34f0e3e63 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -196,23 +196,23 @@ OOVPA_END; // ****************************************************************** // * IDirectSound8::SynchPlayback // ****************************************************************** -OOVPA_XREF(IDirectSound8_SynchPlayback, 5233, 8, +OOVPA_XREF(IDirectSound_SynchPlayback, 5233, 8, XRefNoSaveIndex, XRefOne) XREF_ENTRY( 0x11, XREF_DSSYNCHPLAYBACKA ), // (Offset,Value)-Pair #1 - // IDirectSound8_SynchPlayback+0x06 : add eax, 0xFFFFFFF8 + // IDirectSound_SynchPlayback+0x06 : add eax, 0xFFFFFFF8 { 0x06, 0x83 }, // (Offset,Value)-Pair #2 { 0x07, 0xC0 }, // (Offset,Value)-Pair #3 { 0x08, 0xF8 }, // (Offset,Value)-Pair #4 - // IDirectSound8_SynchPlayback+0x0B : sbb ecx, ecx + // IDirectSound_SynchPlayback+0x0B : sbb ecx, ecx { 0x0B, 0x1B }, // (Offset,Value)-Pair #5 { 0x0C, 0xC9 }, // (Offset,Value)-Pair #6 - // IDirectSound8_SynchPlayback+0x15 : retn 0x04 + // IDirectSound_SynchPlayback+0x15 : retn 0x04 { 0x15, 0xC2 }, // (Offset,Value)-Pair #7 { 0x16, 0x04 }, // (Offset,Value)-Pair #8 OOVPA_END; @@ -866,22 +866,22 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 4627, XREF), REGISTER_OOVPA(CMcpxAPU_SynchPlayback, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5233, XREF), - REGISTER_OOVPA(IDirectSound8_SynchPlayback, 5233, PATCH), + REGISTER_OOVPA(IDirectSound_SynchPlayback, 5233, PATCH), REGISTER_OOVPA(CMcpxStream_Pause, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4432, XREF), - REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 4432, PATCH), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetVelocity, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetVelocity, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4432, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4432, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5233, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetPositionA, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetPosition, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetPosition, 3936, PATCH), REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH), - REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4627, PATCH), @@ -895,7 +895,7 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), - REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4361, PATCH), @@ -910,18 +910,18 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5233, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 5233, XREF), REGISTER_OOVPA(IDirectSound8_EnableHeadphones, 5233, PATCH), - REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetOrientation, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactor, 5344, XREF), - REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 5344, ALIAS, IDirectSound_SetDistanceFactor), + REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 5344, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), + REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5344, XREF), - REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 5344, ALIAS, IDirectSound_SetDopplerFactor), + REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 5344, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 4627, XREF), - REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5344, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5344, XREF), @@ -957,11 +957,11 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 5233, PATCH), - REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5344, XREF), - REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 5344, ALIAS, IDirectSound_SetI3DL2Listener), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 5344, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5344, XREF), - REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 5344, ALIAS, IDirectSound_SetRolloffFactor), + REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 5344, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4361, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index 30764c5c6..8c536a105 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -221,9 +221,9 @@ OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 5558, 8, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetI3DL2Listener +// * IDirectSound_SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetI3DL2Listener, 5558, 9, +OOVPA_XREF(IDirectSound_SetI3DL2Listener, 5558, 9, XRefNoSaveIndex, XRefOne) @@ -2021,16 +2021,16 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 4627, PATCH), - REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), + REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_FlushEx, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5233, PATCH), - REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFrequency, 5558, PATCH), @@ -2038,9 +2038,9 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), - REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetOrientation, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 5558, PATCH), @@ -2056,9 +2056,9 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5558, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4627, PATCH), // REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 4627, XREF), - // REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 5558, PATCH), + // REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 5558, PATCH), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 5558, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), REGISTER_OOVPA(DirectSound_CFullHRTFSource_GetCenterVolume, 5558, XREF), REGISTER_OOVPA(DirectSound_CHRTFSource_SetFullHRTF5Channel, 5558, XREF), @@ -2106,7 +2106,7 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSound_CDirectSoundVoice_CommitDeferredSettings, 5558, XREF), // REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5558, XREF), // REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 5558, XREF), - // REGISTER_OOVPA(IDirectSound8_SetAllParameters, 5558, ALIAS, IDirectSoundBuffer8_SetAllParameters), // Use that for now + // REGISTER_OOVPA(IDirectSound_SetAllParameters, 5558, ALIAS, IDirectSoundBuffer8_SetAllParameters), // Use that for now REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPosition, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPosition, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 5558, PATCH), @@ -2134,16 +2134,16 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 5558, ALIAS, IDirectSound_SetMixBinHeadroom), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 5558, XREF), REGISTER_OOVPA(IDirectSound8_EnableHeadphones, 5558, ALIAS, IDirectSound_EnableHeadphones), REGISTER_OOVPA(DirectSound_CDirectSound_GetOutputLevels, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_GetOutputLevels, 5558, ALIAS, IDirectSound_GetOutputLevels), + REGISTER_OOVPA(IDirectSound_GetOutputLevels, 5558, PATCH), REGISTER_OOVPA(XAudioDownloadEffectsImage, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_SetPosition, 5558, ALIAS, IDirectSound_SetPosition), + REGISTER_OOVPA(IDirectSound_SetPosition, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_SetVelocity, 5558, ALIAS, IDirectSound_SetVelocity), + REGISTER_OOVPA(IDirectSound_SetVelocity, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 5558, XREF), REGISTER_OOVPA(IDirectSound_CreateSoundStream, 5558, PATCH), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetEG, 5558, XREF), @@ -2151,9 +2151,9 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetEG, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetEG, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 5558, PATCH), - REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_SetAllParameters, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetAllParameters, 3936, PATCH), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetFilter, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFilter, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFilter, 4627, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index d103051c1..1867244f2 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -79,9 +79,9 @@ OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 5788, 8, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetI3DL2Listener +// * IDirectSound_SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetI3DL2Listener, 5788, 9, +OOVPA_XREF(IDirectSound_SetI3DL2Listener, 5788, 9, XRefNoSaveIndex, XRefOne) @@ -1625,7 +1625,7 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5788, XREF), - REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 5788, PATCH), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5788, PATCH), @@ -1641,14 +1641,14 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetRolloffCurve, 5558, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 5233, PATCH), - REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4627, PATCH), - REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetOrientation, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 5788, PATCH), @@ -1678,11 +1678,11 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5788, XREF), - REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 5788, ALIAS, IDirectSound_SetMixBinHeadroom), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetPosition, 5788, XREF), - REGISTER_OOVPA(IDirectSound8_SetPosition, 5788, ALIAS, IDirectSound_SetPosition), + REGISTER_OOVPA(IDirectSound_SetPosition, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5788, XREF), - REGISTER_OOVPA(IDirectSound8_SetVelocity, 5788, ALIAS, IDirectSound_SetVelocity), + REGISTER_OOVPA(IDirectSound_SetVelocity, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDistanceFactor, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 5558, PATCH), @@ -1705,11 +1705,11 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5788, ALIAS, DirectSound_CDirectSoundBuffer_StopEx), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), + REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5788, XREF), - REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5788, XREF), - REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPitch, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPitch, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 5788, PATCH), @@ -1751,8 +1751,8 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_GetOutputLevels, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_GetOutputLevels, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_GetOutputLevels, 5558, ALIAS, IDirectSound_GetOutputLevels), - REGISTER_OOVPA(IDirectSound8_SetEffectData, 5788, ALIAS, IDirectSound_SetEffectData), + REGISTER_OOVPA(IDirectSound_GetOutputLevels, 5558, PATCH), + REGISTER_OOVPA(IDirectSound_SetEffectData, 5788, PATCH), REGISTER_OOVPA(DirectSound_CMemoryManager_PoolAlloc, 5788, XREF), REGISTER_OOVPA(XFileCreateMediaObjectAsync, 5788, PATCH), REGISTER_OOVPA(WaveFormat_CreateXboxAdpcmFormat, 5558, XREF), @@ -1770,9 +1770,9 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetEG, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetEG, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4627, PATCH), - REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParameters, 5788, XREF), - REGISTER_OOVPA(IDirectSound8_SetAllParameters, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetAllParameters, 3936, PATCH), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetFilter, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFilter, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFilter, 4627, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl index 89a887422..93706cf77 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl @@ -79,9 +79,9 @@ OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 5849, 8, OOVPA_END; // ****************************************************************** -// * IDirectSound8_SetI3DL2Listener +// * IDirectSound_SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(IDirectSound8_SetI3DL2Listener, 5849, 9, +OOVPA_XREF(IDirectSound_SetI3DL2Listener, 5849, 9, XRefNoSaveIndex, XRefOne) @@ -1710,7 +1710,7 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5849, XREF), - REGISTER_OOVPA(IDirectSound8_SetI3DL2Listener, 5849, PATCH), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5849, PATCH), @@ -1719,15 +1719,15 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5849, ALIAS, DirectSound_CDirectSoundStream_SetMixBinVolumes), - REGISTER_OOVPA(IDirectSound8_CreateSoundBuffer, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4627, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4627, PATCH), - REGISTER_OOVPA(IDirectSound8_Release, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_DownloadEffectsImage, 3936, PATCH), - REGISTER_OOVPA(IDirectSound8_SetOrientation, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetOrientation, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 5849, PATCH), @@ -1748,11 +1748,11 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5849, XREF), - REGISTER_OOVPA(IDirectSound8_SetMixBinHeadroom, 5849, ALIAS, IDirectSound_SetMixBinHeadroom), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetPosition, 5849, XREF), - REGISTER_OOVPA(IDirectSound8_SetPosition, 5849, ALIAS, IDirectSound_SetPosition), + REGISTER_OOVPA(IDirectSound_SetPosition, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5849, XREF), - REGISTER_OOVPA(IDirectSound8_SetVelocity, 5849, ALIAS, IDirectSound_SetVelocity), + REGISTER_OOVPA(IDirectSound_SetVelocity, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 5849, PATCH), REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH), REGISTER_OOVPA(DirectSound_CMcpxBuffer_SetCurrentPosition, 5849, XREF), @@ -1766,10 +1766,10 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5849, ALIAS, DirectSound_CDirectSoundBuffer_StopEx), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5849, XREF), - REGISTER_OOVPA(IDirectSound8_SetRolloffFactor, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5344, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5849, XREF), - REGISTER_OOVPA(IDirectSound8_SetDopplerFactor, 4627, PATCH), + REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPitch, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPitch, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 5849, PATCH), @@ -1802,7 +1802,7 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSoundDoWork, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5558, PATCH), REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(IDirectSound8_SetEffectData, 5849, ALIAS, IDirectSound_SetEffectData), + REGISTER_OOVPA(IDirectSound_SetEffectData, 5849, PATCH), REGISTER_OOVPA(DirectSound_CMemoryManager_PoolAlloc, 5849, XREF), REGISTER_OOVPA(XFileCreateMediaObjectAsync, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 5558, PATCH), @@ -1811,11 +1811,11 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play2, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Play, 5849, PATCH), - REGISTER_OOVPA(IDirectSound8_AddRef, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 5558, XREF), - REGISTER_OOVPA(IDirectSound8_SetDistanceFactor, 4432, PATCH), + REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4432, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetAllParameters, 5849, XREF), - REGISTER_OOVPA(IDirectSound8_SetAllParameters, 3936, PATCH), + REGISTER_OOVPA(IDirectSound_SetAllParameters, 3936, PATCH), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetFilter, 5849, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFilter, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFilter, 4627, XREF), From f4533112f6bcd6ae12260f26dcc6912526f644b4 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Fri, 17 Feb 2017 16:32:40 +0900 Subject: [PATCH 6/7] Renamed EmuIDirectSound_EnableHeadphones to IDirectSound_EnableHeadphones (Only on 4627) --- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 0ef460a3d..de823acf7 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -1908,9 +1908,9 @@ OOVPA_XREF(DirectSound_CDirectSound_EnableHeadphones, 4627, 15, OOVPA_END; // ****************************************************************** -// * EmuIDirectSound_EnableHeadphones +// * IDirectSound_EnableHeadphones // ****************************************************************** -OOVPA_XREF(EmuIDirectSound_EnableHeadphones, 4627, 9, +OOVPA_XREF(IDirectSound_EnableHeadphones, 4627, 9, XRefNoSaveIndex, XRefOne) @@ -3079,7 +3079,7 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 4627, XREF), - REGISTER_OOVPA(IDirectSound_EnableHeadphones, 4627, ALIAS, EmuIDirectSound_EnableHeadphones), + REGISTER_OOVPA(IDirectSound_EnableHeadphones, 4627, PATCH), // REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 4627, XREF), // REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 4627, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), From 55361e33306325aaef1ace44eaf9f5eb5f1405e2 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Fri, 17 Feb 2017 16:57:54 +0900 Subject: [PATCH 7/7] Added XREF_ENTRY Following commit 16d27cb --- src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index ffa427ed2..42beaaf4c 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -359,7 +359,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetVolume, 4361, 8, XRefNoSaveIndex, XRefOne) - { 0x15, XREF_DirectSound_CDirectSoundBuffer_SetVolume }, + XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_SetVolume ), { 0x02, 0x24 }, { 0x06, 0x24 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index de823acf7..862d367e5 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -2599,7 +2599,7 @@ OOVPA_XREF(DirectSound_CDirectSoundStream_SetHeadroom, 4627, 8, XRefNoSaveIndex, XRefOne) - { 0x36, /*XREF_DirectSound_CDirectSoundVoice_SetHeadroom*/ XREF_DSBUFFERSETHEADROOMA }, + XREF_ENTRY( 0x36, /*XREF_DirectSound_CDirectSoundVoice_SetHeadroom*/ XREF_DSBUFFERSETHEADROOMA ), { 0x0C, 0x00 }, { 0x14, 0x74 },