From fd6c3f78e20191723606a3cee172922284ece07c Mon Sep 17 00:00:00 2001 From: jarupxx Date: Wed, 20 Dec 2017 20:02:37 +0900 Subject: [PATCH] DSound HLEDataBase Cleanup --- src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl | 80 -- src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl | 1058 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl | 246 ---- src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl | 411 ------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl | 80 -- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 1050 ----------------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4721.inl | 77 -- src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl | 17 - src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl | 234 ---- src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl | 665 ----------- src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl | 111 -- src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl | 550 --------- src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl | 241 ---- src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl | 24 - 14 files changed, 4844 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl index 860452bef..cec24d288 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl @@ -716,33 +716,6 @@ OOVPA_XREF(CDirectSoundBuffer_Stop, 4039, 12, { 0x4A, 0x04 }, OOVPA_END; -#if 0 // No longer used, replaced by generic 3911 version -// ****************************************************************** -// * IDirectSoundBuffer_Stop -// ****************************************************************** -OOVPA_NO_XREF(IDirectSoundBuffer_Stop, 4039, 11) - - // IDirectSoundBuffer_Stop+0x00 : mov eax, [esp+arg_0] - { 0x00, 0x8B }, - { 0x01, 0x44 }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, - - // IDirectSoundBuffer_Stop+0x04 : mov ecx, eax - { 0x04, 0x8B }, - { 0x05, 0xC8 }, - - // IDirectSoundBuffer_Stop+0x06 : add eax, 0FFFFFFE4h - { 0x06, 0x83 }, - { 0x07, 0xC0 }, - { 0x08, 0xE4 }, - - // IDirectSoundBuffer_Stop+0x15 : retn 4 - { 0x16, 0x04 }, - { 0x17, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::CommitDeferredSettings // ****************************************************************** @@ -1261,40 +1234,6 @@ OOVPA_XREF(CDirectSoundStream_SetFilter, 4039, 1+8, { 0x4A, 0x8B }, OOVPA_END; -#if 0 // No longer used, replaced by CMcpxVoiceClient_SetMixBins -// ****************************************************************** -// * CDirectSoundVoiceSettings::SetMixBins -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 4039, 13, - - XREF_CDirectSoundVoiceSettings_SetMixBins, - XRefZero) - - // CDirectSoundVoiceSettings_SetMixBins+0x06 : jnz +0x19 - { 0x06, 0x75 }, - { 0x07, 0x19 }, - - // CDirectSoundVoiceSettings_SetMixBins+0x08 : test byte ptr [ecx+8], 0x10 - { 0x08, 0xF6 }, - { 0x09, 0x41 }, - { 0x0A, 0x08 }, - { 0x0B, 0x10 }, - - // CDirectSoundVoiceSettings_SetMixBins+0x18 : shr eax, 1 - { 0x18, 0xD1 }, - { 0x19, 0xE8 }, - - // CDirectSoundVoiceSettings_SetMixBins+0x4E : mov edx, [ecx+2Ch] - { 0x4E, 0x8B }, - { 0x4F, 0x51 }, - { 0x50, 0x2C }, - - // CDirectSoundVoiceSettings_SetMixBins+0x51 : cmp edx, [eax] - { 0x51, 0x3B }, - { 0x52, 0x10 }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxVoiceClient::SetMixBins // ****************************************************************** @@ -1939,25 +1878,6 @@ OOVPA_XREF(CDirectSoundVoice_SetOutputBuffer, 4039, 13, { 0x52, 0x08 }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4039 version -// ****************************************************************** -// * CDirectSoundVoice::SetOutputBuffer -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetOutputBuffer, 4039, 7, - - XREF_CDirectSoundVoice_SetOutputBuffer, - XRefZero) - - { 0x09, 0xF7 }, - { 0x14, 0x8B }, - { 0x1F, 0x3B }, - { 0x2A, 0xE8 }, - { 0x35, 0x8B }, - { 0x40, 0x74 }, - { 0x4B, 0xD8 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundBuffer_SetOutputBuffer // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index a7234fbaf..fe8cc965a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -140,28 +140,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetLoopRegion, 4134, 12, { 0x83, 0x0C }, OOVPA_END; -#if 0 // Moved to 3936 -// ****************************************************************** -// * IDirectSoundBuffer8::SetLoopRegion -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 4134, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetLoopRegion ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::SetI3DL2Listener // ****************************************************************** @@ -188,39 +166,6 @@ OOVPA_XREF(CDirectSound_SetI3DL2Listener, 4134, 11, { 0xAA, 0x24 }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_SetI3DL2Listener -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetI3DL2Listener, 4134, 1+11, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSound_SetI3DL2Listener+0x19 : call [CDirectSound::SetI3DL2Listener] - XREF_ENTRY(0x19, XREF_CDirectSound_SetI3DL2Listener), - - // IDirectSound_SetI3DL2Listener+0x04 : push [esp+0x0C] - { 0x04, 0xFF }, - { 0x05, 0x74 }, - { 0x06, 0x24 }, - { 0x07, 0x0C }, - - // IDirectSound_SetI3DL2Listener+0x0E : add eax, 0xFFFFFFF8 - { 0x0E, 0x83 }, - { 0x0F, 0xC0 }, - { 0x10, 0xF8 }, - - // IDirectSound_SetI3DL2Listener+0x13 : sbb ecx, ecx - { 0x13, 0x1B }, - { 0x14, 0xC9 }, - - // IDirectSound_SetI3DL2Listener+0x15 : and ecx, eax - { 0x15, 0x23 }, - { 0x16, 0xC8 }, - OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundVoice_SetHeadroom // ****************************************************************** @@ -278,98 +223,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 4134, 1+8, { 0x47, 0x8B }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetHeadroom -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 4134, 1+7, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetHeadroom+0x15 : call [CDirectSoundBuffer_SetHeadroom] - XREF_ENTRY(0x15, XREF_CDirectSoundBuffer_SetHeadroom), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by CMcpxVoiceClient_SetMixBins -// ****************************************************************** -// * CDirectSoundVoiceSettings::SetMixBins -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 4134, 11, - - XREF_CDirectSoundVoiceSettings_SetMixBins, - XRefZero) - - // CDirectSoundVoiceSettings_SetMixBins+0x06 : jnz +0x1A - { 0x06, 0x75 }, - { 0x07, 0x1A }, - - // CDirectSoundVoiceSettings_SetMixBins+0x08 : test byte ptr [ecx+8], 0x10 - { 0x08, 0xF6 }, - { 0x09, 0x41 }, - { 0x0A, 0x08 }, - { 0x0B, 0x10 }, - - // CDirectSoundVoiceSettings_SetMixBins+0x19 : shr eax, 1 - { 0x19, 0xD1 }, - { 0x1A, 0xE8 }, - - // CDirectSoundVoiceSettings_SetMixBins+0x53 : cmp [ecx+24h], edx - { 0x53, 0x39 }, - { 0x54, 0x51 }, - { 0x55, 0x24 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * CDirectSoundVoice::SetMixBins -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 4134, 1+16, - - XREF_CDirectSoundVoice_SetMixBins, - XRefOne) - - // CDirectSoundVoice_SetMixBins+0x0D : call [CDirectSoundVoiceSettings::SetMixBins] - XREF_ENTRY( 0x0D, XREF_CDirectSoundVoiceSettings_SetMixBins ), - - // CDirectSoundVoice_SetMixBins+0x01 : mov esi, [esp+8] - { 0x01, 0x8B }, - { 0x02, 0x74 }, - { 0x03, 0x24 }, - { 0x04, 0x08 }, - - // CDirectSoundVoice_SetMixBins+0x05 : push [esp+0x0C] - { 0x05, 0xFF }, - { 0x06, 0x74 }, - { 0x07, 0x24 }, - { 0x08, 0x0C }, - - // CDirectSoundVoice_SetMixBins+0x09 : mov ecx, [esi+0x10] - { 0x09, 0x8B }, - { 0x0A, 0x4E }, - { 0x0B, 0x10 }, - - // CDirectSoundVoice_SetMixBins+0x11 : mov ecx, [esi+0x0C] - { 0x11, 0x8B }, - { 0x12, 0x4E }, - { 0x13, 0x0C }, - - // CDirectSoundVoice_SetMixBins+0x1A : retn 0x08 - { 0x1A, 0xC2 }, - { 0x1B, 0x08 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundBuffer::SetMixBins // ****************************************************************** @@ -410,39 +263,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 4134, 1+17, { 0x4C, 0x08 }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetMixBins -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 4134, 1+11, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetMixBins+0x15 : call [CDirectSoundBuffer::SetMixBins] - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetMixBins ), - - // IDirectSoundBuffer_SetMixBins+0x04 : push [esp+0x08] - { 0x04, 0xFF }, - { 0x05, 0x74 }, - { 0x06, 0x24 }, - { 0x07, 0x08 }, - - // IDirectSoundBuffer_SetMixBins+0x0A : add eax, 0xFFFFFFE4 - { 0x0A, 0x83 }, - { 0x0B, 0xC0 }, - { 0x0C, 0xE4 }, - - // IDirectSoundBuffer_SetMixBins+0x0F : sbb ecx, ecx - { 0x0F, 0x1B }, - { 0x10, 0xC9 }, - - // IDirectSoundBuffer_SetMixBins+0x11 : and ecx, eax - { 0x11, 0x23 }, - { 0x12, 0xC8 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound_SetPosition // ****************************************************************** @@ -574,39 +394,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetFrequency, 4134, 1+17, { 0x4C, 0x08 }, OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetFrequency -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFrequency, 4134, 1+11, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetFrequency+0x15 : call [CDirectSound::SetFrequency] - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetFrequency ), - - // IDirectSoundBuffer_SetFrequency+0x04 : push [esp+0x08] - { 0x04, 0xFF }, - { 0x05, 0x74 }, - { 0x06, 0x24 }, - { 0x07, 0x08 }, - - // IDirectSoundBuffer_SetFrequency0x0A : add eax, 0xFFFFFFE4 - { 0x0A, 0x83 }, - { 0x0B, 0xC0 }, - { 0x0C, 0xE4 }, - - // IDirectSoundBuffer_SetFrequency+0x0F : sbb ecx, ecx - { 0x0F, 0x1B }, - { 0x10, 0xC9 }, - - // IDirectSoundBuffer_SetFrequency+0x11 : and ecx, eax - { 0x11, 0x23 }, - { 0x12, 0xC8 }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxVoiceClient_SetVolume // ****************************************************************** @@ -746,35 +533,6 @@ OOVPA_XREF(CMcpxBuffer_SetBufferData, 4134, 9, { 0x8A, 0x08 }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 4134 -// ****************************************************************** -// * CDirectSoundBuffer_SetBufferData -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 4134, 1+9, - - XREF_CDirectSoundBuffer_SetBufferData, - XRefOne) - - // CDirectSoundBuffer_SetBufferData+0x7A : call [CMcpxBuffer::SetBufferData] - XREF_ENTRY( 0x7A, XREF_CMcpxBuffer_SetBufferData), - - // CDirectSoundBuffer_SetBufferData+0x40 : mov eax, 0x80004005 - { 0x40, 0xB8 }, - { 0x41, 0x05 }, - { 0x42, 0x40 }, - { 0x43, 0x00 }, - { 0x44, 0x80 }, - - // CDirectSoundBuffer_SetBufferData+0x5F : jz +0x33 - { 0x5F, 0x74 }, - { 0x60, 0x33 }, - - // CDirectSoundBuffer_SetBufferData+0xAB : retn 0x0C - { 0xAB, 0xC2 }, - { 0xAC, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetBufferData // ****************************************************************** @@ -930,33 +688,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 4134, 1+10, { 0x4F, 0x08 }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSoundBuffer_SetCurrentPosition -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 4134, 1+7, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetCurrentPosition+0x15 : call [CDirectSoundBuffer::SetCurrentPosition] - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetCurrentPosition), - - // IDirectSoundBuffer_SetCurrentPosition+0x0A : add eax, 0xFFFFFFE4 - { 0x0A, 0x83 }, - { 0x0B, 0xC0 }, - { 0x0C, 0xE4 }, - - // IDirectSoundBuffer_SetCurrentPosition+0x0F : sbb ecx, ecx - { 0x0F, 0x1B }, - { 0x10, 0xC9 }, - - // IDirectSoundBuffer_SetCurrentPosition+0x11 : and ecx, eax - { 0x11, 0x23 }, - { 0x12, 0xC8 }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxBuffer_GetCurrentPosition // ****************************************************************** @@ -1033,31 +764,6 @@ OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 4134, 1+10, { 0x53, 0x0C }, OOVPA_END; -#if 0 // Replaced with better OOVPA 4134 -// ****************************************************************** -// * CDirectSoundBuffer::Play -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 1+11, - - XREF_CDirectSoundBuffer_Play, - XRefOne) - - XREF_ENTRY(0x35, XREF_CMcpxBuffer_Play), - - { 0x05, 0xFF }, - { 0x0D, 0x0F }, - { 0x13, 0xF6 }, - { 0x1B, 0xFF }, - { 0x26, 0xEB }, - { 0x2C, 0x8B }, - { 0x2F, 0x57 }, - { 0x30, 0xFF }, - { 0x31, 0x74 }, - { 0x32, 0x24 }, - { 0x33, 0x18 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::SetDistanceFactor // ****************************************************************** @@ -1094,38 +800,6 @@ OOVPA_XREF(CDirectSound_SetDistanceFactor, 4134, 17, { 0x50, 0x0B }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_SetDistanceFactor -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetDistanceFactor, 4134, 1+10, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSound_SetDistanceFactor+0x1D : call [CDirectSound::SetDistanceFactor] - XREF_ENTRY( 0x1D, XREF_CDirectSound_SetDistanceFactor ), - - // IDirectSound_SetDistanceFactor+0x04 : fld [esp+0x0C] - { 0x04, 0xD9 }, - { 0x05, 0x44 }, - { 0x06, 0x24 }, - { 0x07, 0x0C }, - - // IDirectSound_SetDistanceFactor+0x0C : push ecx - { 0x0C, 0x51 }, - - // IDirectSound_SetDistanceFactor+0x12 : add eax, 0xFFFFFFF8 - { 0x12, 0x83 }, - { 0x13, 0xC0 }, - { 0x14, 0xF8 }, - - // IDirectSound_SetDistanceFactor+0x21 : retn 0x0C - { 0x21, 0xC2 }, - { 0x22, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::SetRolloffFactor // ****************************************************************** @@ -1162,38 +836,6 @@ OOVPA_XREF(CDirectSound_SetRolloffFactor, 4134, 17, { 0x50, 0x0B }, OOVPA_END; -#if 0 // Duplicate OOVPA, using 3911 OOVPA instead -// ****************************************************************** -// * IDirectSound_SetRolloffFactor -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetRolloffFactor, 4134, 1+10, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSound_SetRolloffFactor+0x1D : call [CDirectSound::SetRolloffFactor] - XREF_ENTRY( 0x1D, XREF_CDirectSound_SetRolloffFactor ), - - // IDirectSound_SetRolloffFactor+0x04 : fld [esp+0x0C] - { 0x04, 0xD9 }, - { 0x05, 0x44 }, - { 0x06, 0x24 }, - { 0x07, 0x0C }, - - // IDirectSound_SetRolloffFactor+0x0C : push ecx - { 0x0C, 0x51 }, - - // IDirectSound_SetRolloffFactor+0x12 : add eax, 0xFFFFFFF8 - { 0x12, 0x83 }, - { 0x13, 0xC0 }, - { 0x14, 0xF8 }, - - // IDirectSound_SetRolloffFactor+0x21 : retn 0x0C - { 0x21, 0xC2 }, - { 0x22, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::SetDopplerFactor // ****************************************************************** @@ -1225,38 +867,6 @@ OOVPA_XREF(CDirectSound_SetDopplerFactor, 4134, 14, { 0x50, 0x0B }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetDopplerFactor, 4134, 1+10, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSound_SetDopplerFactor+0x1D : call [CDirectSound::SetDopplerFactor] - XREF_ENTRY( 0x1D, XREF_CDirectSound_SetDopplerFactor), - - // IDirectSound_SetDopplerFactor+0x04 : fld [esp+0x0C] - { 0x04, 0xD9 }, - { 0x05, 0x44 }, - { 0x06, 0x24 }, - { 0x07, 0x0C }, - - // IDirectSound_SetDopplerFactor+0x0C : push ecx - { 0x0C, 0x51 }, - - // IDirectSound_SetDopplerFactor+0x12 : add eax, 0xFFFFFFF8 - { 0x12, 0x83 }, - { 0x13, 0xC0 }, - { 0x14, 0xF8 }, - - // IDirectSound_SetDopplerFactor+0x21 : retn 0x0C - { 0x21, 0xC2 }, - { 0x22, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::CommitDeferredSettings // ****************************************************************** @@ -1343,35 +953,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 4134, 1+10, { 0x55, 0x00 } OOVPA_END; -#if 0 // No longer used, replaced by generic 3936 version -// ****************************************************************** -// * IDirectSoundBuffer_SetMaxDistance -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 4134, 1+9, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetMaxDistance+0x1C : call [CDirectSoundBuffer::SetMaxDistance] - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetMaxDistance ), - - // IDirectSoundBuffer_SetMaxDistance+0x04 : fld [esp+4+arg_4] - { 0x04, 0xD9 }, - { 0x05, 0x44 }, - { 0x06, 0x24 }, - { 0x07, 0x0C }, - - // IDirectSoundBuffer_SetMaxDistance+0x12 : add eax, 0FFFFFFE4 - { 0x12, 0x83 }, - { 0x13, 0xC0 }, - { 0x14, 0xE4 }, - - // IDirectSoundBuffer_SetMaxDistance+0x21 : retn 0Ch - { 0x22, 0x0C }, - { 0x23, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundStream_SetMaxDistance // ****************************************************************** @@ -1453,35 +1034,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 4134, 1+10, { 0x55, 0x00 } OOVPA_END; -#if 0 // No longer used, replaced by generic 3936 version -// ****************************************************************** -// * IDirectSoundBuffer_SetMinDistance -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 4134, 1+9, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetMinDistance+0x1C : call [CDirectSoundBuffer::SetMinDistance] - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetMinDistance ), - - // IDirectSoundBuffer_SetMinDistance+0x04 : fld [esp+4+arg_4] - { 0x04, 0xD9 }, - { 0x05, 0x44 }, - { 0x06, 0x24 }, - { 0x07, 0x0C }, - - // IDirectSoundBuffer_SetMinDistance+0x12 : add eax, 0FFFFFFE4 - { 0x12, 0x83 }, - { 0x13, 0xC0 }, - { 0x14, 0xE4 }, - - // IDirectSoundBuffer_SetMinDistance+0x21 : retn 0Ch - { 0x22, 0x0C }, - { 0x23, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundStream_SetMinDistance // ****************************************************************** @@ -1726,32 +1278,6 @@ OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 4134, 12, { 0x30, 0x10 }, // SetConeAngles 0x10 vs SetRolloffCurve 0x04 OOVPA_END; -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * CDirectSoundVoice::SetConeAngles -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 4134, 9, - - XREF_CDirectSoundVoice_SetConeAngles, - XRefZero) - - // CDirectSoundVoice_SetConeAngles+0x0D : mov edx, [esp+arg_4] - { 0x0D, 0x8B }, - { 0x0E, 0x54 }, - { 0x0F, 0x24 }, - { 0x10, 0x08 }, - - // CDirectSoundVoice_SetConeAngles+0x11 : mov [ecx+1Ch], edx - { 0x11, 0x89 }, - { 0x12, 0x51 }, - { 0x13, 0x1C }, - - // CDirectSoundVoice_SetConeAngles+0x40 : retn 10h - { 0x41, 0x10 }, - { 0x42, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundBuffer::SetConeAngles // ****************************************************************** @@ -1783,35 +1309,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 4134, 1+11, { 0x55, 0x00 } OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetConeAngles -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 4134, 1+9, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetConeAngles+0x1C : call [CDirectSoundBuffer::SetConeAngles] - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetConeAngles ), - - // IDirectSoundBuffer_SetConeAngles+0x04 : mov eax, [esp+4+arg_0] - { 0x04, 0x8B }, - { 0x05, 0x44 }, - { 0x06, 0x24 }, - { 0x07, 0x08 }, - - // IDirectSoundBuffer_SetConeAngles+0x12 : add eax, 0FFFFFFE4 - { 0x12, 0x83 }, - { 0x13, 0xC0 }, - { 0x14, 0xE4 }, - - // IDirectSoundBuffer_SetConeAngles+0x21 : retn 10h - { 0x22, 0x10 }, - { 0x23, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundVoice_SetConeOrientation // ****************************************************************** @@ -1842,31 +1339,6 @@ OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 4134, 12, { 0x32, 0x2C }, // SetConeOrientation vs SetPosition vs SetVelocity OOVPA_END; -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * CDirectSoundVoice::SetConeOrientation -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 4134, 8, - - XREF_CDirectSoundVoice_SetConeOrientation, - XRefZero) - - // CDirectSoundVoice_SetConeOrientation+0x0F : mov edx, [ebp+arg_4] - { 0x0F, 0x8B }, - { 0x10, 0x55 }, - { 0x11, 0x0C }, - - // CDirectSoundVoice_SetConeOrientation+0x12 : mov [ecx+24h], edx - { 0x12, 0x89 }, - { 0x13, 0x51 }, - { 0x14, 0x24 }, - - // CDirectSoundVoice_SetConeOrientation+0x4F : retn 14h - { 0x50, 0x14 }, - { 0x51, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundBuffer::SetConeOrientation // ****************************************************************** @@ -2107,31 +1579,6 @@ OOVPA_XREF(CDirectSoundVoice_SetVelocity, 4134, 12, { 0x32, 0x18 }, // SetConeOrientation vs SetPosition vs SetVelocity OOVPA_END; -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * CDirectSoundVoice::SetVelocity -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVelocity, 4134, 8, - - XREF_CDirectSoundVoice_SetVelocity, - XRefZero) - - // CDirectSoundVoice_SetVelocity+0x0F : mov edx, [ebp+arg_4] - { 0x0F, 0x8B }, - { 0x10, 0x55 }, - { 0x11, 0x0C }, - - // CDirectSoundVoice_SetVelocity+0x12 : mov [ecx+10h], edx - { 0x12, 0x89 }, - { 0x13, 0x51 }, - { 0x14, 0x10 }, - - // CDirectSoundVoice_SetVelocity+0x4F : retn 14h - { 0x50, 0x14 }, - { 0x51, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundBuffer::SetVelocity // ****************************************************************** @@ -2326,35 +1773,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetI3DL2Source, 4134, 1+11, { 0x51, 0x00 } OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetI3DL2Source -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 4134, 1+9, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetI3DL2Source+0x18 : call [CDirectSoundBuffer::SetI3DL2Source] - XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetI3DL2Source ), - - // IDirectSoundBuffer_SetI3DL2Source+0x04 : push [esp+arg_8] - { 0x04, 0xFF }, - { 0x05, 0x74 }, - { 0x06, 0x24 }, - { 0x07, 0x0C }, - - // IDirectSoundBuffer_SetI3DL2Source+0x0E : add eax, 0FFFFFFE4h - { 0x0E, 0x83 }, - { 0x0F, 0xC0 }, - { 0x10, 0xE4 }, - - // IDirectSoundBuffer_SetI3DL2Source+0x1D : retn 0Ch - { 0x1E, 0x0C }, - { 0x1F, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundStream_SetI3DL2Source // ****************************************************************** @@ -2375,33 +1793,6 @@ OOVPA_XREF(CDirectSoundStream_SetI3DL2Source, 4134, 1+8, { 0x4F, 0x8B }, OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer_Stop -// ****************************************************************** -OOVPA_NO_XREF(IDirectSoundBuffer_Stop, 4134, 11) - - // IDirectSoundBuffer_Stop+0x00 : mov eax, [esp+arg_0] - { 0x00, 0x8B }, - { 0x01, 0x44 }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, - - // IDirectSoundBuffer_Stop+0x04 : mov ecx, eax - { 0x04, 0x8B }, - { 0x05, 0xC8 }, - - // IDirectSoundBuffer_Stop+0x06 : add eax, 0FFFFFFE4h - { 0x06, 0x83 }, - { 0x07, 0xC0 }, - { 0x08, 0xE4 }, - - // IDirectSoundBuffer_Stop+0x15 : retn 4 - { 0x16, 0x04 }, - { 0x17, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetAllParameters // ****************************************************************** @@ -2429,26 +1820,6 @@ OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 4134, 14, { 0x8C, 0x00 }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetAllParameters -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 4134, 8, - - XREF_CDirectSoundVoice_SetAllParameters, - XRefZero) - - { 0x1E, 0x92 }, - { 0x3E, 0x00 }, - { 0x5E, 0x00 }, - { 0x7E, 0x89 }, - { 0x9E, 0x28 }, - { 0xBE, 0x41 }, - { 0xDE, 0x8B }, - { 0xFE, 0x10 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetAllParameters // ****************************************************************** @@ -2469,28 +1840,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetAllParameters, 4134, 1+8, { 0x4B, 0x8B }, OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetAllParameters -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetAllParameters, 4134, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetAllParameters ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundStream_SetAllParameters // ****************************************************************** @@ -2511,34 +1860,6 @@ OOVPA_XREF(CDirectSoundStream_SetAllParameters, 4134, 1+8, { 0x4F, 0x8B }, OOVPA_END; -#if 0 //Replaced by generic 3911 -// ****************************************************************** -// * IDirectSoundBuffer_GetStatus -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetStatus, 4134, 1+8, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_GetStatus+0x15 : call [CDirectSoundBuffer::GetStatus] - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_GetStatus), - - // IDirectSoundBuffer_GetStatus+0x04 : push [esp+0x08] - { 0x04, 0xFF }, - { 0x05, 0x74 }, - { 0x06, 0x24 }, - { 0x07, 0x08 }, - - // IDirectSoundBuffer_GetStatus+0x0F : sbb ecx, ecx - { 0x0F, 0x1B }, - { 0x10, 0xC9 }, - - // IDirectSoundBuffer_GetStatus+0x11 : and ecx, eax - { 0x11, 0x23 }, - { 0x12, 0xC8 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetMode // ****************************************************************** @@ -2587,28 +1908,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetMode, 4134, 1+8, { 0x4B, 0x8B }, OOVPA_END; -#if 0 // Duplicate OOVPA, replacing with generic 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetMode -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMode, 4134, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetMode ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundStream_SetMode // ****************************************************************** @@ -2661,46 +1960,6 @@ OOVPA_XREF(CMcpxVoiceClient_SetFilter, 4134, 12, //NOTE: Before offset 0x65, there has been no changes throughout all revisions. OOVPA_END; -#if 0 // Replaced with generic OOVPA 4134, see above -// ****************************************************************** -// * DirectSound::CMcpxVoiceClient::SetFilter -// ****************************************************************** -OOVPA_XREF(CMcpxVoiceClient_SetFilter, 4134, 8, - - XREF_CMcpxVoiceClient_SetFilter, - XRefZero) - - { 0x1E, 0xFF }, - { 0x3E, 0x73 }, - { 0x5E, 0x3E }, - { 0x7E, 0x0B }, - { 0x9E, 0xF6 }, - { 0xBE, 0x89 }, - { 0xDE, 0x0F }, - { 0xFE, 0xB7 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetFilter -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetFilter, 4134, 1+6, - - XREF_CDirectSoundVoice_SetFilter, - XRefOne) - - XREF_ENTRY( 0x0C, XREF_CMcpxVoiceClient_SetFilter ), - - { 0x01, 0x44 }, - { 0x04, 0xFF }, - { 0x07, 0x08 }, - { 0x0A, 0x0C }, - { 0x10, 0xC2 }, - { 0x11, 0x08 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetFilter // ****************************************************************** @@ -2721,27 +1980,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetFilter, 4134, 1+8, { 0x47, 0x8B }, OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetFilter -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFilter, 4134, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetFilter ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::SetVelocity // ****************************************************************** @@ -2777,24 +2015,6 @@ OOVPA_XREF(CDirectSound_SetVelocity, 4134, 16, { 0x74, 0x14 }, OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetPitch -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetPitch, 4134, 6, - - XREF_DSBUFFERSETPITCHB, - XRefZero) - - { 0x02, 0x24 }, - { 0x06, 0x10 }, - { 0x0A, 0x08 }, - { 0x0E, 0x8B }, - { 0x16, 0xC2 }, - { 0x17, 0x08 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetPitch // ****************************************************************** @@ -2869,27 +2089,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetVolume, 4134, 1+11, { 0x4C, 0x08 }, OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer8::SetVolume -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVolume, 4134, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetVolume ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::CreateSoundStream // ****************************************************************** @@ -2982,46 +2181,6 @@ OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBinVolumes, 4134, 10, { 0x23, 0x04 }, OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * CDirectSoundVoice::SetMixBinVolumes -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 4134, 1+16, - - XREF_CDirectSoundVoice_SetMixBinVolumes, - XRefOne) - - // CDirectSoundVoice_SetMixBinVolumes+0x0D : call [CDirectSoundVoiceSettings::SetMixBinVolumes] - XREF_ENTRY( 0x0D, XREF_CDirectSoundVoiceSettings_SetMixBinVolumes ), - - // CDirectSoundVoice_SetMixBinVolumes+0x01 : mov esi, [esp+8] - { 0x01, 0x8B }, - { 0x02, 0x74 }, - { 0x03, 0x24 }, - { 0x04, 0x08 }, - - // CDirectSoundVoice_SetMixBinVolumes+0x05 : push [esp+0x0C] - { 0x05, 0xFF }, - { 0x06, 0x74 }, - { 0x07, 0x24 }, - { 0x08, 0x0C }, - - // CDirectSoundVoice_SetMixBinVolumes+0x09 : mov ecx, [esi+0x10] - { 0x09, 0x8B }, - { 0x0A, 0x4E }, - { 0x0B, 0x10 }, - - // CDirectSoundVoice_SetMixBinVolumes+0x11 : mov ecx, [esi+0x0C] - { 0x11, 0x8B }, - { 0x12, 0x4E }, - { 0x13, 0x0C }, - - // CDirectSoundVoice_SetMixBinVolumes+0x1A : retn 0x08 - { 0x1A, 0xC2 }, - { 0x1B, 0x08 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundBuffer::SetMixBinVolumes // ****************************************************************** @@ -3062,64 +2221,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetMixBinVolumes, 4134, 1+17, { 0x4C, 0x08 }, OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetMixBinVolumes_8 -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBinVolumes_8, 4134, 1+11, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetMixBinVolumes_8+0x15 : call [CDirectSoundBuffer::SetMixBinVolumes] - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetMixBinVolumes ), - - // IDirectSoundBuffer_SetMixBinVolumes_8+0x04 : push [esp+0x08] - { 0x04, 0xFF }, - { 0x05, 0x74 }, - { 0x06, 0x24 }, - { 0x07, 0x08 }, - - // IDirectSoundBuffer_SetMixBinVolumes_8+0x0A : add eax, 0xFFFFFFE4 - { 0x0A, 0x83 }, - { 0x0B, 0xC0 }, - { 0x0C, 0xE4 }, - - // IDirectSoundBuffer_SetMixBinVolumes_8+0x0F : sbb ecx, ecx - { 0x0F, 0x1B }, - { 0x10, 0xC9 }, - - // IDirectSoundBuffer_SetMixBinVolumes_8+0x11 : and ecx, eax - { 0x11, 0x23 }, - { 0x12, 0xC8 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * CDirectSoundStream_SetMixBinVolumes_8 -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_8, 4134, 1+11, - - XREF_CDirectSoundStream_SetMixBinVolumes_8, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetMixBinVolumes ), - - { 0x0D, 0x0F }, - { 0x0E, 0xB6 }, - { 0x0F, 0xF0 }, - { 0x21, 0xB8 }, - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - { 0x4F, 0xC2 }, - { 0x50, 0x08 }, - { 0x51, 0x00 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound_SetEffectData // ****************************************************************** @@ -3150,32 +2251,6 @@ OOVPA_XREF(CDirectSound_SetEffectData, 4134, 14, // Also for 5849 { 0x60, 0x18 }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_SetEffectData -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetEffectData, 4134, 1+12, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x22, XREF_CDirectSound_SetEffectData ), - - { 0x04, 0x75 }, - { 0x0F, 0x75 }, - { 0x18, 0xD9 }, - { 0x19, 0xFF }, - { 0x1A, 0x75 }, - { 0x1B, 0x0C }, - { 0x1C, 0x1B }, - { 0x1D, 0xC9 }, - { 0x1E, 0x23 }, - { 0x1F, 0xC8 }, - { 0x26, 0x5D }, - { 0x28, 0x18 }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxBuffer_Stop // ****************************************************************** @@ -3674,36 +2749,6 @@ OOVPA_XREF(CDirectSound_SetAllParameters, 4134, 15, { 0x34, 0x24 }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * CDirectSound::SetAllParameters -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParameters, 4134, 11, - - XREF_CDirectSound_SetAllParameters, - XRefZero) - - { 0x00, 0x56 }, - { 0x0D, 0x0F }, - - { 0x42, 0xD9 }, - { 0x43, 0x5A }, - { 0x44, 0x3C }, - - { 0x4B, 0xD9 }, - { 0x4C, 0x5A }, - { 0x4D, 0x40 }, - - { 0x54, 0xD9 }, - { 0x55, 0x5A }, - { 0x56, 0x44 }, - - // Removed both OVs to support 4361 titles - //{ 0xE3, 0xC2 }, - //{ 0xE4, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundStream_GetInfo // ****************************************************************** @@ -3777,33 +2822,6 @@ OOVPA_XREF(CMcpxStream_Flush, 4134, 18, { 0x85, 0x50 }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * CMcpxStream_Flush -// ****************************************************************** -OOVPA_XREF(CMcpxStream_Flush, 4134, 10, - - XREF_CMcpxStream_Flush, - XRefZero) - - { 0x00, 0x55 }, - { 0x01, 0x8B }, - - { 0x12, 0x33 }, - - { 0x3D, 0x83 }, - { 0x3E, 0xFE }, - { 0x3F, 0x04 }, - - { 0x56, 0xE8 }, - - { 0x67, 0xE8 }, - - { 0xD0, 0xC9 }, - { 0xD1, 0xC3 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundStream_Flush // ****************************************************************** @@ -4125,34 +3143,6 @@ OOVPA_XREF(CDirectSound_SetMixBinHeadroom, 4134, 18, { 0x5D, 0x0C }, OOVPA_END; -#if 0 // Moved to 4242 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetNotificationPositions -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetNotificationPositions, 4242, 11, - - XREF_CDirectSoundBuffer_SetNotificationPositions, - XRefZero) - - // CDirectSoundBuffer_SetNotificationPositions+0x00 : push ebx - { 0x00, 0x53 }, - - { 0x0C, 0x00 }, - { 0x1B, 0xFF }, - { 0x25, 0x80 }, - - { 0x2C, 0x0C }, - { 0x2D, 0x8B }, - { 0x2E, 0x4E }, - { 0x2F, 0x1C }, - - { 0x30, 0x57 }, - - { 0x47, 0xE8 }, - { 0x5D, 0x8B }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundStream::SetFrequency // ****************************************************************** @@ -4279,36 +3269,6 @@ OOVPA_XREF(CMcpxBuffer_Play, 4134, 13, { 0x33, 0x02 }, OOVPA_END; -#if 0 // Moved to 4039 -// ****************************************************************** -// * public: long __thiscall DirectSound::CMcpxBuffer::Play(__int64,unsigned long) -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play_Ex, 4134, 1+8, - - XREF_CMcpxBuffer_Play_Ex, - XRefOne) - - // CMcpxBuffer_Play_Ex+0x2B : call [CMcpxBuffer::Play] - XREF_ENTRY( 0x2B, XREF_CMcpxBuffer_Play ), - - // CMcpxBuffer_Play_Ex+0x00 : push ebp - { 0x00, 0x55 }, - - // CMcpxBuffer_Play_Ex+0x11 : push [ebp+arg_8] - { 0x11, 0xFF }, - { 0x12, 0x75 }, - { 0x13, 0x10 }, - - // CMcpxBuffer_Play_Ex+0x23 : jnz +0x0C - { 0x23, 0x75 }, - { 0x24, 0x0C }, - - // CMcpxBuffer_Play_Ex+0x36 : push esi - { 0x36, 0xC2 }, - { 0x37, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundBuffer_Play // ****************************************************************** @@ -4759,24 +3719,6 @@ OOVPA_NO_XREF(XAudioDownloadEffectsImage, 4134, 12) { 0x6A, 0x8B }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * XAudioDownloadEffectsImage -// ****************************************************************** -// TODO: Need to evaluate with 5558 title, I believe it needs more OVs. -OOVPA_NO_XREF(XAudioDownloadEffectsImage, 4134, 8) - - { 0x1E, 0xB6 }, - { 0x41, 0x83 }, - { 0x61, 0x8B }, - { 0x80, 0x85 }, - { 0x9E, 0x8B }, - { 0xBE, 0x6A }, - { 0xDE, 0x07 }, - { 0xFE, 0xF7 }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxVoiceClient::SetMixBins // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl index 65f0b2278..2d3af442c 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl @@ -32,90 +32,6 @@ // * // ****************************************************************** -#if 0 // Moved to 4039 -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetFormat -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetFormat, 4242, 8, - - XREF_CDirectSoundVoice_SetFormat, - XRefZero) - - { 0x07, 0x4E }, - { 0x10, 0xE8 }, - { 0x19, 0xD8 }, - { 0x22, 0xFF }, - { 0x2B, 0x0C }, - { 0x34, 0xFF }, - { 0x3F, 0x8B }, - { 0x46, 0x00 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetFormat -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetFormat, 4242, 1+7, - - XREF_CDirectSoundBuffer_SetFormat, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetFormat ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetFormat -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFormat, 4242, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetFormat ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetFormat -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFormat, 4242, 1+8, - - XREF_CDirectSoundStream_SetFormat, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetFormat ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxVoiceClient::SetLFO // ****************************************************************** @@ -141,47 +57,6 @@ OOVPA_XREF(CMcpxVoiceClient_SetLFO, 4242, 12, { 0x51, 0x4E }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4242 version -// ****************************************************************** -// * CMcpxVoiceClient::SetLFO -// ****************************************************************** -OOVPA_XREF(CMcpxVoiceClient_SetLFO, 4242, 8, - - XREF_CMcpxVoiceClient_SetLFO, - XRefZero) - - { 0x1E, 0x48 }, - { 0x3E, 0x31 }, - { 0x5E, 0x35 }, - { 0x7E, 0xE1 }, - { 0x9E, 0x8B }, - { 0xBE, 0x8B }, - { 0xDE, 0x05 }, - { 0xFE, 0x6C }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * CDirectSoundBuffer::SetLFO -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetLFO, 4242, 1+7, - - XREF_CDirectSoundBuffer_SetLFO, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetLFO ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxVoiceClient::SetEG // ****************************************************************** @@ -209,47 +84,6 @@ OOVPA_XREF(CMcpxVoiceClient_SetEG, 4242, 14, { 0x51, 0x24 }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4242 version -// ****************************************************************** -// * CMcpxVoiceClient::SetEG -// ****************************************************************** -OOVPA_XREF(CMcpxVoiceClient_SetEG, 4242, 8, - - XREF_CMcpxVoiceClient_SetEG, - XRefZero) - - { 0x1E, 0x75 }, - { 0x3E, 0x0F }, - { 0x5E, 0xE3 }, - { 0x7E, 0x4E }, - { 0x9E, 0x40 }, - { 0xBE, 0x50 }, - { 0xDE, 0x1C }, - { 0xFE, 0x1C }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * CDirectSoundBuffer::SetEG -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetEG, 4242, 1+7, - - XREF_CDirectSoundBuffer_SetEG, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetEG ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxBuffer_Stop // ****************************************************************** @@ -275,52 +109,6 @@ OOVPA_XREF(CMcpxBuffer_Stop, 4242, 9, { 0x1D, 0x02 }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * CMcpxStream_Flush -// ****************************************************************** -OOVPA_XREF(CMcpxStream_Flush, 4242, 10, - - XREF_CMcpxStream_Flush, - XRefZero) - - { 0x00, 0x55 }, - { 0x01, 0x8B }, - - { 0x12, 0x33 }, - - { 0x3D, 0x83 }, - { 0x3E, 0xFE }, - { 0x3F, 0x05 }, - - { 0x56, 0xE8 }, - - { 0x67, 0xE8 }, - - // Might not be a requirement? Aka comment this out might will enable support detection later XDK revisions. - { 0xD1, 0xC9 }, - { 0xD2, 0xC3 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundStream_SetFormat -// ****************************************************************** -// Generic OOVPA as of 4___ and newer -OOVPA_XREF(IDirectSoundStream_SetFormat, 4242, 1+1, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundStream_SetFormat+0x00 : jmp [CDirectSoundStream_SetFormat] - XREF_ENTRY(0x01, XREF_CDirectSoundStream_SetFormat ), - - // IDirectSoundStream_SetFormat+0x00 : jmp 0x........ - { 0x00, 0xE9 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetNotificationPositions // ****************************************************************** @@ -508,37 +296,3 @@ OOVPA_XREF(DirectSoundUseLightHRTF, 4242, 1+8, { 0x1B, 0x0B }, { 0x1C, 0x68 }, OOVPA_END; - -#if 0 // No longer used, replaced by generic 4039 version -// ****************************************************************** -// * WaveFormat::CreateXboxAdpcmFormat -// ****************************************************************** -OOVPA_XREF(WaveFormat_CreateXboxAdpcmFormat, 4242, 7, - - XREF_WaveFormat_CreateXboxAdpcmFormat, - XRefZero) - - { 0x07, 0x08 }, - { 0x10, 0xE9 }, - { 0x19, 0x8D }, - { 0x22, 0x66 }, - { 0x2B, 0x04 }, - { 0x34, 0x66 }, - { 0x3D, 0x12 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * XAudioCreateAdpcmFormat -// ****************************************************************** -OOVPA_XREF(XAudioCreateAdpcmFormat, 4242, 1+1, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x01, XREF_WaveFormat_CreateXboxAdpcmFormat ), - - { 0x00, 0xE9 }, -OOVPA_END; -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index 49b2f8973..8365991a5 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -52,89 +52,6 @@ OOVPA_NO_XREF(DirectSoundGetSampleTime, 4361, 8) { 0x0F, 0xC3 }, OOVPA_END; -#if 0 // Accurately CDirectSound_CreateSoundBuffer used 4134 -// ****************************************************************** -// * IDirectSound_CreateSoundBuffer -// ****************************************************************** -OOVPA_NO_XREF(IDirectSound_CreateSoundBuffer, 4361, 9) - - // IDirectSound_CreateSoundBuffer+0x2A : push 0x24 - { 0x2A, 0x6A }, - { 0x2B, 0x24 }, - - // IDirectSound_CreateSoundBuffer+0x3C : call [addr] - { 0x3C, 0xE8 }, - - // IDirectSound_CreateSoundBuffer+0x4A : and esi, 0x7FF8FFF2 - { 0x4A, 0x81 }, - { 0x4B, 0xE6 }, - { 0x4C, 0xF2 }, - { 0x4D, 0xFF }, - { 0x4E, 0xF8 }, - { 0x4F, 0x7F }, -OOVPA_END; -#endif - -#if 0 // Replaced with OOVPA 4134 -// ****************************************************************** -// * CMcpxStream_Pause -// ****************************************************************** -OOVPA_XREF(CMcpxStream_Pause, 4361, 11, - - XREF_CMcpxStream_Pause, - XRefZero) - - // CMcpxStream_Pause+0x1E : or eax, 4 - { 0x1E, 0x83 }, - { 0x1F, 0xC8 }, - { 0x20, 0x04 }, - - // CMcpxStream_Pause+0x21 : jmp +0x0D - { 0x21, 0xEB }, - { 0x22, 0x0D }, - - // CMcpxStream_Pause+0x29 : movzx eax, word ptr [esi+0x12] - { 0x29, 0x0F }, - { 0x2A, 0xB7 }, - { 0x2B, 0x46 }, - { 0x2C, 0x12 }, - - // CMcpxStream_Pause+0x44 : retn 0x04 - { 0x44, 0xC2 }, - { 0x45, 0x04 }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 4134 -// ****************************************************************** -// * CDirectSoundStream_Pause -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Pause, 4361, 1+10, - - XRefNoSaveIndex, - XRefOne) - - // CDirectSoundStream_Pause+0x35 : call [CMcpxStream::Pause] - XREF_ENTRY( 0x35, XREF_CMcpxStream_Pause ), - - // CDirectSoundStream_Pause+0x21 : mov eax, 0x80004005 - { 0x21, 0xB8 }, - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // CDirectSoundStream_Pause+0x2C : mov ecx, [eax+0x24] - { 0x2C, 0x8B }, - { 0x2D, 0x48 }, - { 0x2E, 0x24 }, - - // CDirectSoundStream_Pause+0x4E : retn 0x08 - { 0x4E, 0xC2 }, - { 0x4F, 0x08 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CMcpxStream::Pause2 // ****************************************************************** @@ -206,28 +123,6 @@ OOVPA_XREF(IDirectSoundStream_PauseEx, 4361, 1+7, { 0x16, 0x10 }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetPlayRegion -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPlayRegion, 4361, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetPlayRegion ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * public: long __thiscall DirectSound::CMcpxBuffer::Play(unsigned long) // ****************************************************************** @@ -256,312 +151,6 @@ OOVPA_XREF(CMcpxBuffer_Play, 4361, 11, { 0x73, 0x18 }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSoundBuffer_Play -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Play, 4361, 1+8, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_Play+0x1D : call [CDirectSoundBuffer::Play] - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_Play ), - - // IDirectSoundBuffer_Play+0x0E : push [esp+0x10] - { 0x0E, 0xFF }, - { 0x0F, 0x74 }, - { 0x10, 0x24 }, - { 0x11, 0x10 }, - - // IDirectSoundBuffer_Play+0x17 : sbb ecx, ecx - { 0x17, 0x1B }, - { 0x18, 0xC9 }, - - // IDirectSoundBuffer_Play+0x19 : and ecx, eax - { 0x19, 0x23 }, - { 0x1A, 0xC8 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4242 -// ****************************************************************** -// * CMcpxBuffer_Stop -// ****************************************************************** - -OOVPA_XREF(CMcpxBuffer_Stop, 4361, 9, - - XREF_CMcpxBuffer_Stop, - XRefZero) - - // CMcpxBuffer_Stop+0x0E : cmp al, 3 - { 0x0E, 0x3C }, - { 0x0F, 0x03 }, - - // CMcpxBuffer_Stop+0x17 : jz +0x2A - { 0x17, 0x74 }, - { 0x18, 0x2A }, - - // CMcpxBuffer_Stop+0x19 : test [esp+0Ch+arg_0], 2 - { 0x19, 0xF6 }, - { 0x1A, 0x44 }, - { 0x1B, 0x24 }, - { 0x1C, 0x10 }, - { 0x1D, 0x02 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * CDirectSoundBuffer_Stop -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Stop, 4361, 1+9, - - XREF_CDirectSoundBuffer_Stop, - XRefOne) - - // CDirectSoundBuffer_Stop+0x33 : call [CMcpxBuffer::Stop] - XREF_ENTRY( 0x33, XREF_CMcpxBuffer_Stop), - - // CDirectSoundBuffer_Stop+0x21 : mov eax, 0x80004005 - { 0x21, 0xB8 }, - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // CDirectSoundBuffer_Stop+0x3B : jz +0x0B - { 0x3B, 0x74 }, - { 0x3C, 0x0B }, - - // CDirectSoundBuffer_Stop+0x4C : retn 0x04 - { 0x4C, 0xC2 }, - { 0x4D, 0x04 }, -OOVPA_END; -#endif - -#if 0 //Using generic 3911 -// ****************************************************************** -// * IDirectSoundBuffer_Stop -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Stop, 4361, 1+7, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_Stop+0x11 : call [CDirectSoundBuffer::Stop] - XREF_ENTRY( 0x11, XREF_CDirectSoundBuffer_Stop), - - // IDirectSoundBuffer_Stop+0x06 : and eax, 0xFFFFFFE4 - { 0x06, 0x83 }, - { 0x07, 0xC0 }, - { 0x08, 0xE4 }, - - // IDirectSoundBuffer_Stop+0x0B : sbb ecx, ecx - { 0x0B, 0x1B }, - { 0x0C, 0xC9 }, - - // IDirectSoundBuffer_Stop+0x0D : and ecx, eax - { 0x0D, 0x23 }, - { 0x0E, 0xC8 }, -OOVPA_END; -#endif - -#if 0 // Used 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundVoiceSettings::SetMixBinVolumes -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBinVolumes, 4361, 7, - - XREF_CDirectSoundVoiceSettings_SetMixBinVolumes, - XRefZero) - - { 0x03, 0x24 }, - { 0x08, 0x16 }, - { 0x0D, 0x46 }, - { 0x12, 0x8B }, - { 0x17, 0x42 }, - { 0x1C, 0x3B }, - { 0x21, 0x5E }, -OOVPA_END; -#endif - -#if 0 // Used 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMixBinVolumes -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 4361, 1+7, - - XREF_CDirectSoundVoice_SetMixBinVolumes, - XRefOne) - - XREF_ENTRY( 0x0D, XREF_CDirectSoundVoiceSettings_SetMixBinVolumes ), - - { 0x02, 0x74 }, - { 0x06, 0x74 }, - { 0x0A, 0x4E }, - { 0x11, 0x8B }, - { 0x12, 0x4E }, - { 0x19, 0x5E }, - { 0x1A, 0xC2 }, -OOVPA_END; -#endif - -#if 0 // Used 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetMixBinVolumes -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMixBinVolumes, 4361, 1+7, - - XREF_CDirectSoundBuffer_SetMixBinVolumes, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetMixBinVolumes ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::PlayEx -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_PlayEx, 4361, 1+7, - - XREF_CDirectSoundBuffer_PlayEx, - XRefOne) - - XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Play_Ex), - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x20 }, - { 0x3A, 0x24 }, - { 0x46, 0x0B }, - { 0x52, 0x8B }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * CMcpxBuffer::Stop2 -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Stop_Ex, 4361, 1+9, - - XREF_CMcpxBuffer_Stop_Ex, - XRefOne) - - XREF_ENTRY( 0x2B, XREF_CMcpxBuffer_Stop), - - // CMcpxBuffer_Stop_Ex+0x03 : mov eax, [ebp+arg_0] - { 0x03, 0x8B }, - { 0x04, 0x45 }, - { 0x05, 0x08 }, - // CMcpxBuffer_Stop_Ex+0x14 : mov eax, [esi] - { 0x14, 0x8B }, - { 0x15, 0x06 }, - // CMcpxBuffer_Stop_Ex+0x25 : mov edi, eax - { 0x2F, 0x8B }, - { 0x30, 0xF8 }, - // CMcpxBuffer_Stop_Ex+0x36 : retn 0xC - { 0x36, 0xC2 }, - { 0x37, 0x0C }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::StopEx -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_StopEx, 4361, 1+7, - - XREF_CDirectSoundBuffer_StopEx, - XRefOne) - - XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Stop_Ex ), - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x20 }, - { 0x3A, 0x24 }, - { 0x46, 0x0B }, - { 0x52, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Moved to 3911 -// ****************************************************************** -// * IDirectSoundBuffer_StopEx -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_StopEx, 4361, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_StopEx ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4039 version -// ****************************************************************** -// * public: long __thiscall DirectSound::CMcpxBuffer::Play(__int64,unsigned long) -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play_Ex, 4361, 8, - - XREF_CMcpxBuffer_Play_Ex, - XRefZero) - - { 0x06, 0x56 }, - { 0x0E, 0xF1 }, - { 0x16, 0xFF }, - { 0x1D, 0x03 }, - { 0x1E, 0xFF }, - { 0x26, 0x75 }, - { 0x2F, 0x8B }, - { 0x36, 0xC2 }, -OOVPA_END; -#endif - -#if 0 // For research purpose, need to strengthen it up. -// ****************************************************************** -// * public: long __thiscall DirectSound::CMcpxBuffer::Play(__int64,unsigned long) -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play_Ex, 5558, 12, - - XREF_CMcpxBuffer_Play_Ex, - 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 // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl index 23f523712..e482327e1 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl @@ -32,86 +32,6 @@ // * // ****************************************************************** -#if 0 // No longer used, replaced by generic 4361 version -//TODO: Need further verification for 4361 titles, 4432 is last known lowest build match. -//Test case for 4361: Burnout (found a match yet is called twice for every time joystick is moved. Is this normal?) -// ****************************************************************** -// * DirectSound::GetCaps -// ****************************************************************** -OOVPA_XREF(CDirectSound_GetCaps, 4361, 7, - - XREF_CDirectSound_GetCaps, - XRefZero) - - { 0x0C, 0x0F }, - { 0x0D, 0xB6 }, - { 0x0E, 0xC8 }, - { 0x46, 0x8B }, - { 0x4C, 0x8B }, - { 0x69, 0xC2 }, - { 0x6A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Used 3936 -// ****************************************************************** -// * IDirectSound_Release -// ****************************************************************** -OOVPA_NO_XREF(IDirectSound_Release, 4432, 12) - - // IDirectSound_Release+0x04 : lea ecx, [eax-8] - { 0x04, 0x8D }, - { 0x05, 0x48 }, - { 0x06, 0xF8 }, - - // IDirectSound_Release+0x07 : neg eax - { 0x07, 0xF7 }, - { 0x08, 0xD8 }, - - // IDirectSound_Release+0x09 : sbb eax, eax - { 0x09, 0x1B }, - { 0x0A, 0xC0 }, - - // IDirectSound_Release+0x0D : mov ecx, [eax] - { 0x0D, 0x8B }, - { 0x0E, 0x08 }, - - // IDirectSound_Release+0x10 : call dword ptr [ecx+8] - { 0x10, 0xFF }, - { 0x11, 0x51 }, - { 0x12, 0x08 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by CMcpxVoiceClient_SetMixBins -// ****************************************************************** -// * CDirectSoundVoiceSettings::SetMixBins -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 4432, 10, - - XREF_CDirectSoundVoiceSettings_SetMixBins, - XRefZero) - - // CDirectSoundVoiceSettings_SetMixBins+0x06 : jnz +0x1A - { 0x06, 0x75 }, - { 0x07, 0x1A }, - - // CDirectSoundVoiceSettings_SetMixBins+0x08 : test byte ptr [ecx+8], 0x10 - { 0x08, 0xF6 }, - { 0x09, 0x41 }, - { 0x0A, 0x08 }, - { 0x0B, 0x10 }, - - // CDirectSoundVoiceSettings_SetMixBins+0x2B : jbe +0x2B - { 0x2B, 0x76 }, - { 0x2C, 0x2B }, - - // CDirectSoundVoiceSettings_SetMixBins+0xB2 : retn 0x04 - { 0xB2, 0xC2 }, - { 0xB3, 0x04 }, -OOVPA_END; -#endif - // ****************************************************************** // * XFileCreateMediaObjectAsync // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 734b5c97d..54319a278 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -32,39 +32,6 @@ // * // ****************************************************************** -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_SetMixBinHeadroom -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 4627, 1+11, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSound_SetMixBinHeadroom+0x19 : call [CDirectSound::SetMixBinHeadroom] - XREF_ENTRY( 0x19, XREF_CDirectSound_SetMixBinHeadroom ), - - // IDirectSound_SetMixBinHeadroom+0x04 : push [esp+0x0C] - { 0x04, 0xFF }, - { 0x05, 0x74 }, - { 0x06, 0x24 }, - { 0x07, 0x0C }, - - // IDirectSound_SetMixBinHeadroom+0x0E : add eax, 0xFFFFFFF8 - { 0x0E, 0x83 }, - { 0x0F, 0xC0 }, - { 0x10, 0xF8 }, - - // IDirectSound_SetMixBinHeadroom+0x13 : sbb ecx, ecx - { 0x13, 0x1B }, - { 0x14, 0xC9 }, - - // IDirectSound_SetMixBinHeadroom+0x15 : and ecx, eax - { 0x15, 0x23 }, - { 0x16, 0xC8 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::SetVelocity // ****************************************************************** @@ -119,50 +86,6 @@ OOVPA_XREF(CDirectSound_SetAllParametersA, 4627, 10, { 0x89, 0x08 }, OOVPA_END; -#if 0 // Moved to 4721 -// ****************************************************************** -// * CDirectSound::SetAllParametersA -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParametersA, 4721, 10, - - XREF_CDirectSound_SetAllParameters, - XRefZero) - - { 0x16, 0x68 }, - { 0x17, 0xD8 }, - { 0x18, 0x81 }, - { 0x19, 0x15 }, - - { 0x2F, 0xD9 }, - { 0x30, 0x41 }, - { 0x31, 0x04 }, - - { 0x87, 0x8B }, - { 0x88, 0x50 }, - { 0x89, 0x08 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * DirectSound::CDirectSound::SetAllParameters -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParameters, 4831, 8, - - XREF_CDirectSound_SetAllParameters, - XRefZero) - - { 0x1B, 0xFF }, - { 0x38, 0x08 }, - { 0x55, 0x5A }, - { 0x72, 0xD9 }, - { 0x8F, 0x2C }, - { 0xAC, 0x50 }, - { 0xC9, 0x10 }, - { 0xE6, 0x0C }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound_SetPosition // ****************************************************************** @@ -189,105 +112,6 @@ OOVPA_XREF(CDirectSound_SetPosition, 4627, 11, { 0x53, 0xFF }, OOVPA_END; -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSoundCreateBuffer -// ****************************************************************** -OOVPA_XREF(DirectSoundCreateBuffer, 4242, 1+11, - - XRefNoSaveIndex, - XRefOne) - - // DirectSoundCreateBuffer+0x2F : call [CDirectSound::CreateSoundBuffer] - XREF_ENTRY( 0x2F, XREF_CDirectSound_CreateSoundBuffer ), - - // DirectSoundCreateBuffer+0x04 : and [ebp-0x04], 0 - { 0x04, 0x83 }, - { 0x05, 0x65 }, - { 0x06, 0xFC }, - - // DirectSoundCreateBuffer+0x08 : push ebx; push esi; push edi - { 0x08, 0x53 }, - { 0x09, 0x56 }, - { 0x0A, 0x57 }, - - // DirectSoundCreateBuffer+0x3C : call dword ptr [eax+8] - { 0x3C, 0xFF }, - { 0x3D, 0x50 }, - { 0x3E, 0x08 }, - - // DirectSoundCreateBuffer+0x54 : retn 0x08 - { 0x54, 0xC2 }, - { 0x55, 0x08 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4721 version -// ****************************************************************** -// * CMcpxBuffer_GetStatus -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_GetStatus, 4721, 17, - - XREF_CMcpxBuffer_GetStatus, - XRefZero) - - // CMcpxBuffer_GetStatus+0x00 : movzx eax, word ptr [esi+0x12] - { 0x00, 0x0F }, - { 0x01, 0xB7 }, - { 0x02, 0x41 }, - { 0x03, 0x12 }, - - { 0x07, 0xE1 }, - { 0x10, 0x24 }, - { 0x19, 0x0F }, - { 0x22, 0x74 }, - - // CMcpxBuffer_GetStatus+0x27 : mov ecx, 0x8001 - { 0x27, 0xB9 }, - { 0x28, 0x01 }, - { 0x29, 0x80 }, - { 0x2A, 0x00 }, - - { 0x2B, 0x80 }, - { 0x34, 0x24 }, - - // CMcpxBuffer_GetStatus+0x39 : mov [ecx], eax - { 0x39, 0x89 }, - { 0x3A, 0x01 }, - - { 0x3D, 0x33 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4831 -// ****************************************************************** -// * CMcpxBuffer_GetStatus -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_GetStatus, 4831, 13, - - XREF_CMcpxBuffer_GetStatus, - XRefZero) - - { 0x00, 0x0F }, - - { 0x16, 0x6A }, - { 0x17, 0x00 }, - { 0x18, 0x5A }, - - { 0x1C, 0x42 }, - { 0x1D, 0xF6 }, - { 0x1E, 0xC4 }, - { 0x1F, 0x02 }, - - { 0x29, 0xB9 }, - { 0x2A, 0x01 }, - { 0x2B, 0x80 }, - - { 0x3F, 0xC2 }, - { 0x40, 0x04 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound_GetSpeakerConfig // ****************************************************************** @@ -317,67 +141,6 @@ OOVPA_XREF(CDirectSound_GetSpeakerConfig, 4627, 14, { 0x4B, 0x08 }, OOVPA_END; -#if 0 // Moved to 4721 -// ****************************************************************** -// * CMcpxBuffer_Play -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play, 4721, 11, - - XREF_CMcpxBuffer_Play, - XRefZero) - - // CMcpxBuffer_Play+0x00 : push ebx - { 0x00, 0x53 }, - - // CMcpxBuffer_Play+0x2E : test byte ptr [eax+9], 20h - { 0x2E, 0xF6 }, - { 0x2F, 0x40 }, - { 0x30, 0x09 }, - { 0x31, 0x20 }, - - // CMcpxBuffer_Play+0x44 : test byte ptr [esi+12h], 2h - { 0x44, 0xF6 }, - { 0x45, 0x46 }, - { 0x46, 0x12 }, - { 0x47, 0x02 }, - - // CMcpxBuffer_Play+0x52 : xor eax, eax - { 0x52, 0x33 }, - { 0x53, 0xC0 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4831 -// ****************************************************************** -// * public: long __thiscall DirectSound::CMcpxBuffer::Play(unsigned long) -// ****************************************************************** -// Generic OOVPA as of 4831 and newer -OOVPA_XREF(CMcpxBuffer_Play, 4831, 11, - - XREF_CMcpxBuffer_Play, - XRefZero) - - // CMcpxBuffer_Play+0x00 : push ebx - { 0x00, 0x53 }, - - // CMcpxBuffer_Play+0x32 : test byte ptr [esi+12h], 42h - { 0x32, 0xF6 }, - { 0x33, 0x46 }, - { 0x34, 0x12 }, - { 0x35, 0x42 }, - - // CMcpxBuffer_Play+0x4D : test byte ptr [eax+9], 20h - { 0x4D, 0xF6 }, - { 0x4E, 0x40 }, - { 0x4F, 0x09 }, - { 0x50, 0x20 }, - - // CMcpxBuffer_Play+0x71 : xor eax, eax - { 0x71, 0x33 }, - { 0x72, 0xC0 }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxBuffer_Play_Ex // ****************************************************************** @@ -450,31 +213,6 @@ OOVPA_XREF(CDirectSound_SetDopplerFactor, 4627, 14, { 0x50, 0x0B }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * CDirectSoundVoice::SetPosition -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetPosition, 4627, 8, - - XREF_CDirectSoundVoice_SetPosition, - XRefZero) - - // CDirectSoundVoice_SetPosition+0x0F : mov edx, [ebp+arg_4] - { 0x0F, 0x8B }, - { 0x10, 0x55 }, - { 0x11, 0x0C }, - - // CDirectSoundVoice_SetPosition+0x12 : mov [ecx+04h], edx - { 0x12, 0x89 }, - { 0x13, 0x51 }, - { 0x14, 0x04 }, - - // CDirectSoundVoice_SetPosition+0x51 : retn 14h - { 0x52, 0x14 }, - { 0x53, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetFormat // ****************************************************************** @@ -499,607 +237,6 @@ OOVPA_XREF(CDirectSoundVoice_SetFormat, 4721, 12, { 0x42, 0x08 }, OOVPA_END; -#if 0 // Moved to 4831 -// ****************************************************************** -// * CMcpxStream_Pause -// ****************************************************************** -OOVPA_XREF(CMcpxStream_Pause, 4831, 11, - - XREF_CMcpxStream_Pause, - XRefZero) - - // CMcpxStream_Pause+0x17 : and ax, 0xFFDF - { 0x17, 0x66 }, - { 0x18, 0x25 }, - { 0x19, 0xDF }, - - // CMcpxStream_Pause+0x32 : jmp +0x56 - { 0x32, 0xEB }, - { 0x33, 0x56 }, - - // CMcpxStream_Pause+0x39 : movzx eax, word ptr [esi+0x12] - { 0x39, 0x0F }, - { 0x3A, 0xB7 }, - { 0x3B, 0x46 }, - { 0x3C, 0x12 }, - - // CMcpxStream_Pause+0x8B : retn 0x04 - { 0x8B, 0xC2 }, - { 0x8C, 0x04 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * DirectSound::CDirectSound::EnableHeadphones (incorrect?) -// ****************************************************************** -OOVPA_XREF(CDirectSound_EnableHeadphones, 4627, 16, - - XREF_CDirectSound_EnableHeadphones, - XRefZero) - - // CDirectSound_EnableHeadphones+0x00 : push ebp - { 0x00, 0x55 }, - - // CDirectSound_EnableHeadphones+0x12 : movzx eax, al - { 0x12, 0x0F }, - { 0x13, 0xB6 }, - { 0x14, 0xC0 }, - - // CDirectSound_EnableHeadphones+0x29 : mov eax, 0x80004005 - { 0x29, 0xB8 }, - { 0x2A, 0x05 }, - { 0x2B, 0x40 }, - { 0x2C, 0x00 }, - { 0x2D, 0x80 }, - - // CDirectSound_EnableHeadphones+0x59 : and eax, 0x7FFFFFFF - { 0x59, 0x25 }, - { 0x5A, 0xFF }, - { 0x5B, 0xFF }, - { 0x5C, 0xFF }, - { 0x5D, 0x7F }, - - // CDirectSound_EnableHeadphones+0x97 : leave - //{ 0x97, 0xC9 }, - { 0x98, 0xC2 }, - { 0x99, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_EnableHeadphones -// ****************************************************************** -OOVPA_XREF(IDirectSound_EnableHeadphones, 4627, 1+8, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSound_EnableHeadphones+0x14 : call [CDirectSound::EnableHeadphones] - XREF_ENTRY( 0x15, XREF_CDirectSound_EnableHeadphones ), - - // IDirectSound_EnableHeadphones+0x04 : push dword ptr [esp+8] - { 0x04, 0xFF }, - { 0x05, 0x74 }, - { 0x06, 0x24 }, - { 0x07, 0x08 }, - - // IDirectSound_EnableHeadphones+0x13 : push ecx - { 0x13, 0x51 }, - - // IDirectSound_EnableHeadphones+0x19 : retn 8 - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, - { 0x1B, 0x00 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4831 -// ****************************************************************** -// * CDirectSound::SetAllParametersA -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParametersA, 4831, 10, - - XREF_CDirectSound_SetAllParameters, - XRefZero) - - { 0x16, 0x68 }, - { 0x17, 0x08 }, - { 0x18, 0x6E }, - { 0x19, 0x18 }, - - { 0x2F, 0xD9 }, - { 0x30, 0x41 }, - { 0x31, 0x04 }, - - { 0x87, 0x8B }, - { 0x88, 0x50 }, - { 0x89, 0x08 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4361 version -// ****************************************************************** -// * DirectSound::CDirectSound::GetOutputLevels -// ****************************************************************** -OOVPA_XREF(CDirectSound_GetOutputLevels, 4627, 7, - - XREF_CDirectSound_GetOutputLevels, - XRefZero) - - { 0x07, 0x10 }, - { 0x10, 0xF3 }, - { 0x19, 0x5E }, - { 0x22, 0xFE }, - { 0x2B, 0x85 }, - { 0x34, 0xA6 }, - { 0x3D, 0xD0 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4361 -// ****************************************************************** -// * IDirectSound_GetOutputLevels -// ****************************************************************** -OOVPA_XREF(IDirectSound_GetOutputLevels, 4627, 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; -#endif - -#if 0 // Moved to 4831 -// ****************************************************************** -// * DirectSound::CMcpxBuffer::Pause -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Pause, 4831, 7, - - XREF_CMcpxBuffer_Pause, - XRefZero) - - { 0x0D, 0x4D }, - { 0x1C, 0x44 }, - { 0x2B, 0x8B }, - { 0x3A, 0x75 }, - { 0x49, 0x7D }, - { 0x58, 0xEB }, - { 0x67, 0xE8 }, -OOVPA_END; -#endif - -#if 0 // Used 4134 -// ****************************************************************** -// * IDirectSoundBuffer_GetStatus -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetStatus, 4721, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_GetStatus ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetMixBins -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBins, 4627, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetMixBins ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Moved to 4242 -// ****************************************************************** -// * DirectSound::CMcpxVoiceClient::SetEG -// ****************************************************************** -OOVPA_XREF(CMcpxVoiceClient_SetEG, 4627, 8, - - XREF_CMcpxVoiceClient_SetEG, - XRefZero) - - { 0x1E, 0x75 }, - { 0x3E, 0x0F }, - { 0x5E, 0xE3 }, - { 0x7E, 0x4E }, - { 0x9E, 0x40 }, - { 0xBE, 0x50 }, - { 0xDE, 0x1C }, - { 0xFE, 0x1C }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetEG -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetEG, 4627, 1+6, - - XREF_CDirectSoundVoice_SetEG, - XRefOne) - - XREF_ENTRY( 0x0C, XREF_CMcpxVoiceClient_SetEG ), - - { 0x01, 0x44 }, - { 0x04, 0xFF }, - { 0x07, 0x08 }, - { 0x0A, 0x0C }, - { 0x10, 0xC2 }, - { 0x11, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetEG -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetEG, 4627, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetEG ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Moved to 4242 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetEG -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetEG, 4627, 1+7, - - XREF_CDirectSoundBuffer_SetEG, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetEG ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetEG -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetEG, 4627, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetEG ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::FlushEx -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_FlushEx, 4627, 14, - - XREF_CDirectSoundStream_FlushEx, - XRefZero) - - { 0x00, 0x55 }, - { 0x18, 0x0B }, - { 0x24, 0xB8 }, - { 0x25, 0x05 }, - { 0x26, 0x40 }, - { 0x27, 0x00 }, - { 0x28, 0x80 }, - { 0x29, 0xEB }, - { 0x2A, 0x36 }, - { 0x2B, 0x83 }, - { 0x2C, 0x7D }, - { 0x3F, 0x75 }, - { 0x4D, 0x85 }, - { 0x59, 0x15 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * IDirectSoundStream_FlushEx -// ****************************************************************** -OOVPA_XREF(IDirectSoundStream_FlushEx, 4627, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x11, XREF_CDirectSoundStream_FlushEx ), - - { 0x01, 0x74 }, - { 0x04, 0xFF }, - { 0x07, 0x10 }, - { 0x0A, 0x24 }, - { 0x0D, 0x74 }, - { 0x10, 0xE8 }, - { 0x15, 0xC2 }, - { 0x16, 0x10 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * XAudioDownloadEffectsImage -// ****************************************************************** -// TODO: Need to evaluate with 5558 title, I believe it needs more OVs. -OOVPA_NO_XREF(XAudioDownloadEffectsImage, 4361, 8) - - { 0x1E, 0xB6 }, - { 0x41, 0x83 }, - { 0x61, 0x8B }, - { 0x80, 0x85 }, - { 0x9E, 0x8B }, - { 0xBE, 0x6A }, - { 0xDE, 0x07 }, - { 0xFE, 0xF7 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetFilter -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFilter, 4627, 1+7, - - XREF_CDirectSoundStream_SetFilter, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetFilter ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetPitch -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPitch, 4627, 1+7, - - XREF_DSBUFFERSETPITCHA, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DSBUFFERSETPITCHB ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 3936 version -// ****************************************************************** -// * IDirectSoundBuffer_SetPitch -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPitch, 4627, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DSBUFFERSETPITCHA ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetOutputBuffer -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetOutputBuffer, 4627, 7, - - XREF_CDirectSoundVoice_SetOutputBuffer, - XRefZero) - - { 0x09, 0xF7 }, - { 0x14, 0x8B }, - { 0x1F, 0x3B }, - { 0x2A, 0xE8 }, - { 0x35, 0x8B }, - { 0x40, 0x74 }, - { 0x4B, 0xD8 }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetOutputBuffer -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 4627, 1+7, - - XREF_CDirectSoundBuffer_SetOutputBuffer, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetOutputBuffer ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Moved to 3911 -// ****************************************************************** -// * IDirectSoundBuffer_SetOutputBuffer -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetOutputBuffer, 4627, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetOutputBuffer ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4361 version -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetRolloffCurve -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 4627, 11, - - XREF_CDirectSoundVoice_SetRolloffCurve, - XRefZero) - - { 0x07, 0x8B }, - { 0x10, 0x08 }, - { 0x11, 0x89 }, - { 0x12, 0x51 }, - { 0x13, 0x70 }, - { 0x14, 0x8B }, - { 0x19, 0xB4 }, - { 0x22, 0x51 }, - { 0x2B, 0x00 }, - { 0x34, 0x10 }, - { 0x3E, 0x33 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4361 version -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetRolloffCurve -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetRolloffCurve, 4627, 1+7, - - XREF_CDirectSoundBuffer_SetRolloffCurve, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetRolloffCurve ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x74 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4361 version -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetRolloffCurve -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetRolloffCurve, 4627, 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; -#endif - -#if 0 // No longer used, replaced by generic 4361 version -// ****************************************************************** -// * IDirectSoundBuffer_SetRolloffCurve -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetRolloffCurve, 4627, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetRolloffCurve ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CMemoryManager::MemAlloc // ****************************************************************** @@ -1122,193 +259,6 @@ OOVPA_NO_XREF(CMemoryManager_MemAlloc, 4627, 10) { 0x66, 0x0C } OOVPA_END; -#if 0 // No longer used, replaced by generic 4361 version -// ****************************************************************** -// * XWaveFileCreateMediaObject -// ****************************************************************** -OOVPA_NO_XREF(XWaveFileCreateMediaObject, 4627, 10) - - { 0x0D, 0x0B }, - { 0x1C, 0xF7 }, - { 0x2B, 0x07 }, - { 0x3A, 0xF0 }, - { 0x3F, 0x83 }, - { 0x49, 0x10 }, - { 0x5C, 0x8B }, - { 0x67, 0x07 }, - { 0x70, 0xC2 }, - { 0x71, 0x0C }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4361 version -// ****************************************************************** -// * XFileCreateMediaObjectEx -// ****************************************************************** -OOVPA_NO_XREF(XFileCreateMediaObjectEx, 4627, 7) - - { 0x0A, 0xC0 }, - { 0x16, 0xF8 }, - { 0x22, 0xE6 }, - { 0x2E, 0x1C }, - { 0x3A, 0xF0 }, - { 0x46, 0x4C }, - { 0x52, 0xFF }, -OOVPA_END; -#endif - -#if 0 // Duplicate OOVPA from 3911 -// ****************************************************************** -// * IDirectSoundBuffer_SetNotificationPositions -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetNotificationPositions, 4627, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetNotificationPositions ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; -#endif - -#if 0 // Moved to 4242 -// ****************************************************************** -// * CMcpxVoiceClient::SetLFO -// ****************************************************************** -OOVPA_XREF(CMcpxVoiceClient_SetLFO, 4627, 8, - - XREF_CMcpxVoiceClient_SetLFO, - XRefZero) - - { 0x1E, 0x48 }, - { 0x3E, 0x31 }, - { 0x5E, 0x35 }, - { 0x7E, 0xE1 }, - { 0x9E, 0x8B }, - { 0xBE, 0x8B }, - { 0xDE, 0x05 }, - { 0xFE, 0x6C }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * CDirectSoundVoice::SetLFO -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetLFO, 4627, 1+6, - - XREF_CDirectSoundVoice_SetLFO, - XRefOne) - - XREF_ENTRY( 0x0C, XREF_CMcpxVoiceClient_SetLFO ), - - { 0x01, 0x44 }, - { 0x04, 0xFF }, - { 0x07, 0x08 }, - { 0x0A, 0x0C }, - { 0x10, 0xC2 }, - { 0x11, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4242 -// ****************************************************************** -// * CDirectSoundBuffer::SetLFO -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetLFO, 4627, 1+7, - - XREF_CDirectSoundBuffer_SetLFO, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetLFO ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Moved to 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetLFO -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLFO, 4627, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetLFO ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetLFO -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetLFO, 4627, 1+9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetLFO ), - - { 0x0C, 0x00 }, - { 0x0F, 0xF0 }, - { 0x12, 0x85 }, - { 0x15, 0x0B }, - { 0x3A, 0x85 }, - { 0x3D, 0xF8 }, - { 0x40, 0x68 }, - { 0x4F, 0xC2 }, - { 0x50, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetPitch -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPitch, 4627, 1+11, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_DSBUFFERSETPITCHB ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, - { 0x4F, 0xC2 }, - { 0x50, 0x08 }, - { 0x51, 0x00 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundVoice::SetDistanceFactor // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4721.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4721.inl index 75217452a..a438e76b2 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4721.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4721.inl @@ -182,83 +182,6 @@ OOVPA_XREF(CMcpxBuffer_Pause_Ex, 4721, 1+8, { 0x37, 0x0C }, OOVPA_END; -#if 0 // Moved to 4361 -// ****************************************************************** -// * DirectSound::CMcpxStream::Pause2 -// ****************************************************************** -// Generic OOVPA as of 4721 and newer -OOVPA_XREF(CMcpxStream_Pause_Ex, 4721, 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; -#endif - -#if 0 // Moved to 4361 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::PauseEx -// ****************************************************************** -// Generic OOVPA as of 4721 and newer -OOVPA_XREF(CDirectSoundStream_PauseEx, 4721, 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; -#endif - -#if 0 // Moved to 4361 -// ****************************************************************** -// * IDirectSoundStream_PauseEx -// ****************************************************************** -// Generic OOVPA as of 4721 and newer -OOVPA_XREF(IDirectSoundStream_PauseEx, 4721, 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; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundBuffer::Pause // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl index a3c427d47..efd9defa1 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl @@ -32,23 +32,6 @@ // * // ****************************************************************** -#if 0 // No longer used, replaced by generic 4361 version -// ****************************************************************** -// * XFileCreateMediaObjectEx -// ****************************************************************** -OOVPA_NO_XREF(XFileCreateMediaObjectEx, 5028, 8) - - { 0x03, 0x56 }, - { 0x22, 0x1B }, - { 0x89, 0x1B }, - { 0xA9, 0x85 }, - { 0xAA, 0xF6 }, - { 0xAB, 0x7C }, - { 0xAC, 0x0C }, - { 0xAD, 0x57 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundStream_Flush // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index dbb65045b..da0a60f6c 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -50,237 +50,3 @@ OOVPA_XREF(CDirectSound_EnableHeadphones, 5233, 9, { 0x74, 0xA4 }, { 0x99, 0x08 }, OOVPA_END; - -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_EnableHeadphones -// ****************************************************************** -OOVPA_XREF(IDirectSound_EnableHeadphones, 5233, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSound_EnableHeadphones ), - - // IDirectSound_EnableHeadphones+0x0A : add eax, 0xFFFFFFF8 - { 0x0A, 0x83 }, - { 0x0B, 0xC0 }, - { 0x0C, 0xF8 }, - - // IDirectSound_EnableHeadphones+0x0F : sbb ecx, ecx - { 0x0F, 0x1B }, - { 0x10, 0xC9 }, - - // IDirectSound_EnableHeadphones+0x19 : retn 0x08 - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Used 4627 -// ****************************************************************** -// * IDirectSoundStream_FlushEx -// ****************************************************************** -OOVPA_XREF(IDirectSoundStream_FlushEx, 5233, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x11, XREF_CDirectSoundStream_FlushEx ), - - { 0x00, 0xFF }, - { 0x03, 0x10 }, - - { 0x04, 0xFF }, - { 0x07, 0x10 }, - - { 0x08, 0xFF }, - { 0x0B, 0x10 }, - - { 0x15, 0xC2 }, - { 0x16, 0x10 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4831 -// ****************************************************************** -// CMcpxAPU::SynchPlayback -// ****************************************************************** -// Generic OOVPA as of 5233 and newer -OOVPA_XREF(CMcpxAPU_SynchPlayback, 5233, 9, - - XREF_CMcpxAPU_SynchPlayback, - XRefZero) - { 0x00, 0x55 }, - - //{ 0x0C, 0x74 }, // vs 5344 0x3C - { 0x1A, 0x1A }, - { 0x25, 0x53 }, - { 0x37, 0xF2 }, - //{ 0x58, 0xBC }, // vs 5344 0x84 - - { 0x7F, 0x47 }, - { 0x80, 0x04 }, - - { 0x84, 0x43 }, - - { 0x9E, 0x64 }, - { 0xFF, 0x00 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4831 -// ****************************************************************** -// * CDirectSound::SynchPlayback -// ****************************************************************** -OOVPA_XREF(CDirectSound_SynchPlayback, 5233, 1+9, - - XREF_CDirectSound_SynchPlayback, - XRefOne) - - XREF_ENTRY( 0x08, XREF_CMcpxAPU_SynchPlayback ), - - // CDirectSound_SynchPlayback+0x00 : mov eax, [esp+0x04] - { 0x00, 0x8B }, - { 0x01, 0x44 }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, - - // CDirectSound_SynchPlayback+0x04 : mov ecx, [eax+0x0C] - { 0x04, 0x8B }, - { 0x05, 0x48 }, - { 0x06, 0x0C }, - - // CDirectSound_SynchPlayback+0x0C : retn 0x04 - { 0x0C, 0xC2 }, - { 0x0D, 0x04 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4831 -// ****************************************************************** -// * IDirectSound::SynchPlayback -// ****************************************************************** -// Generic OOVPA as of 5233 and newer -OOVPA_XREF(IDirectSound_SynchPlayback, 5233, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x11, XREF_CDirectSound_SynchPlayback ), - - // IDirectSound_SynchPlayback+0x06 : add eax, 0xFFFFFFF8 - { 0x06, 0x83 }, - { 0x07, 0xC0 }, - { 0x08, 0xF8 }, - - // IDirectSound_SynchPlayback+0x0B : sbb ecx, ecx - { 0x0B, 0x1B }, - { 0x0C, 0xC9 }, - - // IDirectSound_SynchPlayback+0x15 : retn 0x04 - { 0x15, 0xC2 }, - { 0x16, 0x04 }, -OOVPA_END; -#endif - -#if 0 // Duplicate OOVPA, replacing with generic 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetMode -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMode, 5233, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetMode ), - - // IDirectSoundBuffer_SetMode+0x0E : add eax, 0xFFFFFFE4 - { 0x0E, 0x83 }, - { 0x0F, 0xC0 }, - { 0x10, 0xE4 }, - - // IDirectSoundBuffer_SetMode+0x13 : sbb ecx, ecx - { 0x13, 0x1B }, - { 0x14, 0xC9 }, - - // IDirectSoundBuffer_SetMode+0x19 : retn 0x0C - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 4134 -// ****************************************************************** -// * CDirectSoundStream::SetMixBins -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBins, 5233, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetMixBins ), - - { 0x0E, 0xB6 }, - { 0x15, 0x0B }, - { 0x27, 0x26 }, - { 0x2A, 0x24 }, - { 0x3E, 0x74 }, - { 0x4D, 0x5F }, - { 0x50, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Don't use. Duplicate detection CDirectSoundVoice_SetConeAngles. -// ****************************************************************** -// * CDirectSoundVoice::SetRolloffCurve -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 5233, 8, - - XREF_CDirectSoundVoice_SetRolloffCurve, - XRefZero) - - { 0x07, 0x8B }, - { 0x10, 0x08 }, - { 0x12, 0x51 }, - { 0x19, 0xB4 }, - { 0x22, 0x51 }, - { 0x2B, 0x00 }, - { 0x34, 0x10 }, - { 0x3E, 0x33 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4721 version -// ****************************************************************** -// * CMcpxStream_Flush -// ****************************************************************** -// Generic OOVPA as of 5233 and newer -OOVPA_XREF(CMcpxStream_GetStatus, 5233, 14, - - XREF_CMcpxStream_GetStatus, - XRefZero) - - { 0x00, 0x0F }, - { 0x04, 0x8D }, - - { 0x24, 0x03 }, - { 0x27, 0x03 }, - - // Just a note, this asm code is unique - { 0x31, 0x80 }, - { 0x32, 0x48 }, - { 0x33, 0x02 }, - { 0x34, 0x02 }, - - { 0x3C, 0x81 }, - { 0x3D, 0xC9 }, - { 0x3E, 0x00 }, - { 0x3F, 0x00 }, - { 0x40, 0x04 }, - { 0x41, 0x00 }, - - //{ 0x57, 0xC2 }, - //{ 0x58, 0x04 }, -OOVPA_END; -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl index 4ee766c3a..7a534e41e 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl @@ -60,27 +60,6 @@ OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 5344, 12, { 0x32, 0x00 } OOVPA_END; -#if 0 // No longer used, replaced by another 5344 version -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMinDistance -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 5344, 9, - - XREF_CDirectSoundVoice_SetMinDistance, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x38 }, - { 0x14, 0x8B }, - { 0x1D, 0x80 }, - { 0x1F, 0x02 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundVoice::SetDistanceFactor // ****************************************************************** @@ -185,78 +164,6 @@ OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 5344, 12, { 0x32, 0x00 } OOVPA_END; -#if 0 // No longer used, replaced by another 5344 version -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMaxDistance -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 5344, 9, - - XREF_CDirectSoundVoice_SetMaxDistance, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x3C }, - { 0x14, 0x8B }, - { 0x1D, 0x80 }, - { 0x1F, 0x02 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; -#endif - -#if 0 // Duplicate OOVPA, replacing with generic OOVPA -// ****************************************************************** -// * IDirectSoundBuffer_SetMaxDistance -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 5344, 1+10, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetMaxDistance+0x1C : call [CDirectSoundBuffer::SetMaxDistance] - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetMaxDistance ), - - { 0x00, 0xFF }, - // IDirectSoundBuffer_SetMaxDistance+0x04 : fld [esp+4+arg_4] - { 0x04, 0xD9 }, - { 0x05, 0x44 }, - { 0x06, 0x24 }, - { 0x07, 0x0C }, - - // IDirectSoundBuffer_SetMaxDistance+0x12 : add eax, 0FFFFFFE4 - { 0x12, 0x83 }, - { 0x13, 0xC0 }, - { 0x14, 0xE4 }, - - // IDirectSoundBuffer_SetMaxDistance+0x21 : retn 0Ch - { 0x22, 0x0C }, - { 0x23, 0x00 } -OOVPA_END; -#endif - -#if 0 // Used 4134 -// ****************************************************************** -// * IDirectSound_SetRolloffFactor -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetRolloffFactor, 5344, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_CDirectSound_SetRolloffFactor ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; -#endif - // ****************************************************************** // CDirectSoundVoice::SetMode // ****************************************************************** @@ -363,25 +270,6 @@ OOVPA_XREF(CDirectSound_SetVelocity, 5344, 14, { 0x71, 0x14 }, OOVPA_END; -#if 0 // No longer used, replaced by CMcpxVoiceClient_SetMixBins -// ****************************************************************** -// * CDirectSoundVoiceSettings::SetMixBins -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 5344, 7, - - XREF_CDirectSoundVoiceSettings_SetMixBins, - XRefZero) - - { 0x10, 0x10 }, - { 0x11, 0x74 }, - { 0x12, 0x07 }, - { 0x13, 0xB8 }, - { 0x3C, 0x50 }, - { 0x4C, 0x0F }, - { 0x5C, 0x46 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundVoice_SetPosition // ****************************************************************** @@ -412,35 +300,6 @@ OOVPA_XREF(CDirectSoundVoice_SetPosition, 5344, 12, { 0x32, 0x10 }, // SetConeOrientation vs SetPosition vs SetVelocity OOVPA_END; -#if 0 // No longer used, replaced by generic 5344 version -// ****************************************************************** -// * CDirectSoundVoice::SetPosition -// ****************************************************************** -// Generic OOVPA as of 5344 and newer -OOVPA_XREF(CDirectSoundVoice_SetPosition, 5344, 9, - - XREF_CDirectSoundVoice_SetPosition, - XRefZero) - - // CDirectSoundVoice_SetPosition+0x00 : push ebp - { 0x00, 0x55 }, - - // CDirectSoundVoice_SetPosition+0x0F : mov edx, [ebp+arg_4] - { 0x0F, 0x8B }, - { 0x10, 0x55 }, - { 0x11, 0x0C }, - - // CDirectSoundVoice_SetPosition+0x12 : mov [ecx+08h], edx - { 0x12, 0x89 }, - { 0x13, 0x51 }, - { 0x14, 0x08 }, - - // CDirectSoundVoice_SetPosition+0x50 : retn 14h - { 0x50, 0x14 }, - { 0x51, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundVoice_SetVelocity // ****************************************************************** @@ -471,31 +330,6 @@ OOVPA_XREF(CDirectSoundVoice_SetVelocity, 5344, 12, { 0x32, 0x1C }, // SetConeOrientation vs SetPosition vs SetVelocity OOVPA_END; -#if 0 // No longer used, replaced by generic 5344 version -// ****************************************************************** -// * CDirectSoundVoice::SetVelocity -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVelocity, 5344, 8, - - XREF_CDirectSoundVoice_SetVelocity, - XRefZero) - - // CDirectSoundVoice_SetVelocity+0x0F : mov edx, [ebp+arg_4] - { 0x0F, 0x8B }, - { 0x10, 0x55 }, - { 0x11, 0x0C }, - - // CDirectSoundVoice_SetVelocity+0x12 : mov [ecx+14h], edx - { 0x12, 0x89 }, - { 0x13, 0x51 }, - { 0x14, 0x14 }, - - // CDirectSoundVoice_SetVelocity+0x50 : retn 14h - { 0x50, 0x14 }, - { 0x51, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::SynchPlayback // ****************************************************************** @@ -519,36 +353,6 @@ OOVPA_XREF(CDirectSound_SynchPlayback, 5344, 1+9, { 0x3B, 0x68 }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 5344(or possible lowered?) -// ****************************************************************** -// * CDirectSoundVoice::SetI3DL2Source -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetI3DL2Source, 5344, 10, - - XREF_CDirectSoundVoice_SetI3DL2Source, - XRefZero) - - // CDirectSoundVoice_SetI3DL2Source+0x12 : mov esi, [ecx] - { 0x12, 0x8B }, - { 0x13, 0x31 }, - - // CDirectSoundVoice_SetI3DL2Source+0x14 : mov [edx+80h], esi - { 0x14, 0x89 }, - { 0x15, 0xB2 }, - { 0x16, 0x80 }, - - // This asm line has change over time. Not best place to make generic - // CDirectSoundVoice_SetI3DL2Source+0x50 : fld dword ptr [ecx+10h] - { 0x50, 0xD9 }, - { 0x51, 0x41 }, - { 0x52, 0x10 }, - - // CDirectSoundVoice_SetI3DL2Source+0xC7 : retn 0Ch - { 0xC7, 0xC2 }, - { 0xC8, 0x0C } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound::CommitDeferredSettings // ****************************************************************** @@ -577,63 +381,6 @@ OOVPA_XREF(CDirectSound_CommitDeferredSettings, 5344, 11, { 0x97, 0xC9 }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 4134 -// ****************************************************************** -// * DirectSound::CMcpxVoiceClient::SetFilter -// ****************************************************************** -OOVPA_XREF(CMcpxVoiceClient_SetFilter, 5344, 8, - - XREF_CMcpxVoiceClient_SetFilter, - XRefZero) - - { 0x1B, 0xF6 }, - { 0x1C, 0xBA }, - { 0x1D, 0xFF }, - { 0x1E, 0xFF }, - { 0x1F, 0x00 }, - { 0x3E, 0x73 }, - { 0x5E, 0x3E }, - { 0x7E, 0x0B }, -OOVPA_END; -#endif - -#if 0 // Used 4361 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::StopEx -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_StopEx, 5344, 9, - - XREF_CDirectSoundBuffer_StopEx, - XRefZero) - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x25, 0x80 }, - { 0x26, 0xEB }, - { 0x27, 0x2D }, - { 0x28, 0x8B }, - { 0x30, 0xFF }, - { 0x41, 0x85 }, - { 0x47, 0x68 }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_SetEffectData -// ****************************************************************** -OOVPA_NO_XREF(IDirectSound_SetEffectData, 5344, 7) - - { 0x04, 0x75 }, - { 0x0A, 0x75 }, - { 0x10, 0x14 }, - { 0x16, 0x10 }, - { 0x1C, 0x1B }, - { 0x26, 0x5D }, - { 0x28, 0x18 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSound::EnableHeadphones // ****************************************************************** @@ -653,28 +400,6 @@ OOVPA_XREF(CDirectSound_EnableHeadphones, 5344, 9, { 0x4D, 0xC3 }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetAllParameters -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 5344, 10, - - XREF_CDirectSoundVoice_SetAllParameters, - XRefZero) - - { 0x00, 0x8B }, - { 0x0C, 0x50 }, - { 0x10, 0xB4 }, - { 0x13, 0x00 }, - { 0x14, 0xD9 }, - { 0x15, 0x5A }, - { 0x16, 0x08 }, - { 0x17, 0xD9 }, - { 0x1E, 0x92 }, - { 0x21, 0x00 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundVoice::SetConeOutsideVolume // ****************************************************************** @@ -760,26 +485,6 @@ OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 5344, 12, { 0x30, 0x01 }, // SetConeAngles 0x04 vs SetRolloffCurve 0x01 OOVPA_END; -#if 0 // No longer used, replaced by generic 5344 version -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetRolloffCurve -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 5344, 8, - - XREF_CDirectSoundVoice_SetRolloffCurve, - XRefZero) - - { 0x07, 0x8B }, - { 0x10, 0x08 }, - { 0x11, 0x89 }, - { 0x12, 0x51 }, - { 0x13, 0x50 }, - { 0x14, 0x8B }, - { 0x3E, 0x33 }, - { 0x40, 0xC2 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetConeAngles // ****************************************************************** @@ -805,32 +510,6 @@ OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 5344, 12, { 0x30, 0x04 }, // SetConeAngles 0x04 vs SetRolloffCurve 0x01 OOVPA_END; -#if 0 // No longer used, replaced by generic 5344 version -// ****************************************************************** -// * CDirectSoundVoice::SetConeAngles -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 5344, 9, - - XREF_CDirectSoundVoice_SetConeAngles, - XRefZero) - - // CDirectSoundVoice_SetConeAngles+0x0D : mov edx, [esp+arg_4] - { 0x0D, 0x8B }, - { 0x0E, 0x54 }, - { 0x0F, 0x24 }, - { 0x10, 0x08 }, - - // CDirectSoundVoice_SetConeAngles+0x11 : mov [ecx+20h], edx - { 0x11, 0x89 }, - { 0x12, 0x51 }, - { 0x13, 0x20 }, - - // CDirectSoundVoice_SetConeAngles+0x40 : retn 10h - { 0x41, 0x10 }, - { 0x42, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundVoice_SetConeOrientation // ****************************************************************** @@ -861,59 +540,6 @@ OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 5344, 12, { 0x32, 0x30 }, // SetConeOrientation vs SetPosition vs SetVelocity OOVPA_END; -#if 0 // No longer used, replaced by generic 5344 version -// ****************************************************************** -// * CDirectSoundVoice::SetConeOrientation -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 5344, 8, - - XREF_CDirectSoundVoice_SetConeOrientation, - XRefZero) - - // CDirectSoundVoice_SetConeOrientation+0x0F : mov edx, [ebp+arg_4] - { 0x0F, 0x8B }, - { 0x10, 0x55 }, - { 0x11, 0x0C }, - - // CDirectSoundVoice_SetConeOrientation+0x12 : mov [ecx+28h], edx - { 0x12, 0x89 }, - { 0x13, 0x51 }, - { 0x14, 0x28 }, - - // CDirectSoundVoice_SetConeOrientation+0x4F : retn 14h - { 0x50, 0x14 }, - { 0x51, 0x00 } -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 5344 -// ****************************************************************** -// * CMcpxStream_Flush -// ****************************************************************** -OOVPA_XREF(CMcpxStream_Flush, 5344, 11, - - XREF_CMcpxStream_Flush, - XRefZero) - - { 0x00, 0x55 }, - { 0x01, 0x8B }, - - { 0x12, 0x33 }, - - { 0x3D, 0x83 }, - { 0x3E, 0xFE }, - { 0x3F, 0x06 }, - - { 0x4E, 0xE8 }, - - { 0x66, 0xE8 }, - - { 0xDD, 0xC9 }, - { 0xDE, 0xC2 }, - { 0xDF, 0x04 }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxStream_Flush // ****************************************************************** @@ -944,92 +570,6 @@ OOVPA_XREF(CMcpxStream_Flush, 5344, 14, { 0x11, 0x00 }, OOVPA_END; -#if 0 // Moved to 4531 -// ****************************************************************** -// * CMcpxStream_Discontinuity -// ****************************************************************** -OOVPA_XREF(CMcpxStream_Discontinuity, 5344, 9, - - XREF_CMcpxStream_Discontinuity, - XRefZero) - - // CMcpxStream_Discontinuity+0x00 : push esi; push edi - { 0x00, 0x56 }, - { 0x01, 0x57 }, - - // CMcpxStream_Discontinuity+0x12 : mov dx,0x800 - { 0x12, 0x66 }, - { 0x13, 0xBA }, - { 0x14, 0x00 }, - { 0x15, 0x08 }, - - // CMcpxStream_Discontinuity+0x23 : call Stop@CMcpxStream@DirectSound@@QAEJ_JK@Z - { 0x23, 0xE8 }, - - // CMcpxStream_Discontinuity+0x2D : pop esi; ret - { 0x2D, 0x5E }, - { 0x2E, 0xC3 }, -OOVPA_END; -#endif - -#if 0 // Moved to 4134 -// ****************************************************************** -// * CMcpxVoiceClient::SetMixBins -// ****************************************************************** -// Generic OOVPA as of 4134 and newer -OOVPA_XREF(CMcpxVoiceClient_SetMixBins, 5344, 14, - - XREF_CMcpxVoiceClient_SetMixBins, - XRefZero) - - // CMcpxVoiceClient_SetMixBins+0x00 : push ebp - { 0x00, 0x55 }, - - // CMcpxVoiceClient_SetMixBins+0x24 : lea eax, [ebp-4] - { 0x24, 0x8D }, - { 0x25, 0x45 }, - { 0x26, 0xFC }, - - // CMcpxVoiceClient_SetMixBins+0x2F : lea eax, [esi-0x30] - { 0x2F, 0x8D }, - { 0x30, 0x45 }, - { 0x31, 0xD0 }, - - // CMcpxVoiceClient_SetMixBins+0x5A : mov ds:[0xFE8202F8], eax - { 0x5E, 0xA3 }, - { 0x5F, 0xF8 }, - { 0x60, 0x02 }, - { 0x61, 0x82 }, - { 0x62, 0xFE }, - - // CMcpxVoiceClient_SetMixBins+0xBF : leave; retn - { 0xBF, 0xC9 }, - { 0xC0, 0xC3 }, -OOVPA_END; -#endif - -#if 0 -// ****************************************************************** -// * CDirectSoundVoice::SetMixBins -// ****************************************************************** -// Generic OOVPA as of ____? and newer -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 5344, 1+7, - - XREF_CDirectSoundVoice_SetMixBins, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CMcpxVoiceClient_SetMixBins ), - - { 0x02, 0x74 }, - { 0x06, 0x74 }, - { 0x0A, 0x4E }, - { 0x11, 0x8B }, - { 0x12, 0x4E }, - { 0x19, 0x5E }, - { 0x1A, 0xC2 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundVoice::SetI3DL2Source // ****************************************************************** @@ -1422,163 +962,6 @@ OOVPA_XREF(DirectSoundUseLightHRTF4Channel, 5344, 1+7, { 0x1E, 0xC3 }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4432 version -// ****************************************************************** -// * 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; -#endif - -#if 0 // Moved to 5028 -// ****************************************************************** -// * CMcpxVoiceClient_GetVoiceProperties -// ****************************************************************** -// Generic OOVPA as of ____? and newer -OOVPA_XREF(CMcpxVoiceClient_GetVoiceProperties, 5344, 14, - - XREF_CMcpxVoiceClient_GetVoiceProperties, - XRefZero) - - { 0x00, 0x55 }, - { 0x01, 0x8B }, - { 0x03, 0x83 }, - { 0x06, 0x83 }, - { 0x0A, 0xF6 }, - - // CMcpxVoiceClient_GetVoiceProperties+0xB5 : shr esi,6 - { 0xB5, 0xC1 }, - { 0xB6, 0xEE }, - { 0xB7, 0x06 }, - - // CMcpxVoiceClient_GetVoiceProperties+0x102 : mov dword ptr [edi],0FFFFD8F0h - { 0x102, 0xC7 }, - { 0x103, 0x07 }, - { 0x104, 0xF0 }, - { 0x105, 0xD8 }, - { 0x106, 0xFF }, - { 0x107, 0xFF }, - - // After offset 0x11C, lots of changes has occurred. -OOVPA_END; -#endif - -#if 0 // Moved to 5028 -// ****************************************************************** -// * CDirectSoundVoice_GetVoiceProperties -// ****************************************************************** -// Generic OOVPA as of ____? and newer -OOVPA_XREF(CDirectSoundVoice_GetVoiceProperties, 5344, 1+7, - - XREF_CDirectSoundVoice_GetVoiceProperties, - XRefOne) - - XREF_ENTRY( 0x0C, XREF_CMcpxVoiceClient_GetVoiceProperties), - - { 0x00, 0x8B }, - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x08, 0x8B }, - { 0x0B, 0xE8 }, - { 0x10, 0xC2 }, - { 0x11, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 5028 -// ****************************************************************** -// * CDirectSoundBuffer_GetVoiceProperties -// ****************************************************************** -// Generic OOVPA as of ____? and newer -OOVPA_XREF(CDirectSoundBuffer_GetVoiceProperties, 5344, 1+7, - - XREF_CDirectSoundBuffer_GetVoiceProperties, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_GetVoiceProperties ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x2C, 0x10 }, - { 0x30, 0x10 }, - { 0x31, 0xE8 }, - { 0x4B, 0xC2 }, - { 0x4C, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 5028 -// ****************************************************************** -// * IDirectSoundBuffer_GetVoiceProperties -// ****************************************************************** -// Generic OOVPA as of ____? and newer -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetVoiceProperties, 5344, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_GetVoiceProperties), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 5028 -// ****************************************************************** -// * CDirectSoundStream_GetVoiceProperties -// ****************************************************************** -// Generic OOVPA as of ____? and newer -OOVPA_XREF(CDirectSoundStream_GetVoiceProperties, 5344, 1+7, - - XREF_CDirectSoundStream_GetVoiceProperties, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_GetVoiceProperties ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x2B, 0x08 }, - { 0x30, 0x10 }, - { 0x35, 0xE8 }, - { 0x4F, 0xC2 }, - { 0x50, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 5028 -// ****************************************************************** -// * IDirectSoundStream_GetVoiceProperties -// ****************************************************************** -// Generic OOVPA as of ____? and newer -OOVPA_XREF(IDirectSoundStream_GetVoiceProperties, 5344, 1+1, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundStream_GetVoiceProperties+0x00 : jmp [CDirectSoundStream_GetVoiceProperties] - XREF_ENTRY(0x01, XREF_CDirectSoundStream_GetVoiceProperties), - - // IDirectSoundStream_GetVoiceProperties+0x00 : jmp 0x........ - { 0x00, 0xE9 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound3DCalculator_GetVoiceData // ****************************************************************** @@ -1805,54 +1188,6 @@ OOVPA_XREF(XAudioSetEffectData, 5344, 2+3, { 0x03, 0x81 }, OOVPA_END; -#if 0 // No longer used, replaced by generic 4361 version -// ****************************************************************** -// * XWaveFileCreateMediaObjectEx -// ****************************************************************** -// Generic OOVPA as of ____? and newer -OOVPA_XREF(XWaveFileCreateMediaObjectEx, 5344, 10, - - XRefNoSaveIndex, - XRefZero) - - { 0x0D, 0x0B }, - { 0x1C, 0xF7 }, - { 0x2B, 0x07 }, - { 0x2F, 0x83 }, - { 0x41, 0x0A }, - { 0x45, 0x10 }, - { 0x58, 0x8B }, - { 0x63, 0x07 }, - { 0x6C, 0xC2 }, - { 0x6D, 0x0C }, -OOVPA_END; -#endif - -#if 0 // Moved to 4361 -// ****************************************************************** -// * XFileCreateMediaObject -// ****************************************************************** -// Generic OOVPA as of ____? and newer -OOVPA_XREF(XFileCreateMediaObject, 5344, 10, - - XRefNoSaveIndex, - XRefZero) - - { 0x00, 0x55 }, - { 0x01, 0x8B }, - { 0x03, 0x56 }, - - { 0x34, 0x18 }, - { 0x37, 0x14 }, - { 0x3A, 0x10 }, - { 0x3D, 0x0C }, - { 0x40, 0x08 }, - - { 0x67, 0xC2 }, - { 0x68, 0x18 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound_MapBufferData // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl index 7a95d627a..1b2069608 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl @@ -74,50 +74,6 @@ OOVPA_XREF(CDirectSound_CommitDeferredSettings, 5455, 18, { 0x96, 0xC9 }, OOVPA_END; -#if 0 // Moved to 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetBufferData -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 5455, 19, - - XREF_CDirectSoundBuffer_SetBufferData, - XRefZero) - - // CDirectSoundBuffer_SetBufferData+0x00 : push ebp - { 0x00, 0x55 }, - - // CDirectSoundBuffer_SetBufferData+0x0F : cmp dword ptr [ebp+10h],edi - { 0x0F, 0x39 }, - { 0x10, 0x7D }, - { 0x11, 0x10 }, - - // CDirectSoundBuffer_SetBufferData+0x12 : mov dword ptr [ebp+0Ch],edi - { 0x12, 0x89 }, - { 0x13, 0x7D }, - { 0x14, 0x10 }, - - // CDirectSoundBuffer_SetBufferData+0x4B : mov eax,dword ptr [esi+1Ch] - { 0x4B, 0x8B }, - { 0x4C, 0x46 }, - { 0x4D, 0x1C }, - - // CDirectSoundBuffer_SetBufferData+0x64 : mov ecx,dword ptr [esi+20h] - { 0x64, 0x8B }, - { 0x65, 0x4E }, - { 0x66, 0x20 }, - - // CDirectSoundBuffer_SetBufferData+0x8A : mov ecx,dword ptr [esi+20h] - { 0x8A, 0x8B }, - { 0x8B, 0x4E }, - { 0x8C, 0x20 }, - - // CDirectSoundBuffer_SetBufferData+0xAB : retn 0x0C - { 0xAB, 0xC2 }, - { 0xAC, 0x0C }, - { 0xAD, 0x00 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSound::EnableHeadphones // ****************************************************************** @@ -188,34 +144,6 @@ OOVPA_XREF(DSound_CRefCount_Release, 5455, 10, { 0x1F, 0x04 }, OOVPA_END; -#if 0 // Replaced with generic OOVPA 5344 -// ****************************************************************** -// * CMcpxStream_Flush -// ****************************************************************** -OOVPA_XREF(CMcpxStream_Flush, 5455, 11, - - XREF_CMcpxStream_Flush, - XRefZero) - - { 0x00, 0x55 }, - { 0x01, 0x8B }, - - { 0x12, 0x33 }, - - { 0x38, 0x83 }, - { 0x39, 0xFF }, - { 0x3A, 0x06 }, - - { 0x4B, 0xE8 }, - - { 0x62, 0xE8 }, - - { 0xD1, 0xC9 }, - { 0xD2, 0xC2 }, - { 0xD3, 0x04 }, -OOVPA_END; -#endif - // ****************************************************************** // * CMcpxStream_Discontinuity // ****************************************************************** @@ -291,25 +219,6 @@ OOVPA_XREF(CDirectSound_SetI3DL2Listener, 5455, 20, { 0x106, 0x0C }, OOVPA_END; -#if 0 // No longer used, replaced by CMcpxVoiceClient_SetMixBins -// ****************************************************************** -// * CDirectSoundVoiceSettings::SetMixBins -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 5455, 7, - - XREF_CDirectSoundVoiceSettings_SetMixBins, - XRefZero) - - { 0x1B, 0xEB }, - { 0x32, 0x8B }, - { 0x4C, 0x7C }, - { 0x66, 0x00 }, - { 0x84, 0xF6 }, - { 0x9A, 0xB4 }, - { 0xB4, 0x00 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSoundVoice::CommitDeferredSettings // ****************************************************************** @@ -352,26 +261,6 @@ OOVPA_XREF(CMcpxBuffer_SetBufferData, 5455, 9, { 0x8A, 0x08 }, OOVPA_END; -#if 0 // Moved to 4361 -// ****************************************************************** -// * DirectSound::CMemoryManager::PoolAlloc -// ****************************************************************** -OOVPA_NO_XREF(DSound_CMemoryManager_PoolAlloc, 5455, 11) - - { 0x00, 0x56 }, - { 0x24, 0x83 }, - { 0x25, 0x7C }, - { 0x26, 0x24 }, - { 0x27, 0x10 }, - { 0x28, 0x00 }, - { 0x37, 0xF3 }, - { 0x38, 0xAB }, - { 0x44, 0xC2 }, - { 0x45, 0x0C }, - { 0x46, 0x00 }, -OOVPA_END; -#endif - // ****************************************************************** // * CDirectSound_GetSpeakerConfig // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index 62bdd1996..ec7066f10 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -32,36 +32,6 @@ // * // ****************************************************************** -#if 0 // Replaced with generic OOVPA 5455 -// ****************************************************************** -// * CDirectSound::CommitDeferredSettings -// ****************************************************************** -OOVPA_XREF(CDirectSound_CommitDeferredSettings, 5558, 11, - - XREF_CDirectSound_CommitDeferredSettings, - XRefZero) - - // CDirectSound_CommitDeferredSettings+0x10 : movzx eax, al - { 0x10, 0x0F }, - { 0x11, 0xB6 }, - { 0x12, 0xC0 }, - - // CDirectSound_CommitDeferredSettings+0x27 : mov eax, 0x80004005 - { 0x27, 0xB8 }, - { 0x28, 0x05 }, - { 0x29, 0x40 }, - { 0x2B, 0x80 }, - - // CDirectSound_CommitDeferredSettings+0x6D : mov [eax+0x30], edi - { 0x6D, 0x89 }, - { 0x6E, 0x78 }, - { 0x6F, 0x30 }, - - // CDirectSound_CommitDeferredSettings+0x96 : leave - { 0x96, 0xC9 }, -OOVPA_END; -#endif - // ****************************************************************** // * IDirectSound_SetMixBinHeadroom // ****************************************************************** @@ -82,196 +52,6 @@ OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 5558, 1+8, { 0x1E, 0x0C }, OOVPA_END; -#if 0 // Moved to 5344 -// ****************************************************************** -// * DirectSound::CFullHRTFSource::GetCenterVolume -// ****************************************************************** -OOVPA_XREF(CFullHRTFSource_GetCenterVolume, 5558, 7, - - XREF_CFullHRTFSource_GetCenterVolume, - XRefZero) - - { 0x13, 0xD9 }, - { 0x29, 0xDF }, - { 0x3D, 0x2D }, - { 0x54, 0xC1 }, - { 0x67, 0x4D }, - { 0x7E, 0xD9 }, - { 0x91, 0x10 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 5344 version -// ****************************************************************** -// * DirectSound::CHRTFSource::SetFullHRTF5Channel -// ****************************************************************** -OOVPA_XREF(CHRTFSource_SetFullHRTF5Channel, 5558, 1+8, - - XREF_CHRTFSource_SetFullHRTF5Channel, - XRefOne) - - XREF_ENTRY( 0x4C, XREF_CFullHRTFSource_GetCenterVolume ), - - { 0x14, 0xC7 }, - { 0x1E, 0xC7 }, - { 0x28, 0xC7 }, - { 0x3C, 0xC7 }, - { 0x46, 0xC7 }, - { 0x5A, 0xC7 }, - { 0x64, 0xC7 }, - { 0x6E, 0xC3 }, -OOVPA_END; -#endif - -#if 0 // Moved to generic OOVPA 4134 -// ****************************************************************** -// * DirectSoundUseFullHRTF -// ****************************************************************** -OOVPA_XREF(DirectSoundUseFullHRTF, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x0A, XREF_CHRTFSource_SetFullHRTF5Channel ), - - { 0x06, 0x0F }, - { 0x07, 0xB6 }, - { 0x0E, 0x85 }, - { 0x0F, 0xF6 }, - { 0x12, 0x0B }, - { 0x18, 0xFF }, - { 0x1E, 0xC3 }, -OOVPA_END; -#endif - -#if 0 // Duplicate OOVPA found in 4134 -// ****************************************************************** -// * DirectSoundDoWork -// ****************************************************************** -OOVPA_NO_XREF(DirectSoundDoWork, 5558, 7) - - { 0x06, 0x0F }, - { 0x0E, 0x85 }, - { 0x10, 0x74 }, - { 0x18, 0x85 }, - { 0x1C, 0x0B }, - { 0x22, 0xFF }, - { 0x28, 0xC3 }, -OOVPA_END; -#endif - -#if 0 // Replaced with better and stronger OOVPA 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetBufferData -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 5558, 7, - - XREF_CDirectSoundBuffer_SetBufferData, - XRefZero) - - { 0x14, 0x0C }, - { 0x2A, 0xB6 }, - { 0x40, 0xB8 }, - { 0x56, 0x8B }, - { 0x6C, 0x8B }, - { 0x82, 0x7C }, - { 0x98, 0x5E }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSoundBuffer_SetCurrentPosition -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetCurrentPosition), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 4039 -// ****************************************************************** -// * IDirectSoundBuffer_SetMixBins -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetMixBins ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSoundBuffer_Play -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Play, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_Play ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; -#endif - -#if 0 // Replaced with OOVPA 4831 -// ****************************************************************** -// * CMcpxBuffer_GetStatus -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_GetStatus, 5558, 11, - - XREF_CMcpxBuffer_GetStatus, - XRefZero) - - // CMcpxBuffer_GetStatus+0x04 : mov ecx, eax - { 0x04, 0x8B }, - { 0x05, 0xC8 }, - - // CMcpxBuffer_GetStatus+0x0C : jnz +0x1B - { 0x0C, 0x75 }, - { 0x0D, 0x1B }, - - // CMcpxBuffer_GetStatus+0x12 : test ax, 0x444 - { 0x12, 0x66 }, - { 0x13, 0xA9 }, - { 0x14, 0x44 }, - - // CMcpxBuffer_GetStatus+0x29 : mov ecx, 0x8001 - { 0x29, 0xB9 }, - { 0x2A, 0x01 }, - { 0x2B, 0x80 }, - { 0x2C, 0x00 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMinDistance // ****************************************************************** @@ -291,36 +71,6 @@ OOVPA_XREF(CDirectSoundStream_SetMinDistance, 5558, 1+7, { 0x53, 0x8B }, OOVPA_END; -#if 0 // Duplicate OOVPA, replacing with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSoundBuffer_SetMinDistance -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 5558, 1+10, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetMinDistance+0x1C : call [CDirectSoundBuffer::SetMinDistance] - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetMinDistance ), - - { 0x00, 0xFF }, - // IDirectSoundBuffer_SetMinDistance+0x04 : fld [esp+4+arg_4] - { 0x04, 0xD9 }, - { 0x05, 0x44 }, - { 0x06, 0x24 }, - { 0x07, 0x0C }, - - // IDirectSoundBuffer_SetMinDistance+0x12 : add eax, 0FFFFFFE4 - { 0x12, 0x83 }, - { 0x13, 0xC0 }, - { 0x14, 0xE4 }, - - // IDirectSoundBuffer_SetMinDistance+0x21 : retn 0Ch - { 0x22, 0x0C }, - { 0x23, 0x00 } -OOVPA_END; -#endif - // ****************************************************************** // * IDirectSoundBuffer8::SetAllParameters // ****************************************************************** @@ -376,200 +126,6 @@ OOVPA_XREF(CMcpxStream_Pause, 5558, 7, } };*/ -#if 0 // Replaced with generic OOVPA 4134 -// ****************************************************************** -// * CDirectSoundStream::Pause -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Pause, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x35, XREF_CMcpxStream_Pause ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetAllParameters -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 5558, 10, - - XREF_CDirectSoundVoice_SetAllParameters, - XRefZero) // TODO : Use XRefOne here if XREF_CDirectSoundVoice_CommitDeferredSettings is enabled below - -// XREF_ENTRY( 0x12F, XREF_CDirectSoundVoice_CommitDeferredSettings ), - - { 0x00, 0x8B }, - { 0x01, 0x44 }, - { 0x1D, 0x10 }, - { 0x3C, 0x8B }, - { 0x5B, 0x92 }, - { 0x7A, 0xB4 }, - { 0x99, 0x00 }, - { 0xB8, 0x00 }, - { 0xD7, 0x00 }, - { 0xF6, 0x89 }, -OOVPA_END; -#endif - -#if 0 //Replaced with generic 3911 -// ****************************************************************** -// * IDirectSoundBuffer_GetCurrentPosition@12 -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetCurrentPosition, 5558, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_GetCurrentPosition), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetMixBins -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBins, 5558, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetMixBins ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_EnableHeadphones -// ****************************************************************** -OOVPA_XREF(IDirectSound_EnableHeadphones, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSound_EnableHeadphones ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_SetPosition -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetPosition, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_CDirectSound_SetPosition ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xF8 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; -#endif - -#if 0 //Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSound_CreateSoundStream -// ****************************************************************** -OOVPA_XREF(IDirectSound_CreateSoundStream, 5558, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_CDirectSound_CreateSoundStream ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * DirectSound::CDirectSound::SetAllParameters -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParameters, 5558, 8, - - XREF_CDirectSound_SetAllParameters, - XRefZero) - - { 0x0C, 0x00 }, - { 0x0E, 0xB6 }, - { 0x10, 0x74 }, - { 0x12, 0x85 }, - { 0x14, 0x74 }, - { 0x16, 0x68 }, - { 0x2A, 0x00 }, - { 0x2B, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 4134, this OOVPA is not a reliable signature -// ****************************************************************** -// * DirectSound::CMcpxVoiceClient::SetFilter -// ****************************************************************** -OOVPA_XREF(CMcpxVoiceClient_SetFilter, 5558, 10, - - XREF_CMcpxVoiceClient_SetFilter, - XRefZero) - - { 0x05, 0x20 }, - { 0x07, 0x65 }, - { 0x09, 0x00 }, - { 0x0B, 0x56 }, - { 0x0F, 0x8D }, - { 0x17, 0x8B }, - { 0x19, 0x08 }, - { 0x1B, 0xF6 }, - { 0x1D, 0xFF }, - { 0x1F, 0x00 }, -OOVPA_END; -#endif - // ****************************************************************** // * DirectSound::CDirectSoundVoice::Use3DVoiceData // ****************************************************************** @@ -665,112 +221,6 @@ OOVPA_XREF(IDirectSoundStream_Use3DVoiceData, 5558, 1+1, { 0x00, 0xE9 }, OOVPA_END; -#if 0 // Moved to 5455 -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::Set3DVoiceData -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_Set3DVoiceData, 5558, 9, - - XREF_CDirectSoundVoice_Set3DVoiceData, - XRefZero) - - { 0x00, 0x8B }, - { 0x04, 0x8B }, - - { 0x28, 0x01 }, - { 0x3C, 0x02 }, - { 0x50, 0x04 }, - { 0x73, 0x08 }, - { 0x96, 0x10 }, - { 0xB9, 0x20 }, - { 0xCD, 0x40 }, -OOVPA_END; -#endif - -#if 0 // Moved to 5455 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::Set3DVoiceData -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Set3DVoiceData, 5558, 1+8, - - XREF_CDirectSoundBuffer_Set3DVoiceData, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_Set3DVoiceData ), - - { 0x00, 0x56 }, - { 0x11, 0x16 }, - { 0x16, 0x68 }, - { 0x36, 0x85 }, - { 0x3A, 0x74 }, - { 0x3C, 0x68 }, - { 0x4B, 0xC2 }, - { 0x4C, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 5455 -// ****************************************************************** -// * IDirectSoundBuffer::Set3DVoiceData -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Set3DVoiceData, 5558, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_Set3DVoiceData ), - - { 0x06, 0x24 }, - { 0x08, 0x8B }, - { 0x0C, 0xE4 }, - { 0x0E, 0xD9 }, - { 0x11, 0x23 }, - { 0x14, 0xE8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 5455 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::Set3DVoiceData -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Set3DVoiceData, 5558, 1+8, - - XREF_CDirectSoundStream_Set3DVoiceData, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_Set3DVoiceData ), - - { 0x00, 0x56 }, - { 0x11, 0x16 }, - { 0x16, 0x68 }, - { 0x35, 0xE8 }, - { 0x3E, 0x74 }, - { 0x40, 0x68 }, - { 0x4F, 0xC2 }, - { 0x50, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Moved to 5455 -// ****************************************************************** -// * IDirectSoundStream_Set3DVoiceData -// ****************************************************************** -// Generic OOVPA as of ____? and newer (note: is not introduced in 5344) -OOVPA_XREF(IDirectSoundStream_Set3DVoiceData, 5558, 1+1, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundStream_Set3DVoiceData+0x00 : jmp [CDirectSoundStream_Set3DVoiceData] - XREF_ENTRY(0x01, XREF_CDirectSoundStream_Set3DVoiceData), - - // IDirectSoundStream_Set3DVoiceData+0x00 : jmp 0x........ - { 0x00, 0xE9 }, -OOVPA_END; -#endif - // ****************************************************************** // * Rollback support signature(s) // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index 70e2a41d5..d23870da5 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -31,244 +31,3 @@ // * All rights reserved // * // ****************************************************************** - -#if 0 // Used CMcpxBuffer_Play 4831 -// ****************************************************************** -// * DirectSound::CMcpxBuffer::Play -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play_Ex, 5788, 7, - - XREF_CMcpxBuffer_Play_Ex, - XRefZero) - - { 0x17, 0x43 }, - { 0x2D, 0xF6 }, - { 0x2E, 0xC3 }, - { 0x2F, 0x04 }, - { 0xAD, 0xC2 }, - { 0xAE, 0x04 }, - { 0xAF, 0x00 }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 5455 -// ****************************************************************** -// * DirectSound::CDirectSound::CommitDeferredSettings -// ****************************************************************** -OOVPA_XREF(CDirectSound_CommitDeferredSettings, 5788, 7, - - XREF_CDirectSound_CommitDeferredSettings, - XRefZero) - - { 0x12, 0xC0 }, - { 0x27, 0xB8 }, - { 0x3A, 0x75 }, - { 0x52, 0x8D }, - { 0x62, 0x8B }, - { 0x76, 0x89 }, - { 0x8E, 0xFF }, -OOVPA_END; -#endif - -#if 0 // No longer used, replaced by generic 4134 version -// ****************************************************************** -// * DirectSound::CMcpxBuffer::SetCurrentPosition -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_SetCurrentPosition, 5788, 7, - - XREF_CMcpxBuffer_SetCurrentPosition, - XRefZero) - - { 0x1D, 0x00 }, - { 0x3C, 0x66 }, - { 0x5B, 0x00 }, - { 0x7C, 0x8D }, - { 0x99, 0xD1 }, - { 0xB8, 0x89 }, - { 0xDB, 0x5F }, -OOVPA_END; -#endif - -#if 0 // Replaced with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSoundBuffer_SetCurrentPosition -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 5788, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_CDirectSoundBuffer_SetCurrentPosition ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Duplicate OOVPA, replacing with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSoundBuffer_SetMaxDistance -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 5788, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetMaxDistance ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; -#endif - -#if 0 // Duplicate OOVPA, replacing with generic OOVPA 3911 -// ****************************************************************** -// * IDirectSoundBuffer_SetMinDistance -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 5788, 1+7, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetMinDistance ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; -#endif - -#if 0 // Not 5788 -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetVolume -// ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVolume, 5788, 7, - - XREF_CDirectSoundVoice_SetVolume, - XRefZero) - - { 0x02, 0x24 }, - { 0x06, 0x10 }, - { 0x0A, 0x08 }, - { 0x0E, 0x89 }, - { 0x12, 0x49 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; -#endif - -#if 0 // Used 5233 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetVolume -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVolume, 5788, 1+7, - - XREF_CDirectSoundBuffer_SetVolume, - XRefOne) - - XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetVolume ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; -#endif - -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetVolume -// ****************************************************************** -// * Not until we need it! -//OOVPA_XREF(CDirectSoundStream_SetVolume, 5788, 9, -// -// XREF_CDirectSoundStream_SetVolume, -// XRefOne) -// -// XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetVolume ), -// -// { 0x00, 0x56 }, -// { 0x0C, 0x00 }, -// { 0x14, 0x74 }, -// { 0x21, 0xB8 }, -// { 0x2A, 0x24 }, -// { 0x35, 0xE8 }, -// { 0x40, 0x68 }, -// { 0x4B, 0x8B }, -//OOVPA_END; - -// ****************************************************************** -// * IDirectSound_CreateSoundStream -// ****************************************************************** -//OOVPA_XREF(IDirectSound_CreateSoundStream, 5788, 8, -// -// XRefNoSaveIndex, -// XRefOne) -// -// XREF_ENTRY( 0x1D, XREF_CDirectSound_CreateSoundStream ), -// -// { 0x03, 0x10 }, -// { 0x08, 0xFF }, -// { 0x0D, 0xC8 }, -// { 0x12, 0x83 }, -// { 0x17, 0x1B }, -// { 0x1C, 0xE8 }, -// { 0x21, 0xC2 }, -//OOVPA_END; - -#if 0 // Replaced by generic 4039 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetMixBinVolumes -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_8, 5788, 1+8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetMixBinVolumes ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; -#endif - -#if 0 // Replaced with OOVPA 4831 -// ****************************************************************** -// * DirectSound::CMcpxStream::Pause -// ****************************************************************** -OOVPA_XREF(CMcpxStream_Pause, 5788, 7, - - XREF_CMcpxStream_Pause, - XRefZero) - - { 0x10, 0x07 }, - { 0x23, 0x0F }, - { 0x34, 0x83 }, - { 0x46, 0xF8 }, - { 0x58, 0x03 }, - { 0x6A, 0xBB }, - { 0x7C, 0x00 }, -OOVPA_END; -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl index 8cd88908b..0a9397b46 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl @@ -32,27 +32,3 @@ // * // ****************************************************************** -#if 0 // Duplicate OOVPA base on 4134 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetPitch -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPitch, 5849, 1+11, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetPitch ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, - { 0x4F, 0xC2 }, - { 0x50, 0x08 }, - { 0x51, 0x00 }, -OOVPA_END; -#endif