diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h index 4bfd6d0b5..ef11e0722 100644 --- a/src/CxbxKrnl/HLEDataBase.h +++ b/src/CxbxKrnl/HLEDataBase.h @@ -203,23 +203,26 @@ enum XRefDataBaseOffset XREF_DSound_CRefCount_Release, XREF_CDirectSoundVoice_SetRolloffCurve, XREF_CDirectSoundVoice_SetRolloffFactor, + XREF_CDirectSoundBuffer_SetRolloffFactor, + XREF_CDirectSoundStream_SetRolloffFactor, XREF_CDirectSoundVoice_SetDistanceFactor, + XREF_CDirectSoundBuffer_SetDistanceFactor, + XREF_CDirectSoundStream_SetDistanceFactor, XREF_CDirectSoundVoice_SetConeAngles, - XREF_CDirectSoundVoice_SetDopplerFactor, + XREF_CDirectSoundVoice_SetDopplerFactor, + XREF_CDirectSoundBuffer_SetDopplerFactor, + XREF_CDirectSoundStream_SetDopplerFactor, XREF_CMcpxVoiceClient_Set3dMode, XREF_CDirectSoundVoice_SetMode, XREF_CDirectSoundBuffer_SetMode, XREF_CDirectSoundBuffer_SetMaxDistance, XREF_CDirectSoundBuffer_SetMinDistance, XREF_CDirectSoundBuffer_SetRolloffCurve, - XREF_CDirectSoundBuffer_SetRolloffFactor, - XREF_CDirectSoundBuffer_SetDistanceFactor, XREF_CDirectSoundBuffer_SetConeAngles, XREF_CDirectSoundBuffer_SetConeOrientation, XREF_CDirectSoundBuffer_SetConeOutsideVolume, XREF_CDirectSoundBuffer_SetPosition, XREF_CDirectSoundBuffer_SetVelocity, - XREF_CDirectSoundBuffer_SetDopplerFactor, XREF_CDirectSoundBuffer_SetI3DL2Source, XREF_CDirectSoundVoice_SetFormat, XREF_CDirectSoundBuffer_SetFormat, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl index f8b825b61..be1613967 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl @@ -3695,10 +3695,14 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_Lock // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Lock, 3911, 10, +OOVPA_XREF(CDirectSoundBuffer_Lock, 3911, 1+11, XREF_CDirectSoundBuffer_Lock, - XRefZero) + XRefOne) + + XREF_ENTRY( 0x23, XREF_CDirectSoundBuffer_GetCurrentPosition ), + + { 0x00, 0x55 }, // CDirectSoundBuffer_Lock+0x37 : mov eax, [eax+0x4C] { 0x37, 0x8B }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl index 61509cdcd..37ddf60ec 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl @@ -922,10 +922,12 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_Lock // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Lock, 4039, 13, +OOVPA_XREF(CDirectSoundBuffer_Lock, 4039, 1+13, XREF_CDirectSoundBuffer_Lock, - XRefZero) + XRefOne) + + XREF_ENTRY( 0x45, XREF_CDirectSoundBuffer_GetCurrentPosition ), // CDirectSoundBuffer_Lock+0x34 : test [ebp+0x24], 1 { 0x34, 0xF6 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index 78c1d0b2b..d1661142e 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -668,10 +668,15 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_Lock // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Lock, 4134, 13, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundBuffer_Lock, 4134, 1+12, XREF_CDirectSoundBuffer_Lock, - XRefZero) + XRefOne) + + XREF_ENTRY( 0x48, XREF_CDirectSoundBuffer_GetCurrentPosition ), + + { 0x00, 0x55 }, // CDirectSoundBuffer_Lock+0x37 : test [ebp+0x24], 1 { 0x37, 0xF6 }, @@ -679,18 +684,18 @@ OOVPA_XREF(CDirectSoundBuffer_Lock, 4134, 13, { 0x39, 0x24 }, { 0x3A, 0x01 }, - // CDirectSoundBuffer_Lock+0x5C : mov eax, [eax+0xBC] - { 0x5C, 0x8B }, - { 0x5D, 0x80 }, - { 0x5E, 0xBC }, - { 0x5F, 0x00 }, + // CDirectSoundBuffer_Lock+0x5C : test byte ptr [ebp+24h],2 + { 0x53, 0xF6 }, + { 0x54, 0x45 }, + { 0x55, 0x24 }, + { 0x56, 0x02 }, - // CDirectSoundBuffer_Lock+0xA4 : jnb +0x11; mov esi, [esi+0x1C] - { 0xA2, 0x73 }, - { 0xA3, 0x11 }, - { 0xA4, 0x8B }, - { 0xA5, 0x76 }, - { 0xA6, 0x1C }, + // CDirectSoundBuffer_Lock+0x81 : sub ecx,dword ptr [ebp+0Ch] + { 0x81, 0x2B }, + { 0x82, 0x4D }, + { 0x83, 0x0C }, + + // Major changes occur at 0x84 and later OOVPA_END; // ****************************************************************** @@ -927,29 +932,47 @@ OOVPA_END; // ****************************************************************** // * CMcpxBuffer_GetCurrentPosition // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_GetCurrentPosition, 4134, 11, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CMcpxBuffer_GetCurrentPosition, 4134, 14, - XREF_CMcpxBuffer_GetCurrentPosition, + XREF_CMcpxBuffer_GetCurrentPosition, XRefZero) + // CMcpxBuffer_GetCurrentPosition+0x00 : push ebp + { 0x00, 0x55 }, + // CMcpxBuffer_GetCurrentPosition+0x0E : lea ecx, [ebp-0x08] { 0x0E, 0x8D }, { 0x0F, 0x4D }, { 0x10, 0xF8 }, + { 0x25, 0xE8 }, + // CMcpxBuffer_GetCurrentPosition+0x31 : jz +0x02 { 0x31, 0x74 }, { 0x32, 0x02 }, + { 0x44, 0xE8 }, + + // CMcpxBuffer_GetCurrentPosition+0x5C : test word ptr [esi+12h],200h + { 0x5C, 0x66 }, + { 0x5D, 0xF7 }, + { 0x5E, 0x46 }, + { 0x5F, 0x12 }, + { 0x60, 0x00 }, + { 0x61, 0x02 }, + + // Offset 0x62 and later has changes. + // CMcpxBuffer_GetCurrentPosition+0xA0 : div dword ptr [ecx+0xBC] - { 0xA0, 0xF7 }, - { 0xA1, 0xB1 }, - { 0xA2, 0xBC }, + //{ 0xA0, 0xF7 }, + //{ 0xA1, 0xB1 }, + //{ 0xA2, 0xBC }, // CMcpxBuffer_GetCurrentPosition+0xD6 : retn 0x08 - { 0xD6, 0xC2 }, - { 0xD7, 0x08 }, - { 0xD8, 0x00 }, + //{ 0xD6, 0xC2 }, + //{ 0xD7, 0x08 }, + //{ 0xD8, 0x00 }, OOVPA_END; // ****************************************************************** @@ -1005,7 +1028,7 @@ OOVPA_END; #endif // ****************************************************************** -// * CDirectSound::SetDistanceFactorA +// * CDirectSound::SetDistanceFactor // ****************************************************************** OOVPA_XREF(CDirectSound_SetDistanceFactor, 4134, 17, @@ -1537,9 +1560,10 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetRolloffFactor // ****************************************************************** +// Generic OOVPA as of 4134 and newer OOVPA_XREF(CDirectSoundStream_SetRolloffFactor, 4134, 1+8, - XRefNoSaveIndex, + XREF_CDirectSoundStream_SetRolloffFactor, XRefOne) XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetRolloffFactor ), @@ -2912,23 +2936,30 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetEffectData // ****************************************************************** -OOVPA_XREF(CDirectSound_SetEffectData, 4134, 13, // Also for 5849 +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSound_SetEffectData, 4134, 14, // Also for 5849 XREF_CDirectSound_SetEffectData, XRefZero) { 0x00, 0x55 }, { 0x0F, 0x00 }, + { 0x24, 0xB8 }, { 0x25, 0x05 }, { 0x26, 0x40 }, { 0x27, 0x00 }, { 0x28, 0x80 }, + { 0x29, 0xEB }, { 0x2A, 0x32 }, + { 0x2B, 0x8B }, { 0x2C, 0x45 }, + { 0x44, 0xE8 }, + + { 0x5F, 0xC2 }, { 0x60, 0x18 }, OOVPA_END; #if 0 // Replaced with generic OOVPA 3911 @@ -3919,3 +3950,220 @@ OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 1+10, { 0x4E, 0xC2 }, { 0x4F, 0x10 }, OOVPA_END; + +// ****************************************************************** +// * CDirectSound_GetEffectData +// ****************************************************************** +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSound_GetEffectData, 4134, 14, + + XREF_CDirectSound_GetEffectData, + XRefZero) + + { 0x00, 0x55 }, + { 0x0F, 0x00 }, + + { 0x24, 0xB8 }, + { 0x25, 0x05 }, + { 0x26, 0x40 }, + { 0x27, 0x00 }, + { 0x28, 0x80 }, + + { 0x29, 0xEB }, + { 0x2A, 0x2F }, + + { 0x2B, 0x8B }, + { 0x2C, 0x45 }, + + { 0x41, 0xE8 }, + + { 0x5C, 0xC2 }, + { 0x5D, 0x14 }, +OOVPA_END; + +// ****************************************************************** +// * CDirectSound_CommitEffectData +// ****************************************************************** +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSound_CommitEffectData, 4134, 16, + + XREF_CDirectSound_CommitEffectData, + XRefZero) + + { 0x00, 0x56 }, + { 0x0C, 0x00 }, + + { 0x21, 0xB8 }, + { 0x22, 0x05 }, + { 0x23, 0x40 }, + { 0x24, 0x00 }, + { 0x25, 0x80 }, + + { 0x26, 0xEB }, + { 0x27, 0x24 }, + + { 0x28, 0x8B }, + { 0x29, 0x44 }, + + { 0x32, 0x6A }, + { 0x34, 0x6A }, + + { 0x36, 0xE8 }, + + { 0x4D, 0xC2 }, + { 0x4E, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundStream_SetDistanceFactor +// ****************************************************************** +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundStream_SetDistanceFactor, 4134, 1+8, + + XREF_CDirectSoundStream_SetDistanceFactor, + XRefOne) + + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetDistanceFactor ), + + { 0x00, 0x56 }, + { 0x0C, 0x00 }, + { 0x14, 0x74 }, + { 0x21, 0xB8 }, + { 0x2A, 0x24 }, + { 0x3D, 0xE8 }, + { 0x48, 0x68 }, + { 0x53, 0x8B }, +OOVPA_END; + +// ****************************************************************** +// * IDirectSoundStream_SetDistanceFactor +// ****************************************************************** +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(IDirectSoundStream_SetDistanceFactor, 4134, 1+8, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x11, XREF_CDirectSoundStream_SetDistanceFactor), + + { 0x00, 0xFF }, + { 0x02, 0x24 }, + { 0x06, 0x24 }, + { 0x09, 0xD9 }, + { 0x0C, 0xFF }, + { 0x0E, 0x24 }, + { 0x15, 0xC2 }, + { 0x16, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * IDirectSoundStream_SetRolloffFactor +// ****************************************************************** +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(IDirectSoundStream_SetRolloffFactor, 4134, 1+8, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x11, XREF_CDirectSoundStream_SetRolloffFactor), + + { 0x00, 0xFF }, + { 0x02, 0x24 }, + { 0x06, 0x24 }, + { 0x09, 0xD9 }, + { 0x0C, 0xFF }, + { 0x0E, 0x24 }, + { 0x15, 0xC2 }, + { 0x16, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundStream_SetDopplerFactor +// ****************************************************************** +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundStream_SetDopplerFactor, 4134, 1+8, + + XREF_CDirectSoundStream_SetDopplerFactor, + XRefOne) + + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetDopplerFactor), + + { 0x00, 0x56 }, + { 0x0C, 0x00 }, + { 0x14, 0x74 }, + { 0x21, 0xB8 }, + { 0x2A, 0x24 }, + { 0x3D, 0xE8 }, + { 0x48, 0x68 }, + { 0x53, 0x8B }, +OOVPA_END; + +// ****************************************************************** +// * IDirectSoundStream_SetDopplerFactor +// ****************************************************************** +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(IDirectSoundStream_SetDopplerFactor, 4134, 1+8, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x11, XREF_CDirectSoundStream_SetDopplerFactor), + + { 0x00, 0xFF }, + { 0x02, 0x24 }, + { 0x06, 0x24 }, + { 0x09, 0xD9 }, + { 0x0C, 0xFF }, + { 0x0E, 0x24 }, + { 0x15, 0xC2 }, + { 0x16, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundStream_SetMixBinVolumes_8 +// ****************************************************************** +OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_8, 4134, 1+11, + + XREF_CDirectSoundStream_SetMixBinVolumes_8, + XRefOne) + + XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetMixBinVolumes ), + + { 0x00, 0x56 }, + + { 0x0C, 0x00 }, + { 0x0E, 0xB6 }, + { 0x0F, 0xF0 }, + { 0x21, 0xB8 }, + { 0x22, 0x05 }, + { 0x23, 0x40 }, + { 0x24, 0x00 }, + { 0x25, 0x80 }, + { 0x4F, 0xC2 }, + { 0x50, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundBuffer::SetPlayRegion +// ****************************************************************** +OOVPA_XREF(CDirectSoundBuffer_SetPlayRegion, 4134, 10, + + XREF_CDirectSoundBuffer_SetPlayRegion, + XRefZero) + + // CDirectSoundBuffer_SetPlayRegion+0x10 : movzx edi, al + { 0x10, 0x0F }, + { 0x11, 0xB6 }, + { 0x12, 0xF8 }, + + // CDirectSoundBuffer_SetPlayRegion+0x17 : jz +0x0B + { 0x17, 0x74 }, + { 0x18, 0x0B }, + + // CDirectSoundBuffer_SetPlayRegion+0x46 : mov esi, 0x88780032 + { 0x46, 0xBE }, + { 0x47, 0x32 }, + { 0x48, 0x00 }, + { 0x49, 0x78 }, + { 0x4A, 0x88 }, +OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index ec66287ec..6c300424a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -135,31 +135,6 @@ OOVPA_XREF(CDirectSoundStream_Pause, 4361, 1+10, OOVPA_END; #endif -// ****************************************************************** -// * CDirectSoundBuffer::SetPlayRegion -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPlayRegion, 4361, 10, - - XREF_CDirectSoundBuffer_SetPlayRegion, - XRefZero) - - // CDirectSoundBuffer_SetPlayRegion+0x10 : movzx edi, al - { 0x10, 0x0F }, - { 0x11, 0xB6 }, - { 0x12, 0xF8 }, - - // CDirectSoundBuffer_SetPlayRegion+0x17 : jz +0x0B - { 0x17, 0x74 }, - { 0x18, 0x0B }, - - // CDirectSoundBuffer_SetPlayRegion+0x46 : mov esi, 0x88780032 - { 0x46, 0xBE }, - { 0x47, 0x32 }, - { 0x48, 0x00 }, - { 0x49, 0x78 }, - { 0x4A, 0x88 }, -OOVPA_END; - #if 0 // Replaced with generic OOVPA 4039 // ****************************************************************** // * IDirectSoundBuffer_SetPlayRegion @@ -479,6 +454,30 @@ OOVPA_XREF(CMcpxBuffer_Play2, 4361, 8, { 0x36, 0xC2 }, OOVPA_END; +#if 0 // For research purpose, need to strengthen it up. +// ****************************************************************** +// * public: long __thiscall DirectSound::CMcpxBuffer::Play(__int64,unsigned long) +// ****************************************************************** +OOVPA_XREF(CMcpxBuffer_Play2, 5558, 12, + + XREF_CMcpxBuffer_Play2, + XRefZero) + + { 0x00, 0x55 }, + { 0x01, 0x8B }, + { 0x02, 0xEC }, + { 0x18, 0x0C }, + { 0x19, 0xFF }, + { 0x1A, 0x75 }, + { 0x1B, 0x08 }, + { 0x1C, 0x6A }, + { 0x1D, 0x03 }, + { 0x1E, 0xFF }, + { 0x1F, 0x50 }, + { 0x36, 0xC2 }, +OOVPA_END; +#endif + // ****************************************************************** // * CDirectSoundVoice::SetMaxDistance // ****************************************************************** @@ -563,34 +562,6 @@ OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 4361, 12, { 0x32, 0x00 } OOVPA_END; -// ****************************************************************** -// * CDirectSoundVoice::SetDistanceFactor -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 4361, 12, - - XREF_CDirectSoundVoice_SetDistanceFactor, - XRefZero) - - // CDirectSoundVoice_SetDistanceFactor+0x0D : mov edx, [esp+arg_4] - { 0x0D, 0x8B }, - { 0x0E, 0x54 }, - { 0x0F, 0x24 }, - { 0x10, 0x08 }, - - // CDirectSoundVoice_SetDistanceFactor+0x11 : mov [eax+40h], edx - { 0x11, 0x89 }, - { 0x12, 0x50 }, - { 0x13, 0x40 }, - - { 0x14, 0x8B }, - { 0x1D, 0x83 }, - { 0x1F, 0x78 }, - - // CDirectSoundVoice_SetDistanceFactor+0x30 : retn 0Ch - { 0x31, 0x0C }, - { 0x32, 0x00 }, -OOVPA_END; - // ****************************************************************** // * CDirectSoundVoice::SetConeOutsideVolume // ****************************************************************** @@ -619,34 +590,6 @@ OOVPA_XREF(CDirectSoundVoice_SetConeOutsideVolume, 4361, 12, { 0x32, 0x00 } OOVPA_END; -// ****************************************************************** -// * CDirectSoundVoice::SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 4361, 12, - - XREF_CDirectSoundVoice_SetDopplerFactor, - XRefZero) - - // CDirectSoundVoice_SetDopplerFactor+0x0D : mov edx, [esp+arg_4] - { 0x0D, 0x8B }, - { 0x0E, 0x54 }, - { 0x0F, 0x24 }, - { 0x10, 0x08 }, - - // CDirectSoundVoice_SetDopplerFactor+0x12 : mov [eax+48h], edx - { 0x11, 0x89 }, - { 0x12, 0x50 }, - { 0x13, 0x48 }, - - { 0x14, 0x8B }, - { 0x1D, 0x83 }, - { 0x1F, 0x78 }, - - // CDirectSoundVoice_SetDopplerFactor+0x31 : retn 0Ch - { 0x31, 0x0C }, - { 0x32, 0x00 } -OOVPA_END; - // ****************************************************************** // * CMcpxStream_Flush // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 4252a7a79..72b4a9155 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -283,15 +283,30 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_GetSpeakerConfig // ****************************************************************** -OOVPA_NO_XREF(CDirectSound_GetSpeakerConfig, 4627, 7) +OOVPA_XREF(CDirectSound_GetSpeakerConfig, 4627, 14, + + XREF_CDirectSound_GetSpeakerConfig, + XRefZero) + + { 0x00, 0xE8 }, { 0x0B, 0x00 }, { 0x14, 0x0B }, { 0x20, 0xB8 }, { 0x2A, 0x04 }, + { 0x35, 0x81 }, + //{ 0x36, 0xE1 }, (This value has changed, commented out to expand support for later revisions.) + { 0x37, 0xFF }, + { 0x38, 0xFF }, + { 0x39, 0xFF }, + { 0x3A, 0x7F }, + { 0x40, 0x0B }, { 0x4C, 0x33 }, + + { 0x4A, 0xC2 }, + { 0x4B, 0x08 }, OOVPA_END; // ****************************************************************** @@ -640,13 +655,15 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::Pause // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Pause, 4928, 1+7, +OOVPA_XREF(CDirectSoundBuffer_Pause, 4928, 1+10, XREF_CDirectSoundBuffer_Pause, XRefOne) XREF_ENTRY( 0x35, XREF_CMcpxBuffer_Pause ), + { 0x00, 0x56 }, + { 0x0C, 0x00 }, { 0x14, 0x74 }, { 0x21, 0xB8 }, @@ -654,6 +671,8 @@ OOVPA_XREF(CDirectSoundBuffer_Pause, 4928, 1+7, { 0x39, 0x85 }, { 0x44, 0xFF }, { 0x4B, 0xC7 }, + { 0x4E, 0xC2 }, + { 0x4F, 0x08 }, OOVPA_END; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl index a6cbdd708..bb1c86b67 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl @@ -51,42 +51,33 @@ OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 5344, 9, { 0x2F, 0xC0 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetMinDistance -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistance, 5344, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetMinDistance ), - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x24 }, - { 0x3A, 0x1C }, - { 0x46, 0x74 }, - { 0x53, 0x8B }, -OOVPA_END; - // ****************************************************************** // * CDirectSoundVoice::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5344, 9, +// Generic OOVPA as of 5344 and newer +OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5344, 12, XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) - { 0x05, 0x41 }, - { 0x0C, 0x00 }, + // CDirectSoundVoice_SetDistanceFactor+0x0D : mov edx, [esp+arg_4] + { 0x0D, 0x8B }, + { 0x0E, 0x54 }, + { 0x0F, 0x24 }, { 0x10, 0x08 }, + + // CDirectSoundVoice_SetDistanceFactor+0x11 : mov [eax+44h], edx { 0x11, 0x89 }, { 0x12, 0x50 }, { 0x13, 0x44 }, + { 0x14, 0x8B }, { 0x1D, 0x80 }, { 0x1F, 0x02 }, + + // CDirectSoundVoice_SetDistanceFactor+0x30 : retn 0Ch + { 0x31, 0x0C }, + { 0x32, 0x00 }, OOVPA_END; // ****************************************************************** @@ -709,6 +700,7 @@ OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 5344, 8, { 0x51, 0x00 } OOVPA_END; +#if 0 // Replaced with generic OOVPA 5344 // ****************************************************************** // * CMcpxStream_Flush // ****************************************************************** @@ -733,6 +725,36 @@ OOVPA_XREF(CMcpxStream_Flush, 5344, 11, { 0xDE, 0xC2 }, { 0xDF, 0x04 }, OOVPA_END; +#endif + +// ****************************************************************** +// * CMcpxStream_Flush +// ****************************************************************** +// Might not be ideal, however I had not see any changes from these +// Offsets. +OOVPA_XREF(CMcpxStream_Flush, 5344, 14, + XREF_CMcpxStream_Flush, + XRefZero) + + // CMcpxStream_Flush+0x00 : push ebp; mov ebp, esp; sub esp, 10h + { 0x00, 0x55 }, + { 0x01, 0x8B }, + { 0x02, 0xEC }, + { 0x03, 0x83 }, + { 0x04, 0xEC }, + { 0x05, 0x10 }, + + // Offset is unique for this asm code. + // CMcpxStream_Flush+0x0A : movzx eax,byte ptr fs:[24h] + { 0x0A, 0x64 }, + { 0x0B, 0x0F }, + { 0x0C, 0xB6 }, + { 0x0D, 0x05 }, + { 0x0E, 0x24 }, + { 0x0F, 0x00 }, + { 0x10, 0x00 }, + { 0x11, 0x00 }, +OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Flush @@ -1213,6 +1235,163 @@ OOVPA_XREF(DirectSoundUseLightHRTF4Channel, 5344, 1+7, { 0x1E, 0xC3 }, OOVPA_END; +// ****************************************************************** +// * DirectSound::CMcpxBuffer::Pause +// ****************************************************************** +// Generic OOVPA as of ____? and newer +OOVPA_XREF(CMcpxBuffer_Pause_Ex, 5344, 1+8, + + XREF_CMcpxBuffer_Pause_Ex, + XRefOne) + + XREF_ENTRY( 0x2B, XREF_CMcpxBuffer_Pause ), + + { 0x00, 0x55 }, + + { 0x0D, 0x8B }, + + { 0x1C, 0x6A }, + { 0x1D, 0x05 }, + + { 0x23, 0x75 }, + + { 0x2A, 0xE8 }, + + { 0x36, 0xC2 }, + { 0x37, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * DirectSound::CDirectSoundBuffer::PauseEx +// ****************************************************************** +// Generic OOVPA as of ____? and newer +OOVPA_XREF(CDirectSoundBuffer_PauseEx, 5344, 1+10, + + XREF_CDirectSoundBuffer_PauseEx, + XRefOne) + + XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Pause_Ex ), + + { 0x00, 0x56 }, + + { 0x0C, 0x00 }, + { 0x14, 0x74 }, + { 0x21, 0xB8 }, + { 0x2A, 0x24 }, + { 0x41, 0x85 }, + { 0x4C, 0xFF }, + { 0x53, 0xC7 }, + + { 0x56, 0xC2 }, + { 0x57, 0x10 }, +OOVPA_END; + +// ****************************************************************** +// * IDirectSoundBuffer_PauseEx +// ****************************************************************** +// Generic OOVPA as of ____? and newer +OOVPA_XREF(IDirectSoundBuffer_PauseEx, 5344, 1+7, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_PauseEx ), + + { 0x02, 0x24 }, + { 0x06, 0x24 }, + { 0x12, 0x83 }, + { 0x16, 0xD9 }, + { 0x1A, 0xC8 }, + { 0x21, 0xC2 }, + { 0x22, 0x10 }, +OOVPA_END; + +// ****************************************************************** +// * DirectSound::CMcpxStream::Pause2 +// ****************************************************************** +// Generic OOVPA as of ____? and newer +OOVPA_XREF(CMcpxStream_Pause_Ex, 5344, 1+8, + + XREF_CMcpxStream_Pause_Ex, + XRefOne) + + XREF_ENTRY( 0x2B, XREF_CMcpxStream_Pause ), + + { 0x00, 0x55 }, + + { 0x0D, 0x8B }, + + { 0x1C, 0x6A }, + { 0x1D, 0x05 }, + + { 0x23, 0x75 }, + + { 0x2A, 0xE8 }, + + { 0x36, 0xC2 }, + { 0x37, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * DirectSound::CDirectSoundStream::PauseEx +// ****************************************************************** +// Generic OOVPA as of ____? and newer +OOVPA_XREF(CDirectSoundStream_PauseEx, 5344, 1+10, + + XREF_CDirectSoundStream_PauseEx, + XRefOne) + + XREF_ENTRY( 0x3D, XREF_CMcpxStream_Pause_Ex ), + + { 0x00, 0x56 }, + + { 0x0C, 0x00 }, + { 0x14, 0x74 }, + { 0x21, 0xB8 }, + { 0x2A, 0x24 }, + { 0x41, 0x85 }, + { 0x4C, 0xFF }, + { 0x53, 0xC7 }, + + { 0x56, 0xC2 }, + { 0x57, 0x10 }, +OOVPA_END; + +// ****************************************************************** +// * IDirectSoundStream_PauseEx +// ****************************************************************** +// Generic OOVPA as of ____? and newer +OOVPA_XREF(IDirectSoundStream_PauseEx, 5344, 1+7, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x11, XREF_CDirectSoundStream_PauseEx ), + + { 0x02, 0x24 }, + { 0x06, 0x24 }, + { 0x0A, 0x24 }, + { 0x0E, 0x24 }, + { 0x10, 0xE8 }, + { 0x15, 0xC2 }, + { 0x16, 0x10 }, +OOVPA_END; + +// ****************************************************************** +// * XFileCreateMediaObjectAsync +// ****************************************************************** +OOVPA_NO_XREF(XFileCreateMediaObjectAsync, 5344, 8) + + { 0x0A, 0xC0 }, + { 0x16, 0xF8 }, + { 0x22, 0xE6 }, + { 0x2E, 0x20 }, + { 0x3D, 0x8B }, + { 0x49, 0x8B }, + { 0x52, 0x06 }, + { 0x5E, 0x0C }, +OOVPA_END; + // ****************************************************************** // * Rollback support signature(s) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl index 78f2b5084..325a233a9 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl @@ -189,6 +189,7 @@ OOVPA_XREF(DSound_CRefCount_Release, 5455, 10, { 0x1F, 0x04 }, OOVPA_END; +#if 0 // Replaced with generic OOVPA 5344 // ****************************************************************** // * CMcpxStream_Flush // ****************************************************************** @@ -213,6 +214,7 @@ OOVPA_XREF(CMcpxStream_Flush, 5455, 11, { 0xD2, 0xC2 }, { 0xD3, 0x04 }, OOVPA_END; +#endif // ****************************************************************** // * CMcpxStream_Discontinuity @@ -363,3 +365,34 @@ OOVPA_NO_XREF(DSound_CMemoryManager_PoolAlloc, 5455, 11) { 0x45, 0x0C }, { 0x46, 0x00 }, OOVPA_END; + +// ****************************************************************** +// * CDirectSound_GetSpeakerConfig +// ****************************************************************** +// Generic OOVPA as of 5455 and newer +OOVPA_XREF(CDirectSound_GetSpeakerConfig, 5455, 14, + + XREF_CDirectSound_GetSpeakerConfig, + XRefZero) + + { 0x00, 0xE8 }, + + { 0x0B, 0x00 }, + { 0x14, 0x0B }, + { 0x20, 0xB8 }, + { 0x30, 0x08 }, + + { 0x31, 0x81 }, + //{ 0x32, 0xE1 }, (This value has changed, commented out for generic support.) + { 0x33, 0xFF }, + { 0x34, 0xFF }, + { 0x35, 0xFF }, + { 0x36, 0x7F }, + + { 0x3C, 0x0B }, + + { 0x48, 0x33 }, + + { 0x4A, 0xC2 }, + { 0x4B, 0x08 }, +OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index 74a62a280..8467cf5d6 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -62,109 +62,6 @@ OOVPA_XREF(CDirectSound_CommitDeferredSettings, 5558, 11, OOVPA_END; #endif -// ****************************************************************** -// * CDirectSound::SetDistanceFactorA -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetDistanceFactor, 5558, 17, - - XREF_CDirectSound_SetDistanceFactor, - XRefZero) - - // CDirectSound_SetDistanceFactor+0x21 : mov eax, 0x80004005 - { 0x21, 0xB8 }, - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // CDirectSound_SetDistanceFactor+0x33 : mov [eax+68h], edx - { 0x33, 0x89 }, - { 0x34, 0x50 }, - { 0x35, 0x68 }, - - // CDirectSound_SetDistanceFactor+0x36 : mov eax, [ecx+8] - { 0x36, 0x8B }, - { 0x37, 0x41 }, - { 0x38, 0x08 }, - - // CDirectSound_SetDistanceFactor+0x39 : or dword ptr[eax+0x30], 0x08 - { 0x39, 0x83 }, - { 0x3A, 0x48 }, - { 0x3B, 0x30 }, - { 0x3C, 0x08 }, - - // CDirectSound_SetDistanceFactor+0x4C : jz +0x0B - { 0x4C, 0x74 }, - { 0x4D, 0x0B }, -OOVPA_END; - -// ****************************************************************** -// * CDirectSound::SetRolloffFactor -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetRolloffFactor, 5558, 17, - - XREF_CDirectSound_SetRolloffFactor, - XRefZero) - - // CDirectSound_SetRolloffFactor+0x21 : mov eax, 0x80004005 - { 0x21, 0xB8 }, - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // CDirectSound_SetRolloffFactor+0x33 : mov [eax+6Ch], edx - { 0x33, 0x89 }, - { 0x34, 0x50 }, - { 0x35, 0x6C }, - - // CDirectSound_SetRolloffFactor+0x36 : mov eax, [ecx+8] - { 0x36, 0x8B }, - { 0x37, 0x41 }, - { 0x38, 0x08 }, - - // CDirectSound_SetRolloffFactor+0x39 : or dword ptr[eax+0x30], 0x10 - { 0x39, 0x83 }, - { 0x3A, 0x48 }, - { 0x3B, 0x30 }, - { 0x3C, 0x10 }, - - // CDirectSound_SetRolloffFactor+0x4C : jz +0x0B - { 0x4C, 0x74 }, - { 0x4D, 0x0B }, -OOVPA_END; - -// ****************************************************************** -// * CDirectSound::SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetDopplerFactor, 5558, 14, - - XREF_CDirectSound_SetDopplerFactor, - XRefZero) - - // CDirectSound_SetDopplerFactor+0x21 : mov eax, 0x80004005 - { 0x21, 0xB8 }, - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // CDirectSound_SetDopplerFactor+0x33 : mov [eax+0x70], edx - { 0x33, 0x89 }, - { 0x34, 0x50 }, - { 0x35, 0x70 }, - - // CDirectSound_SetDopplerFactor+0x39 : or dword ptr[eax+0x30], 0x20 - { 0x39, 0x83 }, - { 0x3A, 0x48 }, - { 0x3B, 0x30 }, - { 0x3C, 0x20 }, - - // CDirectSound_SetDopplerFactor+0x4C : jz +0x0B - { 0x4C, 0x74 }, - { 0x4D, 0x0B }, -OOVPA_END; - // ****************************************************************** // * IDirectSound_SetMixBinHeadroom // ****************************************************************** @@ -278,23 +175,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 5558, 7, OOVPA_END; #endif -// ****************************************************************** -// * CMcpxBuffer::SetCurrentPosition -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_SetCurrentPosition, 5558, 7, - - XREF_CMcpxBuffer_SetCurrentPosition, - XRefZero) - - { 0x1D, 0x00 }, - { 0x3C, 0x66 }, - { 0x5B, 0x00 }, - { 0x7C, 0x8D }, - { 0x99, 0xD1 }, - { 0xB8, 0x89 }, - { 0xDB, 0x5F }, -OOVPA_END; - #if 0 // Replaced with generic OOVPA 3911 // ****************************************************************** // * IDirectSoundBuffer_SetCurrentPosition @@ -337,63 +217,6 @@ OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 5558, 1+7, OOVPA_END; #endif -// ****************************************************************** -// * CDirectSoundBuffer::SetPlayRegion -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPlayRegion, 5558, 8, - - XREF_CDirectSoundBuffer_SetPlayRegion, - XRefZero) - - { 0x0F, 0x00 }, - { 0x1E, 0xFF }, - { 0x2E, 0x85 }, - { 0x3E, 0x3B }, - { 0x4E, 0x81 }, - { 0x5F, 0x8B }, - { 0x72, 0xFF }, - { 0x7E, 0x0C }, -OOVPA_END; - -// ****************************************************************** -// * CDirectSoundBuffer::SetLoopRegion -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetLoopRegion, 5558, 7, - - XREF_CDirectSoundBuffer_SetLoopRegion, - XRefZero) - - { 0x0F, 0x00 }, - { 0x24, 0xB8 }, - { 0x31, 0x55 }, - { 0x42, 0xC8 }, - { 0x53, 0x00 }, - { 0x64, 0x8B }, - { 0x77, 0xFF }, -OOVPA_END; - -// ****************************************************************** -// * public: long __thiscall DirectSound::CMcpxBuffer::Play(__int64,unsigned long) -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play2, 5558, 12, - - XREF_CMcpxBuffer_Play2, - XRefZero) - - { 0x00, 0x55 }, - { 0x01, 0x8B }, - { 0x02, 0xEC }, - { 0x18, 0x0C }, - { 0x19, 0xFF }, - { 0x1A, 0x75 }, - { 0x1B, 0x08 }, - { 0x1C, 0x6A }, - { 0x1D, 0x03 }, - { 0x1E, 0xFF }, - { 0x1F, 0x50 }, - { 0x36, 0xC2 }, -OOVPA_END; - #if 0 // Replaced with generic OOVPA 3911 // ****************************************************************** // * IDirectSoundBuffer_Play @@ -445,24 +268,6 @@ OOVPA_XREF(CMcpxBuffer_GetStatus, 5558, 11, OOVPA_END; #endif -// ****************************************************************** -// * CDirectSoundVoice::SetConeAngles -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 5558, 8, - - XREF_CDirectSoundVoice_SetConeAngles, - XRefZero) - - { 0x07, 0x8B }, - { 0x10, 0x08 }, - { 0x13, 0x20 }, - { 0x19, 0xB4 }, - { 0x22, 0x51 }, - { 0x2B, 0x00 }, - { 0x34, 0x10 }, - { 0x3E, 0x33 }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMinDistance // ****************************************************************** @@ -511,37 +316,6 @@ OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 5558, 1+10, OOVPA_END; #endif -// ****************************************************************** -// * CDirectSoundVoice::SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 5558, 1+19, - - XREF_CDirectSoundVoice_SetDopplerFactor, - XRefOne) - - XREF_ENTRY( 0x2A, XREF_CDirectSoundVoice_CommitDeferredSettings ), - - { 0x00, 0x8B }, - { 0x01, 0x4c }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x11, 0x89 }, - { 0x12, 0x50 }, - { 0x13, 0x4C }, - { 0x14, 0x8B }, - { 0x15, 0x41 }, - { 0x16, 0x10 }, - { 0x1A, 0x00 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, - { 0x30, 0xC2 }, - { 0x31, 0x0C }, - { 0x32, 0x00 }, -OOVPA_END; - // ****************************************************************** // * IDirectSoundBuffer8::SetAllParameters // ****************************************************************** @@ -618,28 +392,6 @@ OOVPA_XREF(CDirectSoundStream_Pause, 5558, 1+7, OOVPA_END; #endif -// ****************************************************************** -// * CDirectSoundVoice::SetDistanceFactor -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5558, 12, - - XREF_CDirectSoundVoice_SetDistanceFactor, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x10, 0x08 }, - { 0x11, 0x89 }, - { 0x12, 0x50 }, - { 0x13, 0x44 }, - { 0x14, 0x8B }, - { 0x1D, 0x80 }, - { 0x1F, 0x02 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetAllParameters // ****************************************************************** @@ -726,42 +478,6 @@ OOVPA_XREF(IDirectSound_EnableHeadphones, 5558, 1+7, { 0x1A, 0x08 }, OOVPA_END; #endif -// ****************************************************************** -// * DirectSound::CDirectSound::GetOutputLevels -// ****************************************************************** -OOVPA_XREF(CDirectSound_GetOutputLevels, 5558, 7, - - XREF_CDirectSound_GetOutputLevels, - XRefZero) - - { 0x07, 0x10 }, - { 0x10, 0xF3 }, - { 0x19, 0x5E }, - { 0x22, 0xFE }, - { 0x2B, 0x85 }, - { 0x34, 0xA6 }, - { 0x3D, 0xD0 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_GetOutputLevels -// ****************************************************************** -OOVPA_XREF(IDirectSound_GetOutputLevels, 5558, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_CDirectSound_GetOutputLevels ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; #if 0 // Replaced with generic OOVPA 3911 // ****************************************************************** @@ -783,41 +499,6 @@ OOVPA_XREF(IDirectSound_SetPosition, 5558, 1+7, { 0x31, 0x5D }, OOVPA_END; #endif -// ****************************************************************** -// * DirectSound::CDirectSound::SetVelocity -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetVelocity, 5558, 7, - - XREF_CDirectSound_SetVelocity, - XRefZero) - - { 0x0F, 0x00 }, - { 0x1E, 0xFF }, - { 0x2B, 0x8B }, - { 0x3A, 0x8B }, - { 0x49, 0x4C }, - { 0x58, 0xE8 }, - { 0x67, 0x15 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_SetVelocity -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetVelocity, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_CDirectSound_SetVelocity ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xF8 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; #if 0 //Replaced with generic OOVPA 3911 // ****************************************************************** @@ -839,24 +520,6 @@ OOVPA_XREF(IDirectSound_CreateSoundStream, 5558, 1+7, { 0x21, 0xC2 }, OOVPA_END; #endif -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetRolloffCurve -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetRolloffCurve, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetRolloffCurve ), - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x74 }, - { 0x3A, 0x24 }, - { 0x46, 0x74 }, - { 0x53, 0x8B }, -OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSound::SetAllParameters diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index bef057276..02572eb89 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -108,44 +108,6 @@ OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 5788, 1+7, OOVPA_END; #endif -// ****************************************************************** -// * DirectSound::CDirectSound::SetRolloffFactor -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetRolloffFactor, 5788, 9, - - XREF_CDirectSound_SetRolloffFactor, - XRefZero) - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x08 }, - { 0x35, 0x6C }, - { 0x3A, 0x48 }, - { 0x4A, 0x85 }, - { 0x53, 0xFF }, - { 0x5E, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSound::SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetDopplerFactor, 5788, 9, - - XREF_CDirectSound_SetDopplerFactor, - XRefZero) - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x08 }, - { 0x35, 0x70 }, - { 0x3A, 0x48 }, - { 0x4A, 0x85 }, - { 0x53, 0xFF }, - { 0x5E, 0x00 }, -OOVPA_END; - #if 0 // Duplicate OOVPA, replacing with generic OOVPA 3911 // ****************************************************************** // * IDirectSoundBuffer_SetMaxDistance @@ -245,25 +207,6 @@ OOVPA_END; // { 0x4B, 0x8B }, //OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::PlayEx -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_PlayEx, 5788, 1+7, - - XREF_CDirectSoundBuffer_PlayEx, - XRefOne) - - XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Play2 ), - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x20 }, - { 0x3A, 0x24 }, - { 0x46, 0x0B }, - { 0x52, 0x8B }, -OOVPA_END; - // ****************************************************************** // * IDirectSound_CreateSoundStream // ****************************************************************** @@ -323,18 +266,3 @@ OOVPA_XREF(CMcpxStream_Pause, 5788, 7, { 0x7C, 0x00 }, OOVPA_END; #endif - -// ****************************************************************** -// * XFileCreateMediaObjectAsync -// ****************************************************************** -OOVPA_NO_XREF(XFileCreateMediaObjectAsync, 5788, 8) - - { 0x0A, 0xC0 }, - { 0x16, 0xF8 }, - { 0x22, 0xE6 }, - { 0x2E, 0x20 }, - { 0x3D, 0x8B }, - { 0x49, 0x8B }, - { 0x52, 0x06 }, - { 0x5E, 0x0C }, -OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl index 5382375c9..8cd88908b 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl @@ -32,37 +32,6 @@ // * // ****************************************************************** -// ****************************************************************** -// * DirectSound::CDirectSound::SetRolloffFactor -// Xbe Explorer generated pattern, derived from address $00439F47 in "SpiderMan 2" : -// 56E8........833DD4........0FB6F0741685F6740B68E03B4400FF15...... 00 0000 005F ? SetRolloffFactor@CDirectSound@DirectSound@@QAGJMK@Z ^ 0002R ? DirectSoundEnterCriticalSection@@YGHXZ ^0009D _g_fDirectSoundInFinalRelease ^ 001DD __imp__RtlLeaveCriticalSection@4 ^ 0046R ? CommitDeferredSettings@CDirectSound@DirectSound@@QAGJXZ ^ 0055D __imp__RtlLeaveCriticalSection@4 -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetRolloffFactor, 5849, 20, - - XREF_CDirectSound_SetRolloffFactor, - XRefZero) - - { 0x00, 0x56 }, - { 0x01, 0xE8 }, - { 0x06, 0x83 }, - { 0x07, 0x3D }, - { 0x0D, 0x0F }, - { 0x0E, 0xB6 }, - { 0x0F, 0xF0 }, - { 0x10, 0x74 }, - { 0x11, 0x16 }, - { 0x12, 0x85 }, - { 0x13, 0xF6 }, - { 0x14, 0x74 }, - { 0x15, 0x0B }, - { 0x16, 0x68 }, - { 0x1A, 0x00 }, - { 0x1B, 0xFF }, - { 0x1C, 0x15 }, - { 0x35, 0x6C }, - { 0x3C, 0x10 }, - { 0x5C, 0xC2 }, -OOVPA_END; #if 0 // Duplicate OOVPA base on 4134 // ****************************************************************** // * DirectSound::CDirectSoundStream::SetPitch diff --git a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl index adc7c2f26..404e34518 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl @@ -44,6 +44,7 @@ // * [4134] JSRF | 1% | Does not have Stream class. DS and Buffer might be full. // * [....] // * [5455] GR: Island Thunder | 100% | Only has 50%-ish of the library compiled with xbe build. +// * [5558] Dino Crisis 3 | 80% | Contain full library. // TODO: Known DSound OOVPA issue list // * 3911 to 5933: Cannot make OOVPAs @@ -121,7 +122,7 @@ // * CDirectSoundStream_SetFormat // * CDirectSoundStream_SetHeadroom // * CDirectSoundStream_SetI3DL2Source -// * CDirectSoundStream_SetRolloffCurve +// * CDirectSoundStream_SetRolloffCurve (IDirectSoundStream_SetRolloffCurve is a jmp) // * CDirectSoundStream_SetRolloffFactor // * IDirectSoundStream_SetHeadroom // * 4134 verification needed: (Verifying with Blood Omen 2 title is done, need different title to find the remaining...) @@ -163,6 +164,12 @@ // * CDirectSound_SetRolloffFactor (5344) // * CDirectSound_SetDistanceFactor (5344) // * CDirectSound_SetI3DL2Listener (5344) +// * CMcpxBuffer_Pause_Ex (5344) +// * IDirectSoundBuffer_PauseEx (5344) +// * CDirectSoundBuffer_PauseEx (5344) +// * CMcpxStream_Pause_Ex (5344) +// * CDirectSoundStream_PauseEx (5344) +// * IDirectSoundStream_PauseEx (5344) // * CDirectSoundVoice_SetMixBins need to use XREF_CMcpxVoiceClient_SetMixBins instead of XREF_CDirectSoundVoiceSettings_SetMixBins. // * This way we can use less OOVPA revisions. // * CDirectSound_EnableHeadphones (5233) need evaluate, most likely false detection. @@ -219,16 +226,18 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CMcpxBuffer_GetCurrentPosition, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CMcpxBuffer_GetStatus, XREF, 3911, 4039, 4134, 4721, 4831), REGISTER_OOVPAS(CMcpxBuffer_Pause, XREF, 4831), + REGISTER_OOVPAS(CMcpxBuffer_Pause_Ex, XREF, 5344), REGISTER_OOVPAS(CMcpxBuffer_Play, XREF, 3911, 4134, 4721, 4831), // NOTE: ?Play@CMcpxBuffer@DirectSound@@QAEJK@Z - REGISTER_OOVPAS(CMcpxBuffer_Play2, XREF, 4361, 5558), // NOTE: ?Play@CMcpxBuffer@DirectSound@@QAEJ_JK@Z + REGISTER_OOVPAS(CMcpxBuffer_Play2, XREF, 4361), // NOTE: ?Play@CMcpxBuffer@DirectSound@@QAEJ_JK@Z REGISTER_OOVPAS(CMcpxBuffer_SetBufferData, XREF, 4134, 5455), - REGISTER_OOVPAS(CMcpxBuffer_SetCurrentPosition, XREF, 3911, 4039, 4134, 5558, 5788), + REGISTER_OOVPAS(CMcpxBuffer_SetCurrentPosition, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CMcpxBuffer_Stop, XREF, 3911, 4134, 4242), // NOTE: ?Stop@CMcpxBuffer@DirectSound@@QAEJK@Z REGISTER_OOVPAS(CMcpxBuffer_Stop2, XREF, 4361), // NOTE: ?Stop@CMcpxBuffer@DirectSound@@QAEJ_JK@Z REGISTER_OOVPAS(CMcpxStream_Discontinuity, XREF, 3911, 4039, 4134, 5344, 5455), - REGISTER_OOVPAS(CMcpxStream_Flush, XREF, 3911, 3936, 4039, 4134, 4242, 4361, 5344, 5455), + REGISTER_OOVPAS(CMcpxStream_Flush, XREF, 3911, 3936, 4039, 4134, 4242, 4361, 5344), REGISTER_OOVPAS(CMcpxStream_GetStatus, XREF, 4134, 5233), REGISTER_OOVPAS(CMcpxStream_Pause, XREF, 3911, 4039, 4134, /*4361,*/ 4831), + REGISTER_OOVPAS(CMcpxStream_Pause_Ex, XREF, 5344), REGISTER_OOVPAS(CSensaura3d_GetFullHRTFFilterPair, XREF, 3911, 3936), REGISTER_OOVPAS(CSensaura3d_GetLiteHRTFFilterPair, XREF, 3911, 3936), REGISTER_OOVPAS(CMcpxVoiceClient_Commit3dSettings, XREF, 3911), @@ -253,11 +262,11 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundVoiceSettings_SetMixBinVolumes, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundVoice_CommitDeferredSettings, XREF, 5455), REGISTER_OOVPAS(CDirectSoundVoice_SetAllParameters, XREF, 3911, 4039, 4134, 5344, 5558), - REGISTER_OOVPAS(CDirectSoundVoice_SetConeAngles, XREF, 3911, 4039, 4134, 5344, 5558), + REGISTER_OOVPAS(CDirectSoundVoice_SetConeAngles, XREF, 3911, 4039, 4134, 5344), REGISTER_OOVPAS(CDirectSoundVoice_SetConeOrientation, XREF, 3911, 4039, 4134, 5344), REGISTER_OOVPAS(CDirectSoundVoice_SetConeOutsideVolume, XREF, 3911, 4039, 4134, 4361, 5344), - REGISTER_OOVPAS(CDirectSoundVoice_SetDistanceFactor, XREF, 4134, 4361, 4627, 5344, 5558), - REGISTER_OOVPAS(CDirectSoundVoice_SetDopplerFactor, XREF, 4134, 4361, 4627, 5344, 5558), + REGISTER_OOVPAS(CDirectSoundVoice_SetDistanceFactor, XREF, 4134, 4627, 5344), + REGISTER_OOVPAS(CDirectSoundVoice_SetDopplerFactor, XREF, 4134, 4627, 5344), REGISTER_OOVPAS(CDirectSoundVoice_SetEG, XREF, 3911, 4039), REGISTER_OOVPAS(CDirectSoundVoice_SetFilter, XREF, 3911, 4039), REGISTER_OOVPAS(CDirectSoundVoice_SetFormat, XREF, 4242, 4721), @@ -282,8 +291,9 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundBuffer_GetStatus, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_Lock, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_Pause, XREF, 4928), + REGISTER_OOVPAS(CDirectSoundBuffer_PauseEx, XREF, 5344), REGISTER_OOVPAS(CDirectSoundBuffer_Play, XREF, 3911, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundBuffer_PlayEx, XREF, 3911, 4361, 5788), + REGISTER_OOVPAS(CDirectSoundBuffer_PlayEx, XREF, 3911, 4361), REGISTER_OOVPAS(CDirectSoundBuffer_SetAllParameters, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetBufferData, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetConeAngles, XREF, 4039, 4134), @@ -299,7 +309,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundBuffer_SetHeadroom, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetI3DL2Source, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetLFO, XREF, 4039, 4242), - REGISTER_OOVPAS(CDirectSoundBuffer_SetLoopRegion, XREF, 3911, 4039, 4134, 5558), + REGISTER_OOVPAS(CDirectSoundBuffer_SetLoopRegion, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetMaxDistance, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetMinDistance, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetMixBins, XREF, 4039, 4134), @@ -308,7 +318,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundBuffer_SetNotificationPositions, XREF, 3911, 4134), // Uncommenting these fixes dashboard 4920 (from 4627 comment) REGISTER_OOVPAS(CDirectSoundBuffer_SetOutputBuffer, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetPitch, XREF, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundBuffer_SetPlayRegion, XREF, 4039, 4361, 5558), + REGISTER_OOVPAS(CDirectSoundBuffer_SetPlayRegion, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetPosition, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetRolloffCurve, XREF, 4627), REGISTER_OOVPAS(CDirectSoundBuffer_SetRolloffFactor, XREF, 4134), @@ -324,12 +334,15 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundStream_GetInfo, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_GetStatus, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_Pause, PATCH, 3911, 4039, 4134 /*, 4361, 5558*/), + REGISTER_OOVPAS(CDirectSoundStream_PauseEx, PATCH, 5344), REGISTER_OOVPAS(CDirectSoundStream_Process, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_Release, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetAllParameters, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetConeAngles, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetConeOrientation, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetConeOutsideVolume, PATCH, 3911, 4039, 4134), + REGISTER_OOVPAS(CDirectSoundStream_SetDistanceFactor, PATCH, 4134), + REGISTER_OOVPAS(CDirectSoundStream_SetDopplerFactor, PATCH, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetEG, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetFilter, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetFormat, PATCH, 4242), @@ -338,48 +351,49 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundStream_SetI3DL2Source, PATCH, 3911, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetLFO, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetMaxDistance, PATCH, 3911, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundStream_SetMinDistance, PATCH, 3911, 4039, 4134, 5344), + REGISTER_OOVPAS(CDirectSoundStream_SetMinDistance, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetMixBins, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetMixBinVolumes_12, PATCH, 3911), //This revision is only used in XDK 3911 to 3936. - REGISTER_OOVPAS(CDirectSoundStream_SetMixBinVolumes_8, PATCH, 4039), //Then it has changed in XDK 4039 and higher. + REGISTER_OOVPAS(CDirectSoundStream_SetMixBinVolumes_8, PATCH, 4039, 4134), //Then it has changed in XDK 4039 and higher. REGISTER_OOVPAS(CDirectSoundStream_SetMode, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetOutputBuffer, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetPitch, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetPosition, PATCH, 3911, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundStream_SetRolloffCurve, XREF, 4627, 5558), + REGISTER_OOVPAS(CDirectSoundStream_SetRolloffCurve, XREF, 4627), REGISTER_OOVPAS(CDirectSoundStream_SetRolloffFactor, PATCH, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetVelocity, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetVolume, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_Use3DVoiceData, XREF, 5558), REGISTER_OOVPAS(CDirectSound_CommitDeferredSettings, XREF, 3911, 4039, 4134, 5344, 5455), - REGISTER_OOVPAS(CDirectSound_CommitEffectData, XREF, 3911), + REGISTER_OOVPAS(CDirectSound_CommitEffectData, XREF, 3911, 4134), REGISTER_OOVPAS(CDirectSound_CreateSoundBuffer, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSound_CreateSoundStream, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSound_DownloadEffectsImage, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSound_DoWork, XREF, 3911, 4039), REGISTER_OOVPAS(CDirectSound_EnableHeadphones, XREF, 3911, 4039, 4627, 5233, 5344, 5455), REGISTER_OOVPAS(CDirectSound_GetCaps, XREF, 3911, 4039, 4134, 4361), - REGISTER_OOVPAS(CDirectSound_GetEffectData, XREF, 3911), - REGISTER_OOVPAS(CDirectSound_GetOutputLevels, XREF, 4627, 5558), - REGISTER_OOVPAS(CDirectSound_GetSpeakerConfig, PATCH, 3911, 4627), + REGISTER_OOVPAS(CDirectSound_GetEffectData, XREF, 3911, 4134), + REGISTER_OOVPAS(CDirectSound_GetOutputLevels, XREF, 4627), + REGISTER_OOVPAS(CDirectSound_GetSpeakerConfig, PATCH, 3911, 4627, 5455), REGISTER_OOVPAS(CDirectSound_GetTime, XREF, 3911), REGISTER_OOVPAS(CDirectSound_SetAllParameters, XREF, 3911, 4134, 4831, 5558), //TODO: Need to improvise after 4134 REGISTER_OOVPAS(CDirectSound_SetAllParametersA, XREF, 4627, 4721, 4831), //TODO: Need to improvise after 4134 then move in CDirectSound_SetAllParameters - REGISTER_OOVPAS(CDirectSound_SetDistanceFactor, XREF, 3911, 4039, 4134, 4627, 5344, 5558), - REGISTER_OOVPAS(CDirectSound_SetDopplerFactor, XREF, 3911, 4039, 4134, 4627, 5344, 5558, 5788), + REGISTER_OOVPAS(CDirectSound_SetDistanceFactor, XREF, 3911, 4039, 4134, 4627, 5344), + REGISTER_OOVPAS(CDirectSound_SetDopplerFactor, XREF, 3911, 4039, 4134, 4627, 5344), REGISTER_OOVPAS(CDirectSound_SetEffectData, XREF, 3911, 4134), REGISTER_OOVPAS(CDirectSound_SetI3DL2Listener, XREF, 3911, 4039, 4134, 5344, 5455), REGISTER_OOVPAS(CDirectSound_SetMixBinHeadroom, XREF, 3911, 4134), REGISTER_OOVPAS(CDirectSound_SetOrientation, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSound_SetPosition, XREF, 3911, 4039, 4134, 4627, 5344), - REGISTER_OOVPAS(CDirectSound_SetRolloffFactor, XREF, 3911, 4039, 4134, 5344, 5558, 5788, 5849), - REGISTER_OOVPAS(CDirectSound_SetVelocity, XREF, 3911, 4039, 4134, 4627, 5344, 5558), + REGISTER_OOVPAS(CDirectSound_SetRolloffFactor, XREF, 3911, 4039, 4134, 5344), + REGISTER_OOVPAS(CDirectSound_SetVelocity, XREF, 3911, 4039, 4134, 4627, 5344), REGISTER_OOVPAS(CDirectSound_SynchPlayback, XREF, 5233, 5344), REGISTER_OOVPAS(IDirectSoundBuffer_AddRef, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_GetCurrentPosition, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_GetStatus, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_Lock, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_Pause, PATCH, 4928), + REGISTER_OOVPAS(IDirectSoundBuffer_PauseEx, PATCH, 5344), REGISTER_OOVPAS(IDirectSoundBuffer_Play, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_PlayEx, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_Release, PATCH, 3911), @@ -420,10 +434,13 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(IDirectSoundBuffer_Use3DVoiceData, PATCH, 5558), REGISTER_OOVPAS(IDirectSoundStream_FlushEx, PATCH, 4627), REGISTER_OOVPAS(IDirectSoundStream_Pause, UNPATCHED, 3911), //NOTE: 3911 only perform a jmp, later XDK revision may need a patch? + REGISTER_OOVPAS(IDirectSoundStream_PauseEx, PATCH, 5344), REGISTER_OOVPAS(IDirectSoundStream_SetAllParameters, UNPATCHED, 3911), //NOTE: 3911 only perform a jmp, later XDK revision may need a patch? REGISTER_OOVPAS(IDirectSoundStream_SetConeAngles, UNPATCHED, 3911), //NOTE: 3911 only perform a jmp, later XDK revision may need a patch? REGISTER_OOVPAS(IDirectSoundStream_SetConeOrientation, UNPATCHED, 3911), REGISTER_OOVPAS(IDirectSoundStream_SetConeOutsideVolume, UNPATCHED, 3911), //NOTE: 3911 only perform a jmp, later XDK revision may need a patch? + REGISTER_OOVPAS(IDirectSoundStream_SetDistanceFactor, UNPATCHED, 4134), + REGISTER_OOVPAS(IDirectSoundStream_SetDopplerFactor, UNPATCHED, 4134), REGISTER_OOVPAS(IDirectSoundStream_SetEG, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundStream_SetLFO, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundStream_SetFilter, PATCH, 3911, 4039), @@ -440,6 +457,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(IDirectSoundStream_SetOutputBuffer, UNPATCHED, 3911), //NOTE: 3911 only perform a jmp, later XDK revision may need a patch? REGISTER_OOVPAS(IDirectSoundStream_SetPitch, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundStream_SetPosition, UNPATCHED, 3911), + REGISTER_OOVPAS(IDirectSoundStream_SetRolloffFactor, UNPATCHED, 4134), REGISTER_OOVPAS(IDirectSoundStream_SetVelocity, UNPATCHED, 3911), REGISTER_OOVPAS(IDirectSoundStream_SetVolume, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSound_AddRef, PATCH, 3911), @@ -451,7 +469,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(IDirectSound_EnableHeadphones, PATCH, 3911 /*, 3936, 4627, 5233, 5558*/), REGISTER_OOVPAS(IDirectSound_GetCaps, PATCH, 3911), REGISTER_OOVPAS(IDirectSound_GetEffectData, PATCH, 3911), - REGISTER_OOVPAS(IDirectSound_GetOutputLevels, PATCH, 4627, 5558), + REGISTER_OOVPAS(IDirectSound_GetOutputLevels, PATCH, 4627), REGISTER_OOVPAS(IDirectSound_GetSpeakerConfig, PATCH, 3911), REGISTER_OOVPAS(IDirectSound_GetTime, UNPATCHED, 3911), REGISTER_OOVPAS(IDirectSound_Release, PATCH, 3911), @@ -464,7 +482,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(IDirectSound_SetOrientation, PATCH, 3911), REGISTER_OOVPAS(IDirectSound_SetPosition, PATCH, 3911), REGISTER_OOVPAS(IDirectSound_SetRolloffFactor, PATCH, 3911/*, 4134, 5344*/), - REGISTER_OOVPAS(IDirectSound_SetVelocity, PATCH, 3911 /*, 5558*/), + REGISTER_OOVPAS(IDirectSound_SetVelocity, PATCH, 3911), REGISTER_OOVPAS(IDirectSound_SynchPlayback, PATCH, 5233), REGISTER_OOVPAS(CFullHRTFSource_GetCenterVolume, XREF, 4039, 4134, 5558), @@ -488,7 +506,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(IsValidFormat, UNPATCHED, 3911), REGISTER_OOVPAS(XAudioCreatePcmFormat, UNPATCHED, 3911), REGISTER_OOVPAS(XAudioCreateAdpcmFormat, PATCH, 3911, 5344), - REGISTER_OOVPAS(XFileCreateMediaObjectAsync, PATCH, 5788), + REGISTER_OOVPAS(XFileCreateMediaObjectAsync, PATCH, 5344), REGISTER_OOVPAS(XFileCreateMediaObjectEx, PATCH, 4627, 5028), REGISTER_OOVPAS(XWaveFileCreateMediaObject, PATCH, 4627),