From e10cb49c9900617375a7cd686bde9be7e228f228 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Sat, 18 Nov 2017 21:58:55 +0900 Subject: [PATCH] Rename OOVPA into understandable Rename CMcpxBuffer_Play2 to CMcpxBuffer_Play_Ex Rename CMcpxBuffer_Stop2 to CMcpxBuffer_Stop_Ex --- src/CxbxKrnl/HLEDataBase.h | 4 +-- src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl | 16 +++++----- src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl | 32 ++++++++++---------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl | 24 +++++++-------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 4 +-- src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl | 4 +-- src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl | 8 ++--- 7 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h index 36cf6cc06..e17b33944 100644 --- a/src/CxbxKrnl/HLEDataBase.h +++ b/src/CxbxKrnl/HLEDataBase.h @@ -271,7 +271,7 @@ enum XRefDataBaseOffset XREF_CDirectSoundBuffer_SetFilter, XREF_CDirectSoundStream_SetFilter, XREF_CDirectSoundBuffer_StopEx, - XREF_CMcpxBuffer_Stop2, + XREF_CMcpxBuffer_Stop_Ex, XREF_CMcpxAPU_Set3dDopplerFactor, XREF_CSensaura3d_GetFullHRTFFilterPair, XREF_CSensaura3d_GetLiteHRTFFilterPair, @@ -289,7 +289,7 @@ enum XRefDataBaseOffset XREF_CDirectSoundBuffer_SetNotificationPositions, XREF_CDirectSoundBuffer_SetEG, XREF_CDirectSound_GetEffectData, - XREF_CMcpxBuffer_Play2, + XREF_CMcpxBuffer_Play_Ex, XREF_CDirectSoundVoice_Use3DVoiceData, XREF_CDirectSoundBuffer_Use3DVoiceData, XREF_CDirectSoundStream_Use3DVoiceData, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl index 4885efd1b..4aab58e18 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl @@ -809,27 +809,27 @@ OOVPA_END; // ****************************************************************** // * public: long __thiscall DirectSound::CMcpxBuffer::Play(__int64,unsigned long) // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play2, 4039, 1+8, +OOVPA_XREF(CMcpxBuffer_Play_Ex, 4039, 1+8, - XREF_CMcpxBuffer_Play2, + XREF_CMcpxBuffer_Play_Ex, XRefOne) - // CMcpxBuffer_Play2+0x2B : call [CMcpxBuffer::Play] + // CMcpxBuffer_Play_Ex+0x2B : call [CMcpxBuffer::Play] XREF_ENTRY( 0x2B, XREF_CMcpxBuffer_Play ), - // CMcpxBuffer_Play2+0x00 : push ebp + // CMcpxBuffer_Play_Ex+0x00 : push ebp { 0x00, 0x55 }, - // CMcpxBuffer_Play2+0x11 : push [ebp+arg_8] + // CMcpxBuffer_Play_Ex+0x11 : push [ebp+arg_8] { 0x11, 0xFF }, { 0x12, 0x75 }, { 0x13, 0x10 }, - // CMcpxBuffer_Play2+0x23 : jnz +0x0C + // CMcpxBuffer_Play_Ex+0x23 : jnz +0x0C { 0x23, 0x75 }, { 0x24, 0x0C }, - // CMcpxBuffer_Play2+0x36 : push esi + // CMcpxBuffer_Play_Ex+0x36 : push esi { 0x36, 0xC2 }, { 0x37, 0x0C }, OOVPA_END; @@ -872,7 +872,7 @@ OOVPA_XREF(CDirectSoundBuffer_PlayEx, 4039, 1+7, XREF_CDirectSoundBuffer_PlayEx, XRefOne) - XREF_ENTRY( 0x3C, XREF_CMcpxBuffer_Play2), + XREF_ENTRY( 0x3C, XREF_CMcpxBuffer_Play_Ex), { 0x00, 0x56 }, { 0x15, 0x68 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index d361dceaa..d8e620289 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -3179,27 +3179,27 @@ OOVPA_END; // ****************************************************************** // * CMcpxBuffer::Stop2 // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Stop2, 4134, 1+8, +OOVPA_XREF(CMcpxBuffer_Stop_Ex, 4134, 1+8, - XREF_CMcpxBuffer_Stop2, + XREF_CMcpxBuffer_Stop_Ex, XRefOne) - // CMcpxBuffer_Stop2+0x2B : call [CMcpxBuffer::Stop] + // CMcpxBuffer_Stop_Ex+0x2B : call [CMcpxBuffer::Stop] XREF_ENTRY( 0x2B, XREF_CMcpxBuffer_Stop ), - // CMcpxBuffer_Stop2+0x00 : push ebp + // CMcpxBuffer_Stop_Ex+0x00 : push ebp { 0x00, 0x55 }, - // CMcpxBuffer_Stop2+0x11 : push [ebp+arg_8] + // CMcpxBuffer_Stop_Ex+0x11 : push [ebp+arg_8] { 0x11, 0xFF }, { 0x12, 0x75 }, { 0x13, 0x10 }, - // CMcpxBuffer_Stop2+0x23 : jnz +0x0C + // CMcpxBuffer_Stop_Ex+0x23 : jnz +0x0C { 0x23, 0x75 }, { 0x24, 0x0C }, - // CMcpxBuffer_Stop2+0x36 : push esi + // CMcpxBuffer_Stop_Ex+0x36 : push esi { 0x36, 0xC2 }, { 0x37, 0x0C }, OOVPA_END; @@ -4256,27 +4256,27 @@ OOVPA_END; // ****************************************************************** // * public: long __thiscall DirectSound::CMcpxBuffer::Play(__int64,unsigned long) // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play2, 4134, 1+8, +OOVPA_XREF(CMcpxBuffer_Play_Ex, 4134, 1+8, - XREF_CMcpxBuffer_Play2, + XREF_CMcpxBuffer_Play_Ex, XRefOne) - // CMcpxBuffer_Play2+0x2B : call [CMcpxBuffer::Play] + // CMcpxBuffer_Play_Ex+0x2B : call [CMcpxBuffer::Play] XREF_ENTRY( 0x2B, XREF_CMcpxBuffer_Play ), - // CMcpxBuffer_Play2+0x00 : push ebp + // CMcpxBuffer_Play_Ex+0x00 : push ebp { 0x00, 0x55 }, - // CMcpxBuffer_Play2+0x11 : push [ebp+arg_8] + // CMcpxBuffer_Play_Ex+0x11 : push [ebp+arg_8] { 0x11, 0xFF }, { 0x12, 0x75 }, { 0x13, 0x10 }, - // CMcpxBuffer_Play2+0x23 : jnz +0x0C + // CMcpxBuffer_Play_Ex+0x23 : jnz +0x0C { 0x23, 0x75 }, { 0x24, 0x0C }, - // CMcpxBuffer_Play2+0x36 : push esi + // CMcpxBuffer_Play_Ex+0x36 : push esi { 0x36, 0xC2 }, { 0x37, 0x0C }, OOVPA_END; @@ -4603,7 +4603,7 @@ OOVPA_XREF(CDirectSoundBuffer_PlayEx, 4134, 1+8, XREF_CDirectSoundBuffer_PlayEx, XRefOne) - XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Play2), + XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Play_Ex), { 0x00, 0x56 }, { 0x0C, 0x00 }, @@ -4623,7 +4623,7 @@ OOVPA_XREF(CDirectSoundBuffer_StopEx, 4134, 1+8, XREF_CDirectSoundBuffer_StopEx, XRefOne) - XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Stop2 ), + XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Stop_Ex ), { 0x00, 0x56 }, { 0x0C, 0x00 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index 05db617f1..18a7eb420 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -432,7 +432,7 @@ OOVPA_XREF(CDirectSoundBuffer_PlayEx, 4361, 1+7, XREF_CDirectSoundBuffer_PlayEx, XRefOne) - XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Play2), + XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Play_Ex), { 0x0C, 0x00 }, { 0x16, 0x68 }, @@ -447,24 +447,24 @@ OOVPA_END; // ****************************************************************** // * CMcpxBuffer::Stop2 // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Stop2, 4361, 1+9, +OOVPA_XREF(CMcpxBuffer_Stop_Ex, 4361, 1+9, - XREF_CMcpxBuffer_Stop2, + XREF_CMcpxBuffer_Stop_Ex, XRefOne) XREF_ENTRY( 0x2B, XREF_CMcpxBuffer_Stop), - // CMcpxBuffer_Stop2+0x03 : mov eax, [ebp+arg_0] + // CMcpxBuffer_Stop_Ex+0x03 : mov eax, [ebp+arg_0] { 0x03, 0x8B }, { 0x04, 0x45 }, { 0x05, 0x08 }, - // CMcpxBuffer_Stop2+0x14 : mov eax, [esi] + // CMcpxBuffer_Stop_Ex+0x14 : mov eax, [esi] { 0x14, 0x8B }, { 0x15, 0x06 }, - // CMcpxBuffer_Stop2+0x25 : mov edi, eax + // CMcpxBuffer_Stop_Ex+0x25 : mov edi, eax { 0x2F, 0x8B }, { 0x30, 0xF8 }, - // CMcpxBuffer_Stop2+0x36 : retn 0xC + // CMcpxBuffer_Stop_Ex+0x36 : retn 0xC { 0x36, 0xC2 }, { 0x37, 0x0C }, OOVPA_END; @@ -478,7 +478,7 @@ OOVPA_XREF(CDirectSoundBuffer_StopEx, 4361, 1+7, XREF_CDirectSoundBuffer_StopEx, XRefOne) - XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Stop2 ), + XREF_ENTRY( 0x3D, XREF_CMcpxBuffer_Stop_Ex ), { 0x0C, 0x00 }, { 0x16, 0x68 }, @@ -513,9 +513,9 @@ OOVPA_END; // ****************************************************************** // * public: long __thiscall DirectSound::CMcpxBuffer::Play(__int64,unsigned long) // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play2, 4361, 8, +OOVPA_XREF(CMcpxBuffer_Play_Ex, 4361, 8, - XREF_CMcpxBuffer_Play2, + XREF_CMcpxBuffer_Play_Ex, XRefZero) { 0x06, 0x56 }, @@ -532,9 +532,9 @@ OOVPA_END; // ****************************************************************** // * public: long __thiscall DirectSound::CMcpxBuffer::Play(__int64,unsigned long) // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play2, 5558, 12, +OOVPA_XREF(CMcpxBuffer_Play_Ex, 5558, 12, - XREF_CMcpxBuffer_Play2, + XREF_CMcpxBuffer_Play_Ex, XRefZero) { 0x00, 0x55 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index de3a10a59..8f06f5bd1 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -377,9 +377,9 @@ OOVPA_END; #endif // ****************************************************************** -// * CMcpxBuffer_Play2 +// * CMcpxBuffer_Play_Ex // ****************************************************************** -#define CMcpxBuffer_Play2_4627 CMcpxBuffer_Play2_4361 +#define CMcpxBuffer_Play_Ex_4627 CMcpxBuffer_Play_Ex_4361 // ****************************************************************** // * CDirectSound::SetDistanceFactorA diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index c873b0522..1918437fe 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -36,9 +36,9 @@ // ****************************************************************** // * DirectSound::CMcpxBuffer::Play // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play2, 5788, 7, +OOVPA_XREF(CMcpxBuffer_Play_Ex, 5788, 7, - XREF_CMcpxBuffer_Play2, + XREF_CMcpxBuffer_Play_Ex, XRefZero) { 0x17, 0x43 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl index 42eed49a8..4a22b7d46 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl @@ -204,14 +204,14 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CMcpxAPU_SynchPlayback, XREF, 4831), REGISTER_OOVPAS(CMcpxBuffer_GetCurrentPosition, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CMcpxBuffer_GetStatus, XREF, 3911, 4039, 4134, 4721, 4831), - REGISTER_OOVPAS(CMcpxBuffer_Pause, XREF, 4721, 4831), - REGISTER_OOVPAS(CMcpxBuffer_Pause_Ex, XREF, 4721), + REGISTER_OOVPAS(CMcpxBuffer_Pause, XREF, 4721, 4831), // NOTE: ?Pause@CMcpxBuffer@DirectSound@@QAEJK@Z + REGISTER_OOVPAS(CMcpxBuffer_Pause_Ex, XREF, 4721), // NOTE: ?Pause@CMcpxBuffer@DirectSound@@QAEJ_JK@Z REGISTER_OOVPAS(CMcpxBuffer_Play, XREF, 3911, 4039, 4134, 4721, 4831), // NOTE: ?Play@CMcpxBuffer@DirectSound@@QAEJK@Z - REGISTER_OOVPAS(CMcpxBuffer_Play2, XREF, 4039/*, 4361*/), // NOTE: ?Play@CMcpxBuffer@DirectSound@@QAEJ_JK@Z + REGISTER_OOVPAS(CMcpxBuffer_Play_Ex, XREF, 4039/*, 4361*/), // NOTE: ?Play@CMcpxBuffer@DirectSound@@QAEJ_JK@Z REGISTER_OOVPAS(CMcpxBuffer_SetBufferData, XREF, 4134, 5455), REGISTER_OOVPAS(CMcpxBuffer_SetCurrentPosition, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CMcpxBuffer_Stop, XREF, 3911, 4134, 4242), // NOTE: ?Stop@CMcpxBuffer@DirectSound@@QAEJK@Z - REGISTER_OOVPAS(CMcpxBuffer_Stop2, XREF, 4134/*, 4361*/), // NOTE: ?Stop@CMcpxBuffer@DirectSound@@QAEJ_JK@Z + REGISTER_OOVPAS(CMcpxBuffer_Stop_Ex, XREF, 4134/*, 4361*/), // NOTE: ?Stop@CMcpxBuffer@DirectSound@@QAEJ_JK@Z REGISTER_OOVPAS(CMcpxStream_Discontinuity, XREF, 3911, 4039, 4134, 4531/*, 5344*/, 5455), REGISTER_OOVPAS(CMcpxStream_Flush, XREF, 3911, 3936, 4039, 4134/*, 4242, 4361, 5344*/, 5455), REGISTER_OOVPAS(CMcpxStream_GetStatus, XREF, 4134, 4721/*, 5233*/),