From 097e6ab88c768677d36d153d13c65bc5bbd82003 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Tue, 31 Oct 2017 04:37:53 -0500 Subject: [PATCH] DSound Database Cleanup Begin Since so many duplicate OOVPAs has been found. I am starting with clean up process for DSound database. Thus narrowing down necessary of workload to research and add missing OOVPAs. --- src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl | 3 + src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl | 1 + src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl | 101 +++-- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 64 --- src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl | 52 +-- src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl | 132 +----- src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl | 407 ------------------- src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl | 112 ----- src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl | 62 +-- 9 files changed, 130 insertions(+), 804 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl index 1c4e291b2..a0d54f496 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl @@ -1920,6 +1920,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetBufferData // ****************************************************************** +// Generic OOVPA as of 3911 and newer OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 3911, 1+9, XRefNoSaveIndex, @@ -3307,6 +3308,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetPosition // ****************************************************************** +// Generic OOVPA as of 3911 and newer OOVPA_XREF(IDirectSoundBuffer_SetPosition, 3911, 1+8, XRefNoSaveIndex, @@ -3718,6 +3720,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_Lock // ****************************************************************** +// Generic OOVPA as of 3911 and newer OOVPA_XREF(IDirectSoundBuffer_Lock, 3911, 1+8, XRefNoSaveIndex, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl index 4dc170f7c..d6b8ecc30 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl @@ -3624,6 +3624,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetI3DL2Source // ****************************************************************** +// Generic OOVPA as of 4039 OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 4039, 1+9, XRefNoSaveIndex, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index c8cf469e1..971d8fd6a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -213,35 +213,51 @@ OOVPA_XREF(IDirectSound_SetI3DL2Listener, 4134, 1+11, // ****************************************************************** // * CDirectSoundVoice_SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4134, 12, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4134, 14, XREF_CDirectSoundVoice_SetHeadroom, - XRefZero) + XRefOne) + + // CDirectSoundVoice_SetHeadroom+0x1B : call [CMcpxVoiceClient::SetVolume] + XREF_ENTRY( 0x1B, XREF_CMcpxVoiceClient_SetVolume ), { 0x00, 0x8B }, { 0x08, 0x48 }, { 0x0F, 0x2B }, { 0x13, 0x1C }, + + // CDirectSoundVoice_SetHeadroom+0x14 : mov dword ptr [eax+20h],esi { 0x14, 0x89 }, { 0x15, 0x70 }, { 0x16, 0x20 }, + + // CDirectSoundVoice_SetHeadroom+0x14 : mov ecx,dword ptr [edx+0Ch] { 0x17, 0x8B }, { 0x18, 0x4A }, { 0x19, 0x0C }, + + // CDirectSoundVoice_SetHeadroom+0x14 : call CMcpxVoiceClient::SetVolume { 0x1A, 0xE8 }, + + // CDirectSoundVoice_SetHeadroom+0x14 :retn 8 + { 0x20, 0xC2 }, { 0x21, 0x08 }, OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 4134, 1+7, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 4134, 1+8, XREF_CDirectSoundBuffer_SetHeadroom, XRefOne) XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetHeadroom ), + { 0x00, 0x56 }, + { 0x0C, 0x00 }, { 0x12, 0x85 }, { 0x1C, 0x15 }, @@ -341,6 +357,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMixBins // ****************************************************************** +// Generic OOVPA as of 4134 and newer OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 4134, 1+16, XREF_CDirectSoundBuffer_SetMixBins, @@ -774,32 +791,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 4134, 19, { 0xAD, 0x00 }, OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer_SetBufferData -// ****************************************************************** -// Generic OOVPA as of 4134 and newer -OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 4134, 1+7, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetBufferData+0x19 : call [CDirectSoundBuffer::SetBufferData] - XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetBufferData), - - // IDirectSoundBuffer_SetBufferData+0x0E : add eax, 0xFFFFFFE4 - { 0x0E, 0x83 }, - { 0x0F, 0xC0 }, - { 0x10, 0xE4 }, - - // IDirectSoundBuffer_SetBufferData+0x13 : sbb ecx, ecx - { 0x13, 0x1B }, - { 0x14, 0xC9 }, - - // IDirectSoundBuffer_SetBufferData+0x15 : and ecx, eax - { 0x15, 0x23 }, - { 0x16, 0xC8 }, -OOVPA_END; - // ****************************************************************** // * CMcpxBuffer_GetStatus // ****************************************************************** @@ -1267,7 +1258,8 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 4134, 1+9, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 4134, 1+10, XREF_CDirectSoundBuffer_SetMaxDistance, XRefOne) @@ -1275,6 +1267,8 @@ OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 4134, 1+9, // CDirectSoundBuffer_SetMaxDistance+0x39 : call [CDirectSoundVoice::SetMaxDistance] XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetMaxDistance ), + { 0x00, 0x56 }, + // CDirectSoundBuffer_SetMaxDistance+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, @@ -1373,7 +1367,8 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 4134, 1+9, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 4134, 1+10, XREF_CDirectSoundBuffer_SetMinDistance, XRefOne) @@ -1381,6 +1376,8 @@ OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 4134, 1+9, // CDirectSoundBuffer_SetMinDistance+0x39 : call [CDirectSoundVoice::SetMinDistance] XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetMinDistance ), + { 0x00, 0x56 }, + // CDirectSoundBuffer_SetMinDistance+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, @@ -1479,7 +1476,8 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 4134, 1+9, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 4134, 1+10, XREF_CDirectSoundBuffer_SetRolloffFactor, XRefOne) @@ -1487,6 +1485,8 @@ OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 4134, 1+9, // CDirectSoundBuffer_SetRolloffFactor+0x39 : call [CDirectSoundVoice::SetRolloffFactor] XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetRolloffFactor ), + { 0x00, 0x56 }, + // CDirectSoundBuffer_SetRolloffFactor+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, @@ -1581,7 +1581,8 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 4134, 1+9, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 4134, 1+10, XREF_CDirectSoundBuffer_SetDistanceFactor, XRefOne) @@ -1589,6 +1590,8 @@ OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 4134, 1+9, // CDirectSoundBuffer_SetDistanceFactor+0x39 : call [CDirectSoundVoice::SetDistanceFactor] XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDistanceFactor ), + { 0x00, 0x56 }, + // CDirectSoundBuffer_SetDistanceFactor+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, @@ -1608,6 +1611,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetDistanceFactor // ****************************************************************** +// Generic OOVPA as of 4134 and newer OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 4134, 1+9, XRefNoSaveIndex, @@ -1885,7 +1889,8 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPosition, 4134, 1+8, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundBuffer_SetPosition, 4134, 1+9, XREF_CDirectSoundBuffer_SetPosition, XRefOne) @@ -1893,6 +1898,8 @@ OOVPA_XREF(CDirectSoundBuffer_SetPosition, 4134, 1+8, // CDirectSoundBuffer_SetPosition+0x49 : call [CDirectSoundVoice::SetPosition] XREF_ENTRY( 0x4A, XREF_CDirectSoundVoice_SetPosition ), + { 0x00, 0x55 }, + // CDirectSoundBuffer_SetPosition+0x2B : fld [ebp+arg_C] { 0x2B, 0xD9 }, { 0x2C, 0x45 }, @@ -1957,7 +1964,8 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 4134, 1+8, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 4134, 1+9, XREF_CDirectSoundBuffer_SetVelocity, XRefOne) @@ -1965,6 +1973,8 @@ OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 4134, 1+8, // CDirectSoundBuffer_SetVelocity+0x49 : call [CDirectSoundVoice::SetVelocity] XREF_ENTRY( 0x4A, XREF_CDirectSoundVoice_SetVelocity ), + { 0x00, 0x55 }, + // CDirectSoundBuffer_SetVelocity+0x2B : fld [ebp+arg_C] { 0x2B, 0xD9 }, { 0x2C, 0x45 }, @@ -2034,6 +2044,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetDopplerFactor // ****************************************************************** +// Generic OOVPA as of 4134 and newer OOVPA_XREF(CDirectSoundBuffer_SetDopplerFactor, 4134, 1+9, XREF_CDirectSoundBuffer_SetDopplerFactor, @@ -2061,6 +2072,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetDopplerFactor // ****************************************************************** +// Generic OOVPA as of 4134 and newer OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 4134, 1+8, XRefNoSaveIndex, @@ -2114,6 +2126,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetI3DL2Source // ****************************************************************** +// Generic OOVPA as of 4134 and newer OOVPA_XREF(CDirectSoundBuffer_SetI3DL2Source, 4134, 1+11, XREF_CDirectSoundBuffer_SetI3DL2Source, @@ -2324,30 +2337,42 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMode, 4134, 7, +OOVPA_XREF(CDirectSoundVoice_SetMode, 4134, 14, XREF_CDirectSoundVoice_SetMode, XRefZero) + { 0x00, 0xF6 }, + { 0x03, 0x0C }, + { 0x07, 0x24 }, { 0x08, 0x04 }, + { 0x0B, 0x10 }, { 0x0D, 0x89 }, + { 0x0E, 0xB4 }, { 0x12, 0x8B }, { 0x17, 0x51 }, + { 0x18, 0x3C }, { 0x1C, 0xE8 }, { 0x21, 0x33 }, + + { 0x23, 0xC2 }, + { 0x24, 0x0C }, OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMode, 4134, 1+7, +// Generic OOVPA as of 4134 and newer +OOVPA_XREF(CDirectSoundBuffer_SetMode, 4134, 1+8, XREF_CDirectSoundBuffer_SetMode, XRefOne) XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetMode ), + { 0x00, 0x56 }, + { 0x0C, 0x00 }, { 0x14, 0x74 }, { 0x21, 0xB8 }, @@ -2659,6 +2684,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound::CreateSoundStream // ****************************************************************** +// Generic OOVPA as of 4134 and newer OOVPA_XREF(CDirectSound_CreateSoundStream, 4134, 14, XREF_CDirectSound_CreateSoundStream, @@ -2690,6 +2716,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundCreateStream // ****************************************************************** +// Generic OOVPA as of 4134 and newer OOVPA_XREF(DirectSoundCreateStream, 4134, 1+11, XRefNoSaveIndex, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 7061ca55c..e23a4915a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -554,50 +554,6 @@ OOVPA_XREF(IDirectSound_EnableHeadphones, 4627, 1+8, { 0x1B, 0x00 }, OOVPA_END; #endif -/* -// ****************************************************************** -// * CDirectSoundVoice::SetHeadrom -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4627, 1+8, - - XREF_CDirectSoundVoice_SetHeadroom, - XRefOne) // Note : This was -1, which is used nowhere else and probably an error. - - XREF_ENTRY( 0x1B, XREF_CMcpxVoiceClient_SetVolume ), - - { 0x0A, 0x56 }, - { 0x0F, 0x2B }, - { 0x10, 0xCE }, - { 0x17, 0x8B }, - { 0x18, 0x4A }, - { 0x19, 0x0C }, - { 0x20, 0xC2 }, - { 0x21, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * CDirectSoundStream::SetHeadroom -// ****************************************************************** -OOVPA_NO_XREF(CDirectSoundStream_SetHeadroom, 4627, 12, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetHeadroom ), - - { 0x21, 0x8B }, - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - { 0x2C, 0x57 }, - { 0x31, 0x83 }, - { 0x32, 0xC0 }, - { 0x33, 0x04 }, - { 0x4F, 0xC2 }, - { 0x50, 0x08 }, -OOVPA_END; -*/ // ****************************************************************** // * CDirectSound::SetAllParametersA @@ -973,26 +929,6 @@ OOVPA_XREF(IDirectSoundBuffer_SetPitch, 4627, 1+7, OOVPA_END; #endif -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetHeadroom -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4627, 1+7, - - XREF_CDirectSoundVoice_SetHeadroom, - XRefOne) - - // CDirectSoundVoice_SetHeadroom+0x1B : call [CMcpxVoiceClient::SetVolume] - XREF_ENTRY( 0x1B, XREF_CMcpxVoiceClient_SetVolume ), - - { 0x03, 0x04 }, - { 0x08, 0x48 }, - { 0x0D, 0x24 }, - { 0x12, 0x48 }, - { 0x17, 0x8B }, - { 0x1F, 0x5E }, - { 0x21, 0x08 }, -OOVPA_END; - #if 0 // Moved to 4039 // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetOutputBuffer diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index 45feef5c6..3b5df4efb 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -132,17 +132,24 @@ OOVPA_END; // ****************************************************************** // CMcpxAPU::SynchPlayback // ****************************************************************** -OOVPA_XREF(CMcpxAPU_SynchPlayback, 5233, 8, +// Generic OOVPA as of 5233 and newer +OOVPA_XREF(CMcpxAPU_SynchPlayback, 5233, 9, XREF_CMcpxAPU_SynchPlayback, XRefZero) + { 0x00, 0x55 }, - { 0x0C, 0x74 }, + //{ 0x0C, 0x74 }, // vs 5344 0x3C { 0x1A, 0x1A }, { 0x25, 0x53 }, { 0x37, 0xF2 }, - { 0x58, 0xBC }, + //{ 0x58, 0xBC }, // vs 5344 0x84 + + { 0x7F, 0x47 }, + { 0x80, 0x04 }, + { 0x84, 0x43 }, + { 0x9E, 0x64 }, { 0xFF, 0x00 }, OOVPA_END; @@ -174,8 +181,9 @@ OOVPA_XREF(CDirectSound_SynchPlayback, 5233, 1+9, OOVPA_END; // ****************************************************************** -// * IDirectSound8::SynchPlayback +// * IDirectSound::SynchPlayback // ****************************************************************** +// Generic OOVPA as of 5233 and newer OOVPA_XREF(IDirectSound_SynchPlayback, 5233, 1+7, XRefNoSaveIndex, @@ -197,42 +205,6 @@ OOVPA_XREF(IDirectSound_SynchPlayback, 5233, 1+7, { 0x16, 0x04 }, OOVPA_END; -// ****************************************************************** -// CDirectSoundVoice::SetMode -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMode, 5233, 8, - - XREF_CDirectSoundVoice_SetMode, - XRefZero) - - { 0x00, 0xF6 }, - { 0x07, 0x24 }, - { 0x0B, 0x10 }, - { 0x0E, 0xB4 }, - { 0x18, 0x3C }, - { 0x1A, 0x06 }, - { 0x21, 0x33 }, - { 0x24, 0x0C }, -OOVPA_END; - -// ****************************************************************** -// CDirectSoundBuffer::SetMode -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMode, 5233, 1+7, - - XREF_CDirectSoundBuffer_SetMode, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetMode ), - - { 0x01, 0xE8 }, - { 0x15, 0x0B }, - { 0x22, 0x05 }, - { 0x27, 0x26 }, - { 0x34, 0x14 }, - { 0x3F, 0x0B }, - { 0x50, 0x0C }, -OOVPA_END; #if 0 // Duplicate OOVPA, replacing with generic 4039 // ****************************************************************** // * IDirectSoundBuffer_SetMode diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl index 5a808dcf3..0c26b82f2 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl @@ -50,33 +50,6 @@ OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 5344, 9, { 0x28, 0x51 }, { 0x2F, 0xC0 }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer::SetMinDistance -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 5344, 1+10, - - XREF_CDirectSoundBuffer_SetMinDistance, - XRefOne) - - // CDirectSoundBuffer_SetMinDistance+0x39 : call [CDirectSoundVoice::SetMinDistance] - XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetMinDistance ), - - { 0x00, 0x56 }, - // CDirectSoundBuffer_SetMinDistance+0x21 : mov eax, 80004005h - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // CDirectSoundBuffer_SetMinDistance+0x32 : fstp [esp+0Ch+var_C] - { 0x32, 0xD9 }, - { 0x33, 0x1C }, - { 0x34, 0x24 }, - - // CDirectSoundBuffer_SetMinDistance+0x53 : retn 0Ch - { 0x54, 0x0C }, - { 0x55, 0x00 } -OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMinDistance @@ -116,25 +89,6 @@ OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5344, 9, { 0x1F, 0x02 }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer::SetDistanceFactor -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 5344, 1+7, - - XREF_CDirectSoundBuffer_SetDistanceFactor, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDistanceFactor ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - // ****************************************************************** // * IDirectSoundBuffer_SetDistanceFactor // ****************************************************************** @@ -200,33 +154,7 @@ OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 5344, 9, { 0x28, 0x51 }, { 0x2F, 0xC0 }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer::SetMaxDistance -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 5344, 1+10, - XREF_CDirectSoundBuffer_SetMaxDistance, - XRefOne) - - // CDirectSoundBuffer_SetMaxDistance+0x39 : call [CDirectSoundVoice::SetMaxDistance] - XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetMaxDistance ), - - { 0x00, 0x56 }, - // CDirectSoundBuffer_SetMaxDistance+0x21 : mov eax, 80004005h - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // CDirectSoundBuffer_SetMaxDistance+0x32 : fstp [esp+0Ch+var_C] - { 0x32, 0xD9 }, - { 0x33, 0x1C }, - { 0x34, 0x24 }, - - // CDirectSoundBuffer_SetMaxDistance+0x53 : retn 0Ch - { 0x54, 0x0C }, - { 0x55, 0x00 } -OOVPA_END; #if 0 // Duplicate OOVPA, replacing with generic OOVPA // ****************************************************************** // * IDirectSoundBuffer_SetMaxDistance @@ -281,21 +209,32 @@ OOVPA_END; // ****************************************************************** // CDirectSoundVoice::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMode, 5344, 11, +// Generic OOVPA as of 5344 and newer +OOVPA_XREF(CDirectSoundVoice_SetMode, 5344, 14, XREF_CDirectSoundVoice_SetMode, XRefZero) + { 0x00, 0x8B }, + { 0x09, 0xB4 }, { 0x10, 0x08 }, + { 0x13, 0x40 }, + { 0x14, 0x8B }, { 0x15, 0x41 }, + { 0x18, 0x80 }, { 0x19, 0xB4 }, + { 0x1D, 0x80 }, { 0x1F, 0x02 }, + { 0x20, 0x40 }, + { 0x2E, 0x33 }, + + { 0x30, 0xC2 }, { 0x31, 0x0C }, OOVPA_END; @@ -439,10 +378,15 @@ OOVPA_END; // ****************************************************************** // * CDirectSound::SynchPlayback // ****************************************************************** -OOVPA_XREF(CDirectSound_SynchPlayback, 5344, 8, +// Generic OOVPA as of 5344 and newer +OOVPA_XREF(CDirectSound_SynchPlayback, 5344, 1+9, XREF_CDirectSound_SynchPlayback, - XRefZero) + XRefOne) + + XREF_ENTRY( 0x31, XREF_CMcpxAPU_SynchPlayback ), + + { 0x00, 0x56 }, { 0x07, 0x3D }, { 0x0C, 0x00 }, @@ -734,44 +678,6 @@ OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 5344, 9, { 0x42, 0x00 } OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetHeadroom -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 5344, 1+7, - - XREF_CDirectSoundBuffer_SetHeadroom, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetHeadroom ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetHeadroom -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 5344, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetHeadroom ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - // ****************************************************************** // * CDirectSoundVoice::SetConeOrientation // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index 0c214bde4..74bdcbd19 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -32,22 +32,6 @@ // * // ****************************************************************** -// ****************************************************************** -// * CDirectSound::SynchPlayback -// ****************************************************************** -OOVPA_XREF(CDirectSound_SynchPlayback, 5558, 7, - XREF_CDirectSound_SynchPlayback, - XRefZero) - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0xE8 }, - { 0x3A, 0x0B }, - { 0x46, 0x8B }, -OOVPA_END; - #if 0 // Replaced with generic OOVPA 5455 // ****************************************************************** // * CDirectSound::CommitDeferredSettings @@ -311,25 +295,6 @@ OOVPA_XREF(CMcpxBuffer_SetCurrentPosition, 5558, 7, { 0xDB, 0x5F }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer::SetCurrentPosition -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 5558, 1+7, - - XREF_CDirectSoundBuffer_SetCurrentPosition, - XRefOne) - - XREF_ENTRY( 0x35, XREF_CMcpxBuffer_SetCurrentPosition), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; - #if 0 // Replaced with generic OOVPA 3911 // ****************************************************************** // * IDirectSoundBuffer_SetCurrentPosition @@ -368,25 +333,6 @@ OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 5558, 7, { 0xB4, 0x00 }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer::SetMixBins -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 5558, 1+7, - - XREF_CDirectSoundBuffer_SetMixBins, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetMixBins ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - #if 0 // Replaced with generic OOVPA 4039 // ****************************************************************** // * IDirectSoundBuffer_SetMixBins @@ -465,27 +411,6 @@ OOVPA_XREF(CMcpxBuffer_Play2, 5558, 12, { 0x36, 0xC2 }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer::Play -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 5558, 9, - - XREF_CDirectSoundBuffer_Play, - XRefZero) // TODO : Use XRefOne here if XREF_CDirectSoundBuffer_Play is enabled below - - //XREF_ENTRY( 0x35, XREF_CDirectSoundBuffer_Play ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x2E, 0x20 }, - { 0x33, 0x18 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; - #if 0 // Replaced with generic OOVPA 3911 // ****************************************************************** // * IDirectSoundBuffer_Play @@ -610,44 +535,6 @@ OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 5558, 8, { 0x3E, 0x33 }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer::SetConeAngles -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 5558, 1+7, - - XREF_CDirectSoundBuffer_SetConeAngles, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetConeAngles ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x74 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetConeAngles -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetConeAngles ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMinDistance // ****************************************************************** @@ -779,45 +666,6 @@ OOVPA_XREF(CDirectSoundVoice_SetPosition, 5558, 7, { 0x4C, 0x33 }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer::SetPosition -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPosition, 5558, 1+8, - - XREF_CDirectSoundBuffer_SetPosition, - XRefOne) - - XREF_ENTRY( 0x4A, XREF_CDirectSoundVoice_SetPosition ), - - { 0x0F, 0x00 }, - { 0x18, 0x0B }, - { 0x25, 0x05 }, - { 0x32, 0x83 }, - { 0x3F, 0x04 }, - { 0x4E, 0x85 }, - { 0x59, 0xFF }, - { 0x66, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer8::SetPosition -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPosition, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_CDirectSoundBuffer_SetPosition ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xE4 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; - // ****************************************************************** // * CDirectSoundVoice::SetVelocity // ****************************************************************** @@ -835,44 +683,6 @@ OOVPA_XREF(CDirectSoundVoice_SetVelocity, 5558, 7, { 0x4C, 0x33 }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer::SetVelocity -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 5558, 1+8, - - XREF_CDirectSoundBuffer_SetVelocity, - XRefOne) - - XREF_ENTRY( 0x4A, XREF_CDirectSoundVoice_SetVelocity ), - - { 0x0F, 0x00 }, - { 0x18, 0x0B }, - { 0x25, 0x05 }, - { 0x32, 0x83 }, - { 0x3F, 0x04 }, - { 0x4E, 0x85 }, - { 0x59, 0xFF }, - { 0x66, 0x00 }, -OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer_SetVelocity -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVelocity, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_CDirectSoundBuffer_SetVelocity ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xE4 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; - /*// ****************************************************************** // * CMcpxStream::Pause // ****************************************************************** @@ -934,136 +744,6 @@ OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5558, 12, { 0x2F, 0xC0 }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer::SetDistanceFactor -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 5558, 1+7, - - XREF_CDirectSoundBuffer_SetDistanceFactor, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDistanceFactor ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetDistanceFactor -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDistanceFactor ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * CDirectSoundBuffer::SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDopplerFactor, 5558, 1+7, - - XREF_CDirectSoundBuffer_SetDopplerFactor, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDopplerFactor), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDopplerFactor ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_Lock -// ****************************************************************** -OOVPA_NO_XREF(IDirectSoundBuffer_Lock, 5558, 8) - - { 0x04, 0x75 }, - { 0x0A, 0x75 }, - { 0x10, 0x1C }, - { 0x16, 0x18 }, - { 0x1C, 0x1B }, - { 0x22, 0xC8 }, - { 0x2C, 0x5D }, - { 0x2E, 0x20 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetI3DL2Source -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetI3DL2Source, 5558, 1+7, - - XREF_CDirectSoundBuffer_SetI3DL2Source, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetI3DL2Source ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x74 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetI3DL2Source -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 5558, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetI3DL2Source ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetAllParameters // ****************************************************************** @@ -1086,77 +766,6 @@ OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 5558, 10, { 0xF6, 0x89 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetHeadroom -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 5558, 7, - - XREF_CDirectSoundVoice_SetHeadroom, - XRefZero) - - { 0x03, 0x04 }, - { 0x08, 0x48 }, - { 0x0D, 0x24 }, - { 0x12, 0x48 }, - { 0x17, 0x8B }, - { 0x1F, 0x5E }, - { 0x21, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetHeadroom -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 5558, 1+7, - - XREF_CDirectSoundBuffer_SetHeadroom, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetHeadroom ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetHeadroom -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetHeadroom ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::GetCurrentPosition -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 5558, 7, - - XREF_CDirectSoundBuffer_GetCurrentPosition, - XRefZero) - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0x74 }, - { 0x40, 0xF8 }, - { 0x4E, 0x8B }, -OOVPA_END; #if 0 //Replaced with generic 3911 // ****************************************************************** // * IDirectSoundBuffer_GetCurrentPosition@12 @@ -1345,22 +954,6 @@ OOVPA_XREF(IDirectSound_SetVelocity, 5558, 1+7, { 0x31, 0x5D }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSound::CreateSoundStream -// ****************************************************************** -OOVPA_XREF(CDirectSound_CreateSoundStream, 5558, 7, - - XREF_CDirectSound_CreateSoundStream, - XRefZero) - - { 0x11, 0xD8 }, - { 0x24, 0x05 }, - { 0x37, 0x74 }, - { 0x4A, 0x81 }, - { 0x5D, 0xE8 }, - { 0x70, 0x85 }, - { 0x83, 0xFF }, -OOVPA_END; #if 0 //Replaced with generic OOVPA 3911 // ****************************************************************** // * IDirectSound_CreateSoundStream diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index 76c42a819..ee93b4ddd 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -75,24 +75,6 @@ OOVPA_XREF(CMcpxBuffer_Play2, 5788, 7, { 0xAF, 0x00 }, OOVPA_END; #endif -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::Play -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 5788, 9, - - XREF_CDirectSoundBuffer_Play, - XRefZero) - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x2E, 0x20 }, - { 0x33, 0x18 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; #if 0 // Replaced with generic OOVPA 5455 // ****************************************************************** @@ -130,25 +112,6 @@ OOVPA_XREF(CMcpxBuffer_SetCurrentPosition, 5788, 7, { 0xDB, 0x5F }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetCurrentPosition -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 5788, 1+7, - - XREF_CDirectSoundBuffer_SetCurrentPosition, - XRefOne) - - XREF_ENTRY( 0x35, XREF_CMcpxBuffer_SetCurrentPosition ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; - #if 0 // Replaced with generic OOVPA 3911 // ****************************************************************** // * IDirectSoundBuffer_SetCurrentPosition @@ -208,43 +171,6 @@ OOVPA_XREF(CDirectSound_SetDopplerFactor, 5788, 9, { 0x5E, 0x00 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetMaxDistance -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 5788, 1+7, - - XREF_CDirectSoundBuffer_SetMaxDistance, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetMaxDistance ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetMinDistance -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 5788, 1+7, - - XREF_CDirectSoundBuffer_SetMinDistance, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetMinDistance ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; #if 0 // Duplicate OOVPA, replacing with generic OOVPA 3911 // ****************************************************************** // * IDirectSoundBuffer_SetMaxDistance @@ -380,25 +306,6 @@ OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 5788, 7, { 0x2F, 0xC0 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetRolloffFactor -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 5788, 1+7, - - XREF_CDirectSoundBuffer_SetRolloffFactor, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetRolloffFactor ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - // ****************************************************************** // * IDirectSoundBuffer_SetRolloffFactor // ****************************************************************** @@ -437,25 +344,6 @@ OOVPA_END; // { 0x21, 0xC2 }, //OOVPA_END; -// ****************************************************************** -// * DirectSoundCreateStream -// ****************************************************************** -OOVPA_XREF(DirectSoundCreateStream, 5788, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2F, XREF_CDirectSound_CreateSoundStream ), - - { 0x09, 0x56 }, - { 0x14, 0x45 }, - { 0x1F, 0x8B }, - { 0x2A, 0xFF }, - { 0x35, 0x85 }, - { 0x40, 0xFF }, - { 0x4E, 0x5F }, - { 0x56, 0x00 }, -OOVPA_END; #if 0 // Replaced by generic 4039 // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMixBinVolumes diff --git a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl index 1af092e93..5ac211b0a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl @@ -262,14 +262,14 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundVoice_SetFilter, XREF, 3911, 4039), REGISTER_OOVPAS(CDirectSoundVoice_SetFormat, XREF, 4242, 4721, 5558), REGISTER_OOVPAS(CDirectSoundVoice_SetFrequency, XREF, 3911, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundVoice_SetHeadroom, XREF, 3911, 4039, 4134, 4627, 5558), + REGISTER_OOVPAS(CDirectSoundVoice_SetHeadroom, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundVoice_SetI3DL2Source, XREF, 3911, 4039, 4134, 5344), REGISTER_OOVPAS(CDirectSoundVoice_SetLFO, XREF, 3911, 4039), REGISTER_OOVPAS(CDirectSoundVoice_SetMaxDistance, XREF, 3911, 4039, 4134, 4361, 5344), REGISTER_OOVPAS(CDirectSoundVoice_SetMinDistance, XREF, 3911, 4039, 4134, 4361, 5344), REGISTER_OOVPAS(CDirectSoundVoice_SetMixBins, XREF, 3911, 4039), REGISTER_OOVPAS(CDirectSoundVoice_SetMixBinVolumes, XREF, 3911, 4039), - REGISTER_OOVPAS(CDirectSoundVoice_SetMode, XREF, 3911, 4039, 4134, 5233, 5344), + REGISTER_OOVPAS(CDirectSoundVoice_SetMode, XREF, 3911, 4039, 4134, 5344), REGISTER_OOVPAS(CDirectSoundVoice_SetOutputBuffer, XREF, 3911, 4039), REGISTER_OOVPAS(CDirectSoundVoice_SetPitch, XREF, 3911, 4039), REGISTER_OOVPAS(CDirectSoundVoice_SetPosition, XREF, 3911, 4039, 4134, 4627, 5344, 5558), @@ -278,41 +278,41 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundVoice_SetVelocity, XREF, 3911, 4039, 4134, 5344), REGISTER_OOVPAS(CDirectSoundVoice_SetVolume, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundVoice_Use3DVoiceData, XREF, 5558), - REGISTER_OOVPAS(CDirectSoundBuffer_GetCurrentPosition, XREF, 3911, 4039, 4134, 5558), + REGISTER_OOVPAS(CDirectSoundBuffer_GetCurrentPosition, XREF, 3911, 4039, 4134), 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_Play, XREF, 3911, 4039, 4134, 5558, 5788), + REGISTER_OOVPAS(CDirectSoundBuffer_Play, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_PlayEx, XREF, 3911, 4361, 5788), REGISTER_OOVPAS(CDirectSoundBuffer_SetAllParameters, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetBufferData, XREF, 3911, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundBuffer_SetConeAngles, XREF, 4039, 4134, 5558), + REGISTER_OOVPAS(CDirectSoundBuffer_SetConeAngles, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetConeOrientation, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetConeOutsideVolume, XREF, 3911, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundBuffer_SetCurrentPosition, XREF, 3911, 4039, 4134, 5558, 5788), - REGISTER_OOVPAS(CDirectSoundBuffer_SetDistanceFactor, XREF, 4134, 5558), - REGISTER_OOVPAS(CDirectSoundBuffer_SetDopplerFactor, XREF, 4134, 5558), + REGISTER_OOVPAS(CDirectSoundBuffer_SetCurrentPosition, XREF, 3911, 4039, 4134), + REGISTER_OOVPAS(CDirectSoundBuffer_SetDistanceFactor, XREF, 4134), + REGISTER_OOVPAS(CDirectSoundBuffer_SetDopplerFactor, XREF, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetEG, XREF, 4039, 4242), REGISTER_OOVPAS(CDirectSoundBuffer_SetFilter, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetFormat, XREF, 4242, 5558), REGISTER_OOVPAS(CDirectSoundBuffer_SetFrequency, XREF, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundBuffer_SetHeadroom, XREF, 4039, 4134, 5344, 5558), - REGISTER_OOVPAS(CDirectSoundBuffer_SetI3DL2Source, XREF, 4039, 4134, 5558), + 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_SetMaxDistance, XREF, 3911, 4039, 4134, 5344, 5788), - REGISTER_OOVPAS(CDirectSoundBuffer_SetMinDistance, XREF, 3911, 4039, 4134, 5344, 5788), - REGISTER_OOVPAS(CDirectSoundBuffer_SetMixBins, XREF, 4039, 4134, 5558), + REGISTER_OOVPAS(CDirectSoundBuffer_SetMaxDistance, XREF, 3911, 4039, 4134), + REGISTER_OOVPAS(CDirectSoundBuffer_SetMinDistance, XREF, 3911, 4039, 4134), + REGISTER_OOVPAS(CDirectSoundBuffer_SetMixBins, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetMixBinVolumes, XREF, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundBuffer_SetMode, XREF, 4039, 4134, 5233), + REGISTER_OOVPAS(CDirectSoundBuffer_SetMode, XREF, 4039, 4134), 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_SetPosition, XREF, 3911, 4039, 4134, 5558), + REGISTER_OOVPAS(CDirectSoundBuffer_SetPosition, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetRolloffCurve, XREF, 4627), - REGISTER_OOVPAS(CDirectSoundBuffer_SetRolloffFactor, XREF, 4134, 5788), - REGISTER_OOVPAS(CDirectSoundBuffer_SetVelocity, XREF, 3911, 4039, 4134, 5558), + REGISTER_OOVPAS(CDirectSoundBuffer_SetRolloffFactor, XREF, 4134), + REGISTER_OOVPAS(CDirectSoundBuffer_SetVelocity, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetVolume, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_Stop, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_StopEx, XREF, 3911, 4039, 4361), @@ -354,7 +354,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSound_CommitDeferredSettings, XREF, 3911, 4039, 4134, 5344, 5455), REGISTER_OOVPAS(CDirectSound_CommitEffectData, XREF, 3911), REGISTER_OOVPAS(CDirectSound_CreateSoundBuffer, XREF, 3911, 4039, 4134), - REGISTER_OOVPAS(CDirectSound_CreateSoundStream, XREF, 3911, 4039, 4134, 5558), + 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), @@ -363,8 +363,8 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSound_GetOutputLevels, XREF, 4627, 5558), REGISTER_OOVPAS(CDirectSound_GetSpeakerConfig, PATCH, 3911, 4627), REGISTER_OOVPAS(CDirectSound_GetTime, XREF, 3911), - REGISTER_OOVPAS(CDirectSound_SetAllParameters, XREF, 3911, 4134, 4831, 5558), - REGISTER_OOVPAS(CDirectSound_SetAllParametersA, XREF, 4627, 4721, 4831), + 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_SetEffectData, XREF, 3911, 4134), @@ -374,29 +374,29 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSound_SetPosition, XREF, 3911, 4039, 4134, 4627, 5344, 5558), 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_SynchPlayback, XREF, 5233, 5344, 5558), + 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, 5558), + REGISTER_OOVPAS(IDirectSoundBuffer_Lock, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_Pause, PATCH, 4928), REGISTER_OOVPAS(IDirectSoundBuffer_Play, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_PlayEx, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_Release, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_SetAllParameters, PATCH, 3911, 4039), - REGISTER_OOVPAS(IDirectSoundBuffer_SetBufferData, PATCH, 3911, 4134), - REGISTER_OOVPAS(IDirectSoundBuffer_SetConeAngles, PATCH, 3911, 4039, 5558), + REGISTER_OOVPAS(IDirectSoundBuffer_SetBufferData, PATCH, 3911), + REGISTER_OOVPAS(IDirectSoundBuffer_SetConeAngles, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_SetConeOrientation, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_SetConeOutsideVolume, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_SetCurrentPosition, PATCH, 3911 /*, 4134, 5558, 5788*/), - REGISTER_OOVPAS(IDirectSoundBuffer_SetDistanceFactor, PATCH, 4134, 5558), - REGISTER_OOVPAS(IDirectSoundBuffer_SetDopplerFactor, PATCH, 4134, 5558), + REGISTER_OOVPAS(IDirectSoundBuffer_SetDistanceFactor, PATCH, 4134), + REGISTER_OOVPAS(IDirectSoundBuffer_SetDopplerFactor, PATCH, 4134), REGISTER_OOVPAS(IDirectSoundBuffer_SetEG, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_SetFilter, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_SetFormat, PATCH, 4242, 5558), REGISTER_OOVPAS(IDirectSoundBuffer_SetFrequency, PATCH, 3911, 4039), - REGISTER_OOVPAS(IDirectSoundBuffer_SetHeadroom, PATCH, 3911, 4039, 5344, 5558), - REGISTER_OOVPAS(IDirectSoundBuffer_SetI3DL2Source, PATCH, 3911, 4039, 5558), + REGISTER_OOVPAS(IDirectSoundBuffer_SetHeadroom, PATCH, 3911, 4039), + REGISTER_OOVPAS(IDirectSoundBuffer_SetI3DL2Source, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_SetLFO, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_SetLoopRegion, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_SetMaxDistance, PATCH, 3911 /*,5344, 5788*/), @@ -409,10 +409,10 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(IDirectSoundBuffer_SetOutputBuffer, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_SetPitch, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_SetPlayRegion, PATCH, 4039), - REGISTER_OOVPAS(IDirectSoundBuffer_SetPosition, PATCH, 3911, 5558), + REGISTER_OOVPAS(IDirectSoundBuffer_SetPosition, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_SetRolloffCurve, PATCH, 4627), REGISTER_OOVPAS(IDirectSoundBuffer_SetRolloffFactor, PATCH, 4134, 5788), - REGISTER_OOVPAS(IDirectSoundBuffer_SetVelocity, PATCH, 3911, 5558), + REGISTER_OOVPAS(IDirectSoundBuffer_SetVelocity, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_SetVolume, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_Stop, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_StopEx, PATCH, 3911), @@ -475,7 +475,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(DirectSoundCreate, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(DirectSoundCreateBuffer, PATCH, 3911, 4039, 4242), - REGISTER_OOVPAS(DirectSoundCreateStream, PATCH, 3911, 4039, 4134, 5788), + REGISTER_OOVPAS(DirectSoundCreateStream, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(DirectSoundDoWork, PATCH, 3911, 4134), REGISTER_OOVPAS(DirectSoundGetSampleTime, PATCH, 3911, 4361), REGISTER_OOVPAS(DirectSoundUseFullHRTF, PATCH, 3911, 4039, 4134, 5344),