diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index 72261cfd6..801bf6e28 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -436,25 +436,6 @@ OOVPA_XREF(DirectSound_CDirectSoundBuffer_PlayEx, 4361, 8, { 0x52, 0x8B }, OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer_PlayEx -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_PlayEx, 4361, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DirectSound_CDirectSoundBuffer_PlayEx ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - // ****************************************************************** // * CMcpxBuffer::Stop2 // ****************************************************************** @@ -518,111 +499,6 @@ OOVPA_XREF(IDirectSoundBuffer_StopEx, 4361, 8, { 0x21, 0xC2 }, OOVPA_END; -// ****************************************************************** -// * DirectSound_CDirectSoundVoice::SetMixBins -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMixBins, 4361, 17, - - XREF_DSSETMIXBINSB, - XRefOne) - - // DirectSound_CDirectSoundVoice_SetMixBins+0x0D : call [CDirectSoundVoiceSettings::SetMixBins] - XREF_ENTRY( 0x0D, XREF_DSSETMIXBINSC ), // (Offset,Value)-Pair #1 - - // DirectSound_CDirectSoundVoice_SetMixBins+0x01 : mov esi, [esp+8] - { 0x01, 0x8B }, // (Offset,Value)-Pair #2 - { 0x02, 0x74 }, // (Offset,Value)-Pair #3 - { 0x03, 0x24 }, // (Offset,Value)-Pair #4 - { 0x04, 0x08 }, // (Offset,Value)-Pair #5 - - // DirectSound_CDirectSoundVoice_SetMixBins+0x05 : push [esp+0x0C] - { 0x05, 0xFF }, // (Offset,Value)-Pair #6 - { 0x06, 0x74 }, // (Offset,Value)-Pair #7 - { 0x07, 0x24 }, // (Offset,Value)-Pair #8 - { 0x08, 0x0C }, // (Offset,Value)-Pair #9 - - // DirectSound_CDirectSoundVoice_SetMixBins+0x09 : mov ecx, [esi+0x10] - { 0x09, 0x8B }, // (Offset,Value)-Pair #10 - { 0x0A, 0x4E }, // (Offset,Value)-Pair #11 - { 0x0B, 0x10 }, // (Offset,Value)-Pair #12 - - // DirectSound_CDirectSoundVoice_SetMixBins+0x11 : mov ecx, [esi+0x0C] - { 0x11, 0x8B }, // (Offset,Value)-Pair #13 - { 0x12, 0x4E }, // (Offset,Value)-Pair #14 - { 0x13, 0x0C }, // (Offset,Value)-Pair #15 - - // DirectSound_CDirectSoundVoice_SetMixBins+0x1A : retn 0x08 - { 0x1A, 0xC2 }, // (Offset,Value)-Pair #16 - { 0x1B, 0x08 }, // (Offset,Value)-Pair #17 -OOVPA_END; - -// ****************************************************************** -// * DirectSound_CDirectSoundBuffer::SetMixBins -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMixBins, 4361, 17, - - XREF_DSSETMIXBINSA, - XRefOne) - - // DirectSound_CDirectSoundBuffer_SetMixBins+0x32 : call [CDirectSoundVoice::SetMixBins] - XREF_ENTRY( 0x32, XREF_DSSETMIXBINSB ), // (Offset,Value)-Pair #1 - - // DirectSound_CDirectSoundBuffer_SetMixBins+0x21 : mov eax, 0x80004005 - { 0x21, 0xB8 }, // (Offset,Value)-Pair #2 - { 0x22, 0x05 }, // (Offset,Value)-Pair #3 - { 0x23, 0x40 }, // (Offset,Value)-Pair #4 - { 0x24, 0x00 }, // (Offset,Value)-Pair #5 - { 0x25, 0x80 }, // (Offset,Value)-Pair #6 - - // DirectSound_CDirectSoundBuffer_SetMixBins+0x29 : push [esp+0x10]; push [esp+0x10] - { 0x29, 0xFF }, // (Offset,Value)-Pair #7 - { 0x2A, 0x74 }, // (Offset,Value)-Pair #8 - { 0x2B, 0x24 }, // (Offset,Value)-Pair #9 - { 0x2C, 0x10 }, // (Offset,Value)-Pair #10 - { 0x2D, 0xFF }, // (Offset,Value)-Pair #11 - { 0x2E, 0x74 }, // (Offset,Value)-Pair #12 - { 0x2F, 0x24 }, // (Offset,Value)-Pair #13 - { 0x30, 0x10 }, // (Offset,Value)-Pair #14 - - // DirectSound_CDirectSoundBuffer_SetMixBins+0x49 : pop edi - { 0x49, 0x5F }, // (Offset,Value)-Pair #15 - - // DirectSound_CDirectSoundBuffer_SetMixBins+0x4B : retn 0x08 - { 0x4B, 0xC2 }, // (Offset,Value)-Pair #16 - { 0x4C, 0x08 }, // (Offset,Value)-Pair #17 -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetMixBins -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 4361, 12, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetMixBins+0x15 : call [CDirectSoundBuffer::SetMixBins] - XREF_ENTRY( 0x15, XREF_DSSETMIXBINSA ), // (Offset,Value)-Pair #1 - - // IDirectSoundBuffer_SetMixBins+0x04 : push [esp+0x08] - { 0x04, 0xFF }, // (Offset,Value)-Pair #2 - { 0x05, 0x74 }, // (Offset,Value)-Pair #3 - { 0x06, 0x24 }, // (Offset,Value)-Pair #4 - { 0x07, 0x08 }, // (Offset,Value)-Pair #5 - - // IDirectSoundBuffer_SetMixBins+0x0A : add eax, 0xFFFFFFE4 - { 0x0A, 0x83 }, // (Offset,Value)-Pair #6 - { 0x0B, 0xC0 }, // (Offset,Value)-Pair #7 - { 0x0C, 0xE4 }, // (Offset,Value)-Pair #8 - - // IDirectSoundBuffer_SetMixBins+0x0F : sbb ecx, ecx - { 0x0F, 0x1B }, // (Offset,Value)-Pair #9 - { 0x10, 0xC9 }, // (Offset,Value)-Pair #10 - - // IDirectSoundBuffer_SetMixBins+0x11 : and ecx, eax - { 0x11, 0x23 }, // (Offset,Value)-Pair #11 - { 0x12, 0xC8 }, // (Offset,Value)-Pair #12 -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetFormat // ****************************************************************** @@ -740,15 +616,15 @@ OOVPATable DSound_4361[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4361, XREF), REGISTER_OOVPA(CMcpxBuffer_PlayA, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4134, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4361, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4361, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4134, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 4134, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4134, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4361, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl index f688d2a14..303936a4a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl @@ -99,32 +99,6 @@ OOVPA_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 4432, 10, { 0xB3, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; -// ****************************************************************** -// * DirectSound_CDirectSound::SetDistanceFactorA -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_SetDistanceFactorA, 4432, 11, - - XREF_SETDISTANCEFACTORA, - XRefZero) - - // DirectSound_CDirectSound_SetDistanceFactorA+0x21 : mov eax, 0x80004005 - { 0x21, 0xB8 }, // (Offset,Value)-Pair #1 - { 0x22, 0x05 }, // (Offset,Value)-Pair #2 - { 0x23, 0x40 }, // (Offset,Value)-Pair #3 - { 0x24, 0x00 }, // (Offset,Value)-Pair #4 - { 0x25, 0x80 }, // (Offset,Value)-Pair #5 - - // DirectSound_CDirectSound_SetDistanceFactorA+0x39 : or dword ptr[eax+0xA4], 0x60 - { 0x39, 0x83 }, // (Offset,Value)-Pair #6 - { 0x3A, 0x88 }, // (Offset,Value)-Pair #7 - { 0x3B, 0xA4 }, // (Offset,Value)-Pair #8 - { 0x3F, 0x60 }, // (Offset,Value)-Pair #9 - - // DirectSound_CDirectSound_SetDistanceFactorA+0x4F : jz +0x0B - { 0x4F, 0x74 }, // (Offset,Value)-Pair #10 - { 0x50, 0x0B }, // (Offset,Value)-Pair #11 -OOVPA_END; - // ****************************************************************** // * DirectSoundCreate, 4432 // ****************************************************************** @@ -166,7 +140,7 @@ OOVPATable DSound_4432[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 4134, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 4432, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 4134, XREF), REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4134, PATCH), REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index e37e97439..c8abf67a5 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -1602,7 +1602,7 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4134, PATCH), REGISTER_OOVPA(CMcpxBuffer_PlayA, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH), REGISTER_OOVPA(CMcpxBuffer_Stop, 4361, XREF), REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 4361, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl index 06266cc76..0c47429ca 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl @@ -222,7 +222,7 @@ OOVPATable DSound_5028[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4134, PATCH), REGISTER_OOVPA(CMcpxBuffer_PlayA, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH), REGISTER_OOVPA(CMcpxBuffer_Stop, 4361, XREF), REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 4361, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index dfe9765e3..33f22a0e0 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -121,34 +121,6 @@ OOVPA_XREF(IDirectSoundBuffer_StopEx, 5233, 9, { 0x16, 0x10 }, // (Offset,Value)-Pair #9 OOVPA_END; -// ****************************************************************** -// * CMcpxStream_Pause -// ****************************************************************** -OOVPA_XREF(CMcpxStream_Pause, 5233, 11, - - XREF_DSSTREAMPAUSE, - XRefZero) - - // CMcpxStream_Pause+0x17 : and ax, 0xFFDF - { 0x17, 0x66 }, // (Offset,Value)-Pair #1 - { 0x18, 0x25 }, // (Offset,Value)-Pair #2 - { 0x19, 0xDF }, // (Offset,Value)-Pair #3 - - // CMcpxStream_Pause+0x32 : jmp +0x56 - { 0x32, 0xEB }, // (Offset,Value)-Pair #4 - { 0x33, 0x56 }, // (Offset,Value)-Pair #5 - - // CMcpxStream_Pause+0x39 : movzx eax, word ptr [esi+0x12] - { 0x39, 0x0F }, // (Offset,Value)-Pair #6 - { 0x3A, 0xB7 }, // (Offset,Value)-Pair #7 - { 0x3B, 0x46 }, // (Offset,Value)-Pair #8 - { 0x3C, 0x12 }, // (Offset,Value)-Pair #9 - - // CMcpxStream_Pause+0x8B : retn 0x04 - { 0x8B, 0xC2 }, // (Offset,Value)-Pair #10 - { 0x8C, 0x04 }, // (Offset,Value)-Pair #11 -OOVPA_END; - // ****************************************************************** // CMcpxAPU::SynchPlayback // ****************************************************************** @@ -321,45 +293,6 @@ OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetVolume, 5233, 8, { 0x47, 0x8B }, OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer8::SetVolume -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVolume, 5233, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_SetVolume ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound_CDirectSoundStream::SetVolume -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundStream_SetVolume, 5233, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_DirectSound_CDirectSoundVoice_SetVolume ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; - // ****************************************************************** // * DirectSound_CDirectSoundStream::SetFrequency // ****************************************************************** @@ -416,44 +349,6 @@ OOVPA_XREF(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5233, 8, { 0x3E, 0x33 }, OOVPA_END; -// ****************************************************************** -// * DirectSound_CDirectSoundBuffer::SetRolloffCurve -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, 8, - - XREF_DSBUFFERSETROLLOFFCURVE, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_DSVOICESETROLLOFFCURVE ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x74 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetRolloffCurve -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetRolloffCurve, 5233, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETROLLOFFCURVE ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - // ****************************************************************** // * Direct, 5233 // ****************************************************************** @@ -465,7 +360,7 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(CMcpxAPU_SynchPlayback, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5233, XREF), REGISTER_OOVPA(IDirectSound_SynchPlayback, 5233, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 5233, XREF), + REGISTER_OOVPA(CMcpxStream_Pause, 4928, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4134, XREF), REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 4134, PATCH), @@ -487,7 +382,7 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVolume, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 5233, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4134, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_LockA, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3936, PATCH), @@ -535,7 +430,7 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4134, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4134, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 5233, PATCH), // (This is actually the XREF we are using) + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4134, PATCH), // (This is actually the XREF we are using) REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, PATCH), @@ -544,8 +439,8 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMode, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 5233, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5233, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 5233, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4134, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl index 1b60aadce..b5c8be544 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl @@ -113,26 +113,6 @@ OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 5344, 8, { 0xFE, 0x8B }, OOVPA_END; -// ****************************************************************** -// * IDirectSound_SetI3DL2Listener -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetI3DL2Listener, 5344, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DSSETI3DL2LISTENER ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - // ****************************************************************** // * DirectSound_CDirectSoundVoice::SetDistanceFactor // ****************************************************************** @@ -250,25 +230,6 @@ OOVPA_XREF(DirectSound_CDirectSound_SetDopplerFactor, 5344, 9, { 0x5E, 0x00 }, OOVPA_END; -// ****************************************************************** -// * IDirectSound_SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetDopplerFactor, 5344, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_SETDOPPLERFACTOR ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetMaxDistance @@ -873,7 +834,7 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(DirectSound_CMcpxBuffer_Pause, 4928, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Pause, 4928, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 5233, XREF), + REGISTER_OOVPA(CMcpxStream_Pause, 4928, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), // REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4134, DISABLED), // 5344 XREF is already in here // REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 4134, DISABLED), // 5344 XREF is already in here @@ -895,7 +856,7 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVolume, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 5233, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4134, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_LockA, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3936, PATCH), @@ -929,7 +890,7 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5344, XREF), - REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 5344, PATCH), + REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3936, PATCH), // REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 4134, DISABLED), // 5344 XREF is already in here REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 5344, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5344, XREF), @@ -950,7 +911,7 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4134, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4134, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 5233, PATCH), // (This is actually the XREF we are using) + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4134, PATCH), // (This is actually the XREF we are using) REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, PATCH), @@ -958,11 +919,11 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMode, 5233, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 5233, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5344, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 5233, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5344, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 5344, PATCH), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffFactor, 5344, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffFactor, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 4134, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index cb7ef4e36..efbe0ac20 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -46,34 +46,6 @@ OOVPA_NO_XREF(DirectSound_CDirectSound_SynchPlayback, 5558, 7) { 0x46, 0x8B }, OOVPA_END; -// ****************************************************************** -// * CMcpxStream_Pause -// ****************************************************************** -OOVPA_XREF(CMcpxStream_Pause, 5558, 11, - - XREF_DSSTREAMPAUSE, - XRefZero) - - // CMcpxStream_Pause+0x17 : and ax, 0xFFDF - { 0x17, 0x66 }, // (Offset,Value)-Pair #1 - { 0x18, 0x25 }, // (Offset,Value)-Pair #2 - { 0x19, 0xDF }, // (Offset,Value)-Pair #3 - - // CMcpxStream_Pause+0x32 : jmp +0x56 - { 0x32, 0xEB }, // (Offset,Value)-Pair #4 - { 0x33, 0x56 }, // (Offset,Value)-Pair #5 - - // CMcpxStream_Pause+0x39 : movzx eax, word ptr [esi+0x12] - { 0x39, 0x0F }, // (Offset,Value)-Pair #6 - { 0x3A, 0xB7 }, // (Offset,Value)-Pair #7 - { 0x3B, 0x46 }, // (Offset,Value)-Pair #8 - { 0x3C, 0x12 }, // (Offset,Value)-Pair #9 - - // CMcpxStream_Pause+0x8B : retn 0x04 - { 0x8B, 0xC2 }, // (Offset,Value)-Pair #10 - { 0x8C, 0x04 }, // (Offset,Value)-Pair #11 -OOVPA_END; - // ****************************************************************** // * DirectSound_CDirectSound::CommitDeferredSettings // ****************************************************************** @@ -220,26 +192,6 @@ OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 5558, 8, { 0xF6, 0x68 }, OOVPA_END; -// ****************************************************************** -// * IDirectSound_SetI3DL2Listener -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetI3DL2Listener, 5558, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DSSETI3DL2LISTENER ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CFullHRTFSource::GetCenterVolume // ****************************************************************** @@ -402,110 +354,6 @@ OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 5558, 8, { 0x1A, 0x08 }, OOVPA_END; -// ****************************************************************** -// * CMcpxVoiceClient::SetLFO -// ****************************************************************** -OOVPA_XREF(CMcpxVoiceClient_SetLFO, 5558, 8, - - XREF_DirectSound_CMcpxVoiceClient_SetLFO, - XRefZero) - - { 0x1E, 0x48 }, - { 0x3E, 0x31 }, - { 0x5E, 0x35 }, - { 0x7E, 0xE1 }, - { 0x9E, 0x8B }, - { 0xBE, 0x8B }, - { 0xDE, 0x05 }, - { 0xFE, 0x6C }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound_CDirectSoundVoice::SetLFO -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetLFO, 5558, 7, - - XREF_DirectSound_CDirectSoundVoice_SetLFO, - XRefOne) - - XREF_ENTRY( 0x0C, XREF_DirectSound_CMcpxVoiceClient_SetLFO ), - - { 0x01, 0x44 }, - { 0x04, 0xFF }, - { 0x07, 0x08 }, - { 0x0A, 0x0C }, - { 0x10, 0xC2 }, - { 0x11, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound_CDirectSoundBuffer::SetLFO -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetLFO, 5558, 8, - - XREF_DirectSound_CDirectSoundBuffer_SetLFO, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DirectSound_CDirectSoundVoice_SetLFO ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetLFO -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLFO, 5558, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_SetLFO ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * CMcpxVoiceClient_SetVolume -// ****************************************************************** -OOVPA_XREF(CMcpxVoiceClient_SetVolume, 5558, 13, - - XREF_DSSTREAMSETVOLUME, - XRefZero) - - // CMcpxVoiceClient_SetVolume+0x2A : lea eax, [ecx+ecx*2] - { 0x2A, 0x8D }, // (Offset,Value)-Pair #1 - { 0x2B, 0x04 }, // (Offset,Value)-Pair #2 - { 0x2C, 0x49 }, // (Offset,Value)-Pair #3 - - // CMcpxVoiceClient_SetVolume+0x45 : movzx edx, word ptr [ecx] - { 0x45, 0x0F }, // (Offset,Value)-Pair #4 - { 0x46, 0xB7 }, // (Offset,Value)-Pair #5 - { 0x47, 0x11 }, // (Offset,Value)-Pair #6 - - // CMcpxVoiceClient_SetVolume+0x6C : mov edx, [ebp+eax*4-0x14] - { 0x6C, 0x8B }, // (Offset,Value)-Pair #7 - { 0x6D, 0x54 }, // (Offset,Value)-Pair #8 - { 0x6E, 0x85 }, // (Offset,Value)-Pair #9 - { 0x6F, 0xEC }, // (Offset,Value)-Pair #10 - - // CMcpxVoiceClient_SetVolume+0x84 : inc eax; inc ecx, inc ecx - { 0x84, 0x40 }, // (Offset,Value)-Pair #11 - { 0x85, 0x41 }, // (Offset,Value)-Pair #12 - { 0x86, 0x41 }, // (Offset,Value)-Pair #13 -OOVPA_END; - // ****************************************************************** // * DirectSound_CDirectSoundVoiceSettings::SetMixBins // ****************************************************************** @@ -598,26 +446,6 @@ OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetPlayRegion, 5558, 8, { 0x7E, 0x0C }, OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer_SetPlayRegion -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPlayRegion, 5558, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DSBUFFERSETPLAYREGIONA ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - // ****************************************************************** // * DirectSound_CDirectSoundBuffer::SetLoopRegion // ****************************************************************** @@ -635,26 +463,6 @@ OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5558, 7, { 0x77, 0xFF }, OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer_SetLoopRegion -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 5558, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DirectSound_CDirectSoundBuffer_SetLoopRegion ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - // ****************************************************************** // * CMcpxBuffer::Play // ****************************************************************** @@ -862,124 +670,6 @@ OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 5558, 8, { 0x21, 0xC2 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMaxDistance -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMaxDistance, 5558, 7, - - XREF_DSVOICESETMAXDISTANCE, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x3C }, - { 0x1A, 0x00 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound_CDirectSoundBuffer::SetMaxDistance -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5558, 11, - - XREF_DSBUFFERSETMAXDISTANCE, - XRefOne) - - // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x39 : call [CDirectSoundVoice::SetMaxDistance] - XREF_ENTRY( 0x3A, XREF_DSVOICESETMAXDISTANCE ), - - { 0x00, 0x56 }, - // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x21 : mov eax, 80004005h - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x32 : fstp [esp+0Ch+var_C] - { 0x32, 0xD9 }, - { 0x33, 0x1C }, - { 0x34, 0x24 }, - - // DirectSound_CDirectSoundBuffer_SetMaxDistance+0x53 : retn 0Ch - { 0x54, 0x0C }, - { 0x55, 0x00 } -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetMaxDistance -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 5558, 11, - - XRefNoSaveIndex, - XRefOne) - - // IDirectSoundBuffer_SetMaxDistance+0x1C : call [CDirectSoundBuffer::SetMaxDistance] - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETMAXDISTANCE ), - - { 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; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMinDistance -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMinDistance, 5558, 7, - - XREF_DSVOICESETMINDISTANCE, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x38 }, - { 0x1A, 0x00 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound_CDirectSoundBuffer::SetMinDistance -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMinDistance, 5558, 11, - - XREF_DSBUFFERSETMINDISTANCE, - XRefOne) - - // DirectSound_CDirectSoundBuffer_SetMinDistance+0x39 : call [CDirectSoundVoice::SetMinDistance] - XREF_ENTRY( 0x3A, XREF_DSVOICESETMINDISTANCE ), - - { 0x00, 0x56 }, - // DirectSound_CDirectSoundBuffer_SetMinDistance+0x21 : mov eax, 80004005h - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // DirectSound_CDirectSoundBuffer_SetMinDistance+0x32 : fstp [esp+0Ch+var_C] - { 0x32, 0xD9 }, - { 0x33, 0x1C }, - { 0x34, 0x24 }, - - // DirectSound_CDirectSoundBuffer_SetMinDistance+0x53 : retn 0Ch - { 0x54, 0x0C }, - { 0x55, 0x00 } -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMinDistance // ****************************************************************** @@ -1067,25 +757,6 @@ OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 5558, 14, { 0x31, 0x0C }, { 0x32, 0x00 }, OOVPA_END; - -// ****************************************************************** -// * CDirectSoundBuffer::SetAllParameters -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetAllParameters, 5558, 8, - - XREF_DirectSound_CDirectSoundBuffer_SetAllParameters, - XRefOne) - - XREF_ENTRY( 0x36, XREF_DirectSound_CDirectSoundVoice_SetAllParameters ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x74 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; /* // ****************************************************************** // * IDirectSoundBuffer8::SetAllParameters @@ -1458,45 +1129,6 @@ OOVPA_XREF(DirectSound_CDirectSoundVoice_SetAllParameters, 5558, 10, { 0xF6, 0x89 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetAllParameters -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetAllParameters, 5558, 8, - - XREF_DirectSound_CDirectSoundBuffer_SetAllParameters, - XRefOne) - - XREF_ENTRY( 0x36, XREF_DirectSound_CDirectSoundVoice_SetAllParameters ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x74 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetAllParameters -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetAllParameters, 5558, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DirectSound_CDirectSoundBuffer_SetAllParameters ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetHeadroom // ****************************************************************** @@ -1979,7 +1611,7 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5558, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 5558, XREF), + REGISTER_OOVPA(CMcpxStream_Pause, 4928, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, XREF), @@ -2000,17 +1632,17 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFrequency, 5558, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4134, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 5558, XREF), + REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 4361, XREF), REGISTER_OOVPA(DirectSoundCreateStream, 4361, PATCH), REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSound_SetOrientation, 3936, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5558, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 5558, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 5558, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5344, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5344, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 5344, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 5344, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 5344, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetRolloffCurve, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 5558, PATCH), // REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffFactor, 4627, XREF), // THESE ARE NOT CORRECT @@ -2023,7 +1655,7 @@ OOVPATable DSound_5558[] = { // REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 4627, XREF), // REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 5558, PATCH), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3936, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), REGISTER_OOVPA(DirectSound_CFullHRTFSource_GetCenterVolume, 5558, XREF), REGISTER_OOVPA(DirectSound_CHRTFSource_SetFullHRTF5Channel, 5558, XREF), @@ -2034,22 +1666,22 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 5558, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 5558, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetLFO, 5558, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLFO, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 5558, PATCH), + REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetLFO, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLFO, 4627, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVolume, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 5233, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPlayRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 5558, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 5558, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4134, PATCH), REGISTER_OOVPA(CMcpxBuffer_Play, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Play, 5558, PATCH), @@ -2065,12 +1697,12 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetConeAngles, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5233, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetRolloffCurve, 5558, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 5233, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_CommitDeferredSettings, 5558, XREF), // REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5558, XREF), - // REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 5558, XREF), + // REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 4134, XREF), // REGISTER_OOVPA(IDirectSound_SetAllParameters, 5558, ALIAS, IDirectSoundBuffer8_SetAllParameters), // Use that for now REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPosition, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPosition, 5558, XREF), @@ -2081,15 +1713,15 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDistanceFactor, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 5558, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 5233, PATCH), // (This is actually the XREF we are using) + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4134, PATCH), // (This is actually the XREF we are using) REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetI3DL2Source, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetI3DL2Source, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 4134, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetHeadroom, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index b7f8ee8be..cefb7ba76 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -32,72 +32,6 @@ // * // ****************************************************************** -// ****************************************************************** -// * CMcpxBuffer_GetStatus -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_GetStatus, 5788, 11, - - XREF_DSBUFFERGETSTATUSA, - XRefZero) - - // CMcpxBuffer_GetStatus+0x04 : mov ecx, eax - { 0x04, 0x8B }, // (Offset,Value)-Pair #1 - { 0x05, 0xC8 }, // (Offset,Value)-Pair #2 - - // CMcpxBuffer_GetStatus+0x0C : jnz +0x1B - { 0x0C, 0x75 }, // (Offset,Value)-Pair #3 - { 0x0D, 0x1B }, // (Offset,Value)-Pair #4 - - // CMcpxBuffer_GetStatus+0x12 : test ax, 0x444 - { 0x12, 0x66 }, // (Offset,Value)-Pair #5 - { 0x13, 0xA9 }, // (Offset,Value)-Pair #6 - { 0x14, 0x44 }, // (Offset,Value)-Pair #7 - - // CMcpxBuffer_GetStatus+0x29 : mov ecx, 0x8001 - { 0x29, 0xB9 }, // (Offset,Value)-Pair #8 - { 0x2A, 0x01 }, // (Offset,Value)-Pair #9 - { 0x2B, 0x80 }, // (Offset,Value)-Pair #10 - { 0x2C, 0x00 }, // (Offset,Value)-Pair #11 -OOVPA_END; - -// ****************************************************************** -// * DirectSound_CDirectSound_SetI3DL2Listener -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 5788, 8, - - XREF_DSSETI3DL2LISTENER, - XRefZero) - - { 0x1D, 0xFF }, - { 0x3C, 0x00 }, - { 0x5B, 0x9A }, - { 0x7A, 0x10 }, - { 0x99, 0x00 }, - { 0xB8, 0x50 }, - { 0xD7, 0x00 }, - { 0xF6, 0x68 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_SetI3DL2Listener -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetI3DL2Listener, 5788, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DSSETI3DL2LISTENER ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - // ****************************************************************** // * CMcpxBuffer_SetBufferData // ****************************************************************** @@ -124,61 +58,6 @@ OOVPA_XREF(CMcpxBuffer_SetBufferData, 5788, 9, { 0x8A, 0x08 }, // (Offset,Value)-Pair #9 OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetFormat -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetFormat, 5788, 7, - - XREF_DirectSound_CDirectSoundVoice_SetFormat, - XRefZero) - - { 0x07, 0x10 }, - { 0x13, 0x85 }, - { 0x19, 0x10 }, - { 0x22, 0x0C }, - { 0x2B, 0x14 }, - { 0x34, 0x85 }, - { 0x40, 0x5E }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetFormat -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetFormat, 5788, 8, - - XREF_DirectSound_CDirectSoundBuffer_SetFormat, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DirectSound_CDirectSoundVoice_SetFormat ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetFormat -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFormat, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_SetFormat ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - // ****************************************************************** // * CMcpxBuffer_Play // ****************************************************************** @@ -207,24 +86,6 @@ OOVPA_XREF(CMcpxBuffer_Play, 5788, 11, { 0xA6, 0x1C }, // (Offset,Value)-Pair #11 OOVPA_END; -// ****************************************************************** -// * DirectSound::CMcpxBuffer::Play -// ****************************************************************** -OOVPA_XREF(DirectSound_CMcpxBuffer_Play, 5788, 8, - - XREF_DirectSound_CMcpxBuffer_Play, - XRefZero) - - { 0x06, 0x56 }, - { 0x0E, 0xF1 }, - { 0x16, 0xFF }, - { 0x1D, 0x03 }, - { 0x1E, 0xFF }, - { 0x26, 0x75 }, - { 0x2F, 0x8B }, - { 0x36, 0xC2 }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CMcpxBuffer::Play // ****************************************************************** @@ -261,299 +122,6 @@ OOVPA_XREF(DirectSound_CDirectSoundBuffer_Play, 5788, 9, { 0x4B, 0xC7 }, OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer_Play -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Play, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DSOUNDPLAY2 ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetHeadroom -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetHeadroom, 5788, 7, - - XREF_DirectSound_CDirectSoundVoice_SetHeadroom, - XRefZero) - - { 0x03, 0x04 }, - { 0x08, 0x48 }, - { 0x0D, 0x24 }, - { 0x12, 0x48 }, - { 0x17, 0x8B }, - { 0x1F, 0x5E }, - { 0x21, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetHeadroom -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetHeadroom, 5788, 8, - - XREF_DirectSound_CDirectSoundBuffer_SetHeadroom, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DirectSound_CDirectSoundVoice_SetHeadroom ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetHeadroom -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_SetHeadroom ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_Lock -// ****************************************************************** -OOVPA_NO_XREF(IDirectSoundBuffer_Lock, 5788, 8) - - { 0x04, 0x75 }, - { 0x0A, 0x75 }, - { 0x10, 0x1C }, - { 0x16, 0x18 }, - { 0x1C, 0x1B }, - { 0x22, 0xC8 }, - { 0x2C, 0x5D }, - { 0x2E, 0x20 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoiceSettings::SetMixBins -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 5788, 7, - - XREF_DSSETMIXBINSC, - XRefZero) - - { 0x1B, 0xEB }, - { 0x32, 0x8B }, - { 0x4C, 0x7C }, - { 0x66, 0x00 }, - { 0x84, 0xF6 }, - { 0x9A, 0xB4 }, - { 0xB4, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMixBins -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMixBins, 5788, 8, - - XREF_DSSETMIXBINSB, - XRefOne) - - XREF_ENTRY( 0x0D, XREF_DSSETMIXBINSC ), - - { 0x02, 0x74 }, - { 0x06, 0x74 }, - { 0x0A, 0x4E }, - { 0x11, 0x8B }, - { 0x12, 0x4E }, - { 0x19, 0x5E }, - { 0x1A, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetMixBins -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMixBins, 5788, 8, - - XREF_DSSETMIXBINSA, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DSSETMIXBINSB ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetMixBins -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBins, 5788, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_DSSETMIXBINSB ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetMixBins -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DSSETMIXBINSA ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSound::SetMixBinHeadroom -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_SetMixBinHeadroom, 5788, 8, - - XREF_DSSETMIXBINHEADROOMA, - XRefZero) - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x24 }, - { 0x3A, 0x5C }, - { 0x46, 0x85 }, - { 0x52, 0x15 }, - { 0x5E, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_SetMixBinHeadroom -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 5788, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DSSETMIXBINHEADROOMA ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSound::SetPosition -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_SetPosition, 5788, 7, - - XREF_DSSETPOSITIONA, - XRefZero) - - { 0x0F, 0x00 }, - { 0x1E, 0xFF }, - { 0x2B, 0x8B }, - { 0x3A, 0x8B }, - { 0x49, 0x40 }, - { 0x58, 0xE8 }, - { 0x67, 0x15 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_SetPosition -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetPosition, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_DSSETPOSITIONA ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xF8 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSound::SetVelocity -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_SetVelocity, 5788, 7, - - XREF_DSSETVELOCITYA, - XRefZero) - - { 0x0F, 0x00 }, - { 0x1E, 0xFF }, - { 0x2B, 0x8B }, - { 0x3A, 0x8B }, - { 0x49, 0x4C }, - { 0x58, 0xE8 }, - { 0x67, 0x15 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_SetVelocity -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetVelocity, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_DSSETVELOCITYA ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xF8 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSound::CommitDeferredSettings // ****************************************************************** @@ -626,80 +194,6 @@ OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 5788, 8, { 0x1A, 0x08 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::GetCurrentPosition -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 5788, 7, - - XREF_GETCURRENTPOSITION, - XRefZero) - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0x74 }, - { 0x40, 0xF8 }, - { 0x4E, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_GetCurrentPosition -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetCurrentPosition, 5788, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_GETCURRENTPOSITION ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetLoopRegion -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5788, 7, - - XREF_DirectSound_CDirectSoundBuffer_SetLoopRegion, - XRefZero) - - { 0x0F, 0x00 }, - { 0x24, 0xB8 }, - { 0x31, 0x55 }, - { 0x42, 0xC8 }, - { 0x53, 0x00 }, - { 0x64, 0x8B }, - { 0x77, 0xFF }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetLoopRegion -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 5788, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DirectSound_CDirectSoundBuffer_SetLoopRegion ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CMcpxBuffer::Stop // ****************************************************************** @@ -794,94 +288,6 @@ OOVPA_XREF(DirectSound_CDirectSound_SetDopplerFactor, 5788, 9, { 0x5E, 0x00 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetPitch -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetPitch, 5788, 6, - - XREF_DSBUFFERSETPITCHB, - XRefZero) - - { 0x02, 0x24 }, - { 0x06, 0x10 }, - { 0x0A, 0x08 }, - { 0x0E, 0x8B }, - { 0x16, 0xC2 }, - { 0x17, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetPitch -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetPitch, 5788, 8, - - XREF_DSBUFFERSETPITCHA, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DSBUFFERSETPITCHB ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetPitch -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPitch, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DSBUFFERSETPITCHA ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMaxDistance -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMaxDistance, 5788, 7, - - XREF_DSVOICESETMAXDISTANCE, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x3C }, - { 0x1A, 0x00 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMinDistance -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMinDistance, 5788, 7, - - XREF_DSVOICESETMINDISTANCE, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x38 }, - { 0x1A, 0x00 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetMaxDistance // ****************************************************************** @@ -1015,25 +421,6 @@ OOVPA_END; // { 0x4B, 0x8B }, //OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer_SetVolume -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVolume, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_SetVolume ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundBuffer::PlayEx // ****************************************************************** @@ -1053,25 +440,6 @@ OOVPA_XREF(DirectSound_CDirectSoundBuffer_PlayEx, 5788, 8, { 0x52, 0x8B }, OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer_PlayEx -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_PlayEx, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DirectSound_CDirectSoundBuffer_PlayEx ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetRolloffFactor // ****************************************************************** @@ -1127,244 +495,6 @@ OOVPA_XREF(IDirectSoundBuffer_SetRolloffFactor, 5788, 8, { 0x21, 0xC2 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetDopplerFactor, 5788, 7, - - XREF_DSVOICESETDOPPLERFACTOR, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x4C }, - { 0x1A, 0x00 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 5788, 8, - - XREF_DSBUFFERSETDOPPLERFACTOR, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_DSVOICESETDOPPLERFACTOR ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDOPPLERFACTOR ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetPosition -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetPosition, 5788, 7, - - XREF_DSVOICESETPOSITION, - XRefZero) - - { 0x09, 0x8B }, - { 0x14, 0x08 }, - { 0x1F, 0x55 }, - { 0x2A, 0x00 }, - { 0x35, 0x10 }, - { 0x40, 0xF6 }, - { 0x4C, 0x33 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetPosition -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetPosition, 5788, 9, - - XREF_DSBUFFERSETPOSITION, - XRefOne) - - XREF_ENTRY( 0x4A, XREF_DSVOICESETPOSITION ), - - { 0x0F, 0x00 }, - { 0x18, 0x0B }, - { 0x25, 0x05 }, - { 0x32, 0x83 }, - { 0x3F, 0x04 }, - { 0x4E, 0x85 }, - { 0x59, 0xFF }, - { 0x66, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetPosition -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPosition, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_DSBUFFERSETPOSITION ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xE4 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetVelocity -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetVelocity, 5788, 7, - - XREF_DSVOICESETVELOCITY, - XRefZero) - - { 0x09, 0x8B }, - { 0x14, 0x14 }, - { 0x1F, 0x55 }, - { 0x2A, 0x00 }, - { 0x35, 0x10 }, - { 0x40, 0xF6 }, - { 0x4C, 0x33 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetVelocity -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetVelocity, 5788, 9, - - XREF_DSBUFFERSETVELOCITY, - XRefOne) - - XREF_ENTRY( 0x4A, XREF_DSVOICESETVELOCITY ), - - { 0x0F, 0x00 }, - { 0x18, 0x0B }, - { 0x25, 0x05 }, - { 0x32, 0x83 }, - { 0x3F, 0x04 }, - { 0x4E, 0x85 }, - { 0x59, 0xFF }, - { 0x66, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetVelocity -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVelocity, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_DSBUFFERSETVELOCITY ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xE4 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CMcpxBuffer::Pause -// ****************************************************************** -OOVPA_XREF(DirectSound_CMcpxBuffer_Pause, 5788, 7, - - XREF_DirectSound_CMcpxBuffer_Pause, - XRefZero) - - { 0x0D, 0x4D }, - { 0x1C, 0x44 }, - { 0x2B, 0x8B }, - { 0x3A, 0x75 }, - { 0x49, 0x7D }, - { 0x58, 0xEB }, - { 0x67, 0xE8 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::Pause -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_Pause, 5788, 8, - - XREF_DirectSound_CDirectSoundBuffer_Pause, - XRefOne) - - XREF_ENTRY( 0x35, XREF_DirectSound_CMcpxBuffer_Pause ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer_Pause -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Pause, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_Pause ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSound::CreateSoundStream -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_CreateSoundStream, 5788, 7, - - XREF_DSCREATESOUNDSTREAM, - XRefZero) - - { 0x11, 0xD8 }, - { 0x24, 0x05 }, - { 0x37, 0x74 }, - { 0x4A, 0x81 }, - { 0x5D, 0xE8 }, - { 0x70, 0x85 }, - { 0x83, 0xFF }, -OOVPA_END; - // ****************************************************************** // * IDirectSound_CreateSoundStream // ****************************************************************** @@ -1441,25 +571,6 @@ OOVPA_XREF(DirectSound_CMcpxStream_Pause, 5788, 7, { 0x7C, 0x00 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundStream::Pause -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundStream_Pause, 5788, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x35, XREF_DSSTREAMPAUSE ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundStream::FlushEx // ****************************************************************** @@ -1477,40 +588,6 @@ OOVPA_XREF(DirectSound_CDirectSoundStream_FlushEx, 5788, 7, { 0x62, 0x8B }, OOVPA_END; -// ****************************************************************** -// * IDirectSoundStream_FlushEx -// ****************************************************************** -OOVPA_XREF(IDirectSoundStream_FlushEx, 5788, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x11, XREF_DSFLUSHEX2 ), - - { 0x01, 0x74 }, - { 0x04, 0xFF }, - { 0x07, 0x10 }, - { 0x0A, 0x24 }, - { 0x0D, 0x74 }, - { 0x10, 0xE8 }, - { 0x15, 0xC2 }, - { 0x16, 0x10 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSoundDoWork -// ****************************************************************** -OOVPA_NO_XREF(DirectSoundDoWork, 5788, 7) - - { 0x06, 0x0F }, - { 0x0E, 0x85 }, - { 0x10, 0x74 }, - { 0x18, 0x85 }, - { 0x1C, 0x0B }, - { 0x22, 0xFF }, - { 0x28, 0xC3 }, -OOVPA_END; - // ****************************************************************** // * IDirectSound_SetEffectData // ****************************************************************** @@ -1555,25 +632,6 @@ OOVPA_END; // ****************************************************************** #define DirectSound_CDirectSoundStream_SetPitch_5788 DirectSound_CDirectSoundStream_SetPitch_4627 -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetHeadroom -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundStream_SetHeadroom, 5788, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_DirectSound_CDirectSoundVoice_SetHeadroom ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSound::SetAllParameters @@ -1612,14 +670,14 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5788, XREF), + REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4134, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5788, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5788, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5558, XREF), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetConeAngles, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetConeAngles, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 5558, PATCH), @@ -1629,9 +687,9 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes2, 4627, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5233, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetRolloffCurve, 5558, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 5233, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4134, XREF), @@ -1640,40 +698,40 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSound_SetOrientation, 3936, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5788, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5344, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 5788, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 5344, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play, 5788, XREF), + REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play, 3925, XREF), // REGISTER_OOVPA(CMcpxBuffer_Play, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4134, PATCH), // (Possibly weak, but quite OK for 4627 DSOUND) REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), REGISTER_OOVPA(DirectSound_CFullHRTFSource_GetCenterVolume, 5558, XREF), REGISTER_OOVPA(DirectSound_CHRTFSource_SetFullHRTF5Channel, 5558, XREF), REGISTER_OOVPA(DirectSoundUseFullHRTF, 5558, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 5788, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetHeadroom, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetHeadroom, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 5558, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 4134, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetI3DL2Source, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetI3DL2Source, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 5558, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 5788, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 5788, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5788, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_SetPosition, 5788, XREF), - REGISTER_OOVPA(IDirectSound_SetPosition, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5788, XREF), - REGISTER_OOVPA(IDirectSound_SetVelocity, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5558, XREF), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetPosition, 5558, XREF), + REGISTER_OOVPA(IDirectSound_SetPosition, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5558, XREF), + REGISTER_OOVPA(IDirectSound_SetVelocity, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDistanceFactor, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 5558, PATCH), @@ -1682,16 +740,16 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSound_CMcpxBuffer_SetCurrentPosition, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 5788, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 5558, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetLFO, 5558, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLFO, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 5558, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 5788, PATCH), + REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetLFO, 4627, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLFO, 4627, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4627, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPlayRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 5558, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 5788, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4134, PATCH), REGISTER_OOVPA(DirectSound_CMcpxBuffer_Stop, 5788, XREF), // TODO: Use XREF ?Stop@CMcpxBuffer@DirectSound@@QAEJK@Z? REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5788, PATCH), @@ -1701,41 +759,41 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4134, PATCH), // TODO : Use 5344? REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5788, XREF), REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 4134, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPitch, 5788, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPitch, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 5788, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPitch, 4134, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPitch, 4627, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4627, PATCH), + REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVolume, 5233, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 5233, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 5233, PATCH), // This is actually the XREF we are using + REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4134, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4134, PATCH), // This is actually the XREF we are using REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 5788, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffFactor, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffFactor, 5788, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFrequency, 5558, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDopplerFactor, 5788, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPosition, 5788, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPosition, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVelocity, 5788, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVelocity, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CMcpxBuffer_Pause, 5788, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Pause, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Pause, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDopplerFactor, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPosition, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPosition, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVelocity, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVelocity, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CMcpxBuffer_Pause, 4928, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Pause, 4928, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), REGISTER_OOVPA(DirectSoundCreateStream, 5788, PATCH), REGISTER_OOVPA(DirectSoundCreateStream, 5788, PATCH), REGISTER_OOVPA(DirectSound_CMcpxStream_Pause, 5788, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_FlushEx, 5788, XREF), - REGISTER_OOVPA(IDirectSoundStream_FlushEx, 5788, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 5788, PATCH), + REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), + REGISTER_OOVPA(DirectSoundDoWork, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 5558, XREF), REGISTER_OOVPA(IDirectSound8_EnableHeadphones, 5558, PATCH), @@ -1750,12 +808,12 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(XAudioCreateAdpcmFormat, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPitch, 5788, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 5558, XREF), REGISTER_OOVPA(IDirectSound_CreateSoundStream, 5558, PATCH), REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play2, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 5788, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_Play, 5558, PATCH), REGISTER_OOVPA(DirectSound_CMcpxVoiceClient_SetEG, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetEG, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetEG, 4627, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl index b4cb0f34c..f3f83be95 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl @@ -32,730 +32,6 @@ // * // ****************************************************************** -// ****************************************************************** -// * CMcpxBuffer_GetStatus -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_GetStatus, 5849, 11, - - XREF_DSBUFFERGETSTATUSA, - XRefZero) - - // CMcpxBuffer_GetStatus+0x04 : mov ecx, eax - { 0x04, 0x8B }, // (Offset,Value)-Pair #1 - { 0x05, 0xC8 }, // (Offset,Value)-Pair #2 - - // CMcpxBuffer_GetStatus+0x0C : jnz +0x1B - { 0x0C, 0x75 }, // (Offset,Value)-Pair #3 - { 0x0D, 0x1B }, // (Offset,Value)-Pair #4 - - // CMcpxBuffer_GetStatus+0x12 : test ax, 0x444 - { 0x12, 0x66 }, // (Offset,Value)-Pair #5 - { 0x13, 0xA9 }, // (Offset,Value)-Pair #6 - { 0x14, 0x44 }, // (Offset,Value)-Pair #7 - - // CMcpxBuffer_GetStatus+0x29 : mov ecx, 0x8001 - { 0x29, 0xB9 }, // (Offset,Value)-Pair #8 - { 0x2A, 0x01 }, // (Offset,Value)-Pair #9 - { 0x2B, 0x80 }, // (Offset,Value)-Pair #10 - { 0x2C, 0x00 }, // (Offset,Value)-Pair #11 -OOVPA_END; - -// ****************************************************************** -// * DirectSound_CDirectSound_SetI3DL2Listener -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_SetI3DL2Listener, 5849, 8, - - XREF_DSSETI3DL2LISTENER, - XRefZero) - - { 0x1D, 0xFF }, - { 0x3C, 0x00 }, - { 0x5B, 0x9A }, - { 0x7A, 0x10 }, - { 0x99, 0x00 }, - { 0xB8, 0x50 }, - { 0xD7, 0x00 }, - { 0xF6, 0x68 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_SetI3DL2Listener -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetI3DL2Listener, 5849, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DSSETI3DL2LISTENER ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - -// ****************************************************************** -// * CMcpxBuffer_SetBufferData -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_SetBufferData, 5849, 9, - - XREF_DSSETBUFFERDATA, - XRefZero) - - // CMcpxBuffer_SetBufferData+0x1E : cmp eax, ebx - { 0x1E, 0x3B }, // (Offset,Value)-Pair #1 - { 0x1F, 0xC3 }, // (Offset,Value)-Pair #2 - - // CMcpxBuffer_SetBufferData+0x20 : jz +0x0C - { 0x20, 0x74 }, // (Offset,Value)-Pair #3 - { 0x21, 0x0C }, // (Offset,Value)-Pair #4 - - // CMcpxBuffer_SetBufferData+0x45 : mov [esi+0xBC], ecx - { 0x45, 0x89 }, // (Offset,Value)-Pair #5 - { 0x46, 0x8E }, // (Offset,Value)-Pair #6 - { 0x47, 0xBC }, // (Offset,Value)-Pair #7 - - // CMcpxBuffer_SetBufferData+0x89 : retn 0x08 - { 0x89, 0xC2 }, // (Offset,Value)-Pair #8 - { 0x8A, 0x08 }, // (Offset,Value)-Pair #9 -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetFormat -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetFormat, 5849, 7, - - XREF_DirectSound_CDirectSoundVoice_SetFormat, - XRefZero) - - { 0x07, 0x10 }, - { 0x13, 0x85 }, - { 0x19, 0x10 }, - { 0x22, 0x0C }, - { 0x2B, 0x14 }, - { 0x34, 0x85 }, - { 0x40, 0x5E }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetFormat -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetFormat, 5849, 8, - - XREF_DirectSound_CDirectSoundBuffer_SetFormat, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DirectSound_CDirectSoundVoice_SetFormat ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetFormat -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFormat, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_SetFormat ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * CMcpxBuffer_Play -// ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play, 5849, 11, - - XREF_DirectSound_CMcpxBuffer_Play, - XRefZero) - - // CMcpxBuffer_Play+0x0B : test dword ptr [eax+8], 0x182000 - { 0x0B, 0xF7 }, // (Offset,Value)-Pair #1 - { 0x0C, 0x40 }, // (Offset,Value)-Pair #2 - - // CMcpxBuffer_Play+0x13 : jz +0x09 - { 0x13, 0x74 }, // (Offset,Value)-Pair #3 - { 0x14, 0x05 }, // (Offset,Value)-Pair #4 - - // CMcpxBuffer_Play+0x32 : test byte ptr [esi+0x12], 0x42 - { 0x32, 0xF6 }, // (Offset,Value)-Pair #5 - { 0x33, 0x46 }, // (Offset,Value)-Pair #6 - { 0x34, 0x12 }, // (Offset,Value)-Pair #7 - { 0x35, 0x42 }, // (Offset,Value)-Pair #8 - - // CMcpxBuffer_Play+0xA4 : call dword ptr [eax+0x1C] - { 0xA4, 0xFF }, // (Offset,Value)-Pair #9 - { 0xA5, 0x50 }, // (Offset,Value)-Pair #10 - { 0xA6, 0x1C }, // (Offset,Value)-Pair #11 -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CMcpxBuffer::Play -// ****************************************************************** -OOVPA_XREF(DirectSound_CMcpxBuffer_Play, 5849, 8, - - XREF_DirectSound_CMcpxBuffer_Play, - XRefZero) - - { 0x06, 0x56 }, - { 0x0E, 0xF1 }, - { 0x16, 0xFF }, - { 0x1D, 0x03 }, - { 0x1E, 0xFF }, - { 0x26, 0x75 }, - { 0x2F, 0x8B }, - { 0x36, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CMcpxBuffer::Play -// ****************************************************************** -OOVPA_XREF(DirectSound_CMcpxBuffer_Play2, 5849, 7, - - XREF_DirectSound_CMcpxBuffer_Play2, - XRefZero) - - { 0x17, 0x43 }, - { 0x2D, 0xF6 }, - { 0x2E, 0xC3 }, - { 0x2F, 0x04 }, - { 0xAD, 0xC2 }, - { 0xAE, 0x04 }, - { 0xAF, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::Play -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_Play, 5849, 9, - - XREF_DSOUNDPLAY2, - XRefZero) - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x2E, 0x20 }, - { 0x33, 0x18 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_Play -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Play, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DSOUNDPLAY2 ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetHeadroom -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetHeadroom, 5849, 7, - - XREF_DirectSound_CDirectSoundVoice_SetHeadroom, - XRefZero) - - { 0x03, 0x04 }, - { 0x08, 0x48 }, - { 0x0D, 0x24 }, - { 0x12, 0x48 }, - { 0x17, 0x8B }, - { 0x1F, 0x5E }, - { 0x21, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetHeadroom -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetHeadroom, 5849, 8, - - XREF_DirectSound_CDirectSoundBuffer_SetHeadroom, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DirectSound_CDirectSoundVoice_SetHeadroom ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetHeadroom -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_SetHeadroom ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_Lock -// ****************************************************************** -OOVPA_NO_XREF(IDirectSoundBuffer_Lock, 5849, 8) - - { 0x04, 0x75 }, - { 0x0A, 0x75 }, - { 0x10, 0x1C }, - { 0x16, 0x18 }, - { 0x1C, 0x1B }, - { 0x22, 0xC8 }, - { 0x2C, 0x5D }, - { 0x2E, 0x20 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoiceSettings::SetMixBins -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 5849, 7, - - XREF_DSSETMIXBINSC, - XRefZero) - - { 0x1B, 0xEB }, - { 0x32, 0x8B }, - { 0x4C, 0x7C }, - { 0x66, 0x00 }, - { 0x84, 0xF6 }, - { 0x9A, 0xB4 }, - { 0xB4, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMixBins -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMixBins, 5849, 8, - - XREF_DSSETMIXBINSB, - XRefOne) - - XREF_ENTRY( 0x0D, XREF_DSSETMIXBINSC ), - - { 0x02, 0x74 }, - { 0x06, 0x74 }, - { 0x0A, 0x4E }, - { 0x11, 0x8B }, - { 0x12, 0x4E }, - { 0x19, 0x5E }, - { 0x1A, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetMixBins -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMixBins, 5849, 8, - - XREF_DSSETMIXBINSA, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DSSETMIXBINSB ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetMixBins -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBins, 5849, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_DSSETMIXBINSB ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetMixBins -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DSSETMIXBINSA ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSound::SetMixBinHeadroom -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_SetMixBinHeadroom, 5849, 8, - - XREF_DSSETMIXBINHEADROOMA, - XRefZero) - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x24 }, - { 0x3A, 0x5C }, - { 0x46, 0x85 }, - { 0x52, 0x15 }, - { 0x5E, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_SetMixBinHeadroom -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 5849, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DSSETMIXBINHEADROOMA ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSound::SetPosition -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_SetPosition, 5849, 7, - - XREF_DSSETPOSITIONA, - XRefZero) - - { 0x0F, 0x00 }, - { 0x1E, 0xFF }, - { 0x2B, 0x8B }, - { 0x3A, 0x8B }, - { 0x49, 0x40 }, - { 0x58, 0xE8 }, - { 0x67, 0x15 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_SetPosition -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetPosition, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_DSSETPOSITIONA ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xF8 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSound::SetVelocity -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_SetVelocity, 5849, 7, - - XREF_DSSETVELOCITYA, - XRefZero) - - { 0x0F, 0x00 }, - { 0x1E, 0xFF }, - { 0x2B, 0x8B }, - { 0x3A, 0x8B }, - { 0x49, 0x4C }, - { 0x58, 0xE8 }, - { 0x67, 0x15 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_SetVelocity -// ****************************************************************** -OOVPA_XREF(IDirectSound_SetVelocity, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_DSSETVELOCITYA ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xF8 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSound::CommitDeferredSettings -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_CommitDeferredSettings, 5849, 7, - - XREF_COMMITDEFERREDSETTINGSA, - XRefZero) - - { 0x12, 0xC0 }, - { 0x27, 0xB8 }, - { 0x3A, 0x75 }, - { 0x52, 0x8D }, - { 0x62, 0x8B }, - { 0x76, 0x89 }, - { 0x8E, 0xFF }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CMcpxBuffer::SetCurrentPosition -// ****************************************************************** -OOVPA_XREF(DirectSound_CMcpxBuffer_SetCurrentPosition, 5849, 7, - - XREF_DSBUFFERSETCURRENTPOSITIONB, - XRefZero) - - { 0x1D, 0x00 }, - { 0x3C, 0x66 }, - { 0x5B, 0x00 }, - { 0x7C, 0x8D }, - { 0x99, 0xD1 }, - { 0xB8, 0x89 }, - { 0xDB, 0x5F }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetCurrentPosition -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 5849, 8, - - XREF_DSBUFFERSETCURRENTPOSITIONA, - XRefOne) - - XREF_ENTRY( 0x35, XREF_DSBUFFERSETCURRENTPOSITIONB ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetCurrentPosition -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DSBUFFERSETCURRENTPOSITIONA ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::GetCurrentPosition -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 5849, 7, - - XREF_GETCURRENTPOSITION, - XRefZero) - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0x74 }, - { 0x40, 0xF8 }, - { 0x4E, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_GetCurrentPosition -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetCurrentPosition, 5849, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_GETCURRENTPOSITION ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetLoopRegion -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5849, 7, - - XREF_DirectSound_CDirectSoundBuffer_SetLoopRegion, - XRefZero) - - { 0x0F, 0x00 }, - { 0x24, 0xB8 }, - { 0x31, 0x55 }, - { 0x42, 0xC8 }, - { 0x53, 0x00 }, - { 0x64, 0x8B }, - { 0x77, 0xFF }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetLoopRegion -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 5849, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x19, XREF_DirectSound_CDirectSoundBuffer_SetLoopRegion ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0xFF }, - { 0x0E, 0x83 }, - { 0x12, 0xD9 }, - { 0x16, 0xC8 }, - { 0x1D, 0xC2 }, - { 0x1E, 0x0C }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CMcpxBuffer::Stop -// ****************************************************************** -OOVPA_XREF(DirectSound_CMcpxBuffer_Stop, 5849, 8, - - XREF_DSOUNDSTOP, - XRefZero) - - { 0x06, 0x56 }, - { 0x0E, 0xF1 }, - { 0x16, 0xFF }, - { 0x1D, 0x04 }, - { 0x1E, 0xFF }, - { 0x26, 0x75 }, - { 0x2F, 0x8B }, - { 0x36, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::StopEx -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_StopEx, 5849, 8, - - XREF_DSOUNDSTOP2, - XRefOne) - - XREF_ENTRY( 0x3D, XREF_DSOUNDSTOP ), - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x20 }, - { 0x3A, 0x24 }, - { 0x46, 0x0B }, - { 0x52, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_StopEx -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_StopEx, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DSOUNDSTOP2 ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSound::SetRolloffFactor // Xbe Explorer generated pattern, derived from address $00439F47 in "SpiderMan 2" : @@ -788,790 +64,6 @@ OOVPA_XREF(DirectSound_CDirectSound_SetRolloffFactor, 5849, 20, { 0x5C, 0xC2 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSound::SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_SetDopplerFactor, 5849, 9, - - XREF_SETDOPPLERFACTOR, - XRefZero) - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x08 }, - { 0x35, 0x70 }, - { 0x3A, 0x48 }, - { 0x4A, 0x85 }, - { 0x53, 0xFF }, - { 0x5E, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetPitch -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetPitch, 5849, 6, - - XREF_DSBUFFERSETPITCHB, - XRefZero) - - { 0x02, 0x24 }, - { 0x06, 0x10 }, - { 0x0A, 0x08 }, - { 0x0E, 0x8B }, - { 0x16, 0xC2 }, - { 0x17, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetPitch -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetPitch, 5849, 8, - - XREF_DSBUFFERSETPITCHA, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DSBUFFERSETPITCHB ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetPitch -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPitch, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DSBUFFERSETPITCHA ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMaxDistance -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMaxDistance, 5849, 7, - - XREF_DSVOICESETMAXDISTANCE, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x3C }, - { 0x1A, 0x00 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetMinDistance -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMinDistance, 5849, 7, - - XREF_DSVOICESETMINDISTANCE, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x38 }, - { 0x1A, 0x00 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetMaxDistance -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5849, 8, - - XREF_DSBUFFERSETMAXDISTANCE, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_DSVOICESETMAXDISTANCE ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetMinDistance -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetMinDistance, 5849, 8, - - XREF_DSBUFFERSETMINDISTANCE, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_DSVOICESETMINDISTANCE ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetMaxDistance -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETMAXDISTANCE ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetMinDistance -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETMINDISTANCE ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetVolume -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetVolume, 5849, 7, - - XREF_DirectSound_CDirectSoundVoice_SetVolume, - XRefZero) - - { 0x02, 0x24 }, - { 0x06, 0x10 }, - { 0x0A, 0x08 }, - { 0x0E, 0x89 }, - { 0x12, 0x49 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetVolume -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetVolume, 5849, 8, - - XREF_DirectSound_CDirectSoundBuffer_SetVolume, - XRefOne) - - XREF_ENTRY( 0x32, XREF_DirectSound_CDirectSoundVoice_SetVolume ), - - { 0x0C, 0x00 }, - { 0x12, 0x85 }, - { 0x1C, 0x15 }, - { 0x26, 0xEB }, - { 0x30, 0x10 }, - { 0x3A, 0x74 }, - { 0x47, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetVolume -// ****************************************************************** -// * Not until we need it! -//OOVPA_XREF(DirectSound_CDirectSoundStream_SetVolume, 5849, 9, -// -// XREF_DirectSound_CDirectSoundStream_SetVolume, -// XRefOne) -// -// XREF_ENTRY( 0x36, XREF_DirectSound_CDirectSoundVoice_SetVolume ), -// -// { 0x00, 0x56 }, -// { 0x0C, 0x00 }, -// { 0x14, 0x74 }, -// { 0x21, 0xB8 }, -// { 0x2A, 0x24 }, -// { 0x35, 0xE8 }, -// { 0x40, 0x68 }, -// { 0x4B, 0x8B }, -//OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetVolume -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVolume, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_SetVolume ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::PlayEx -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_PlayEx, 5849, 8, - - XREF_DirectSound_CDirectSoundBuffer_PlayEx, - XRefOne) - - XREF_ENTRY( 0x3D, XREF_DirectSound_CMcpxBuffer_Play ), - - { 0x0C, 0x00 }, - { 0x16, 0x68 }, - { 0x22, 0x05 }, - { 0x2E, 0x20 }, - { 0x3A, 0x24 }, - { 0x46, 0x0B }, - { 0x52, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_PlayEx -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_PlayEx, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DirectSound_CDirectSoundBuffer_PlayEx ), - - { 0x03, 0x10 }, - { 0x08, 0xFF }, - { 0x0D, 0xC8 }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetRolloffFactor -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetRolloffFactor, 5849, 7, - - XREF_DSVOICESETROLLOFFFACTOR, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x48 }, - { 0x1A, 0x00 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetRolloffFactor -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetRolloffFactor, 5849, 8, - - XREF_DSBUFFERSETROLLOFFFACTOR, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_DSVOICESETROLLOFFFACTOR ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetRolloffFactor -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetRolloffFactor, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETROLLOFFFACTOR ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetDopplerFactor, 5849, 7, - - XREF_DSVOICESETDOPPLERFACTOR, - XRefZero) - - { 0x05, 0x41 }, - { 0x0C, 0x00 }, - { 0x13, 0x4C }, - { 0x1A, 0x00 }, - { 0x21, 0xF6 }, - { 0x28, 0x51 }, - { 0x2F, 0xC0 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 5849, 8, - - XREF_DSBUFFERSETDOPPLERFACTOR, - XRefOne) - - XREF_ENTRY( 0x3A, XREF_DSVOICESETDOPPLERFACTOR ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xFF }, - { 0x40, 0x8B }, - { 0x4F, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetDopplerFactor -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDOPPLERFACTOR ), - - { 0x03, 0x0C }, - { 0x08, 0x8B }, - { 0x0D, 0x8B }, - { 0x12, 0x83 }, - { 0x17, 0x1B }, - { 0x1C, 0xE8 }, - { 0x21, 0xC2 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetPosition -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetPosition, 5849, 7, - - XREF_DSVOICESETPOSITION, - XRefZero) - - { 0x09, 0x8B }, - { 0x14, 0x08 }, - { 0x1F, 0x55 }, - { 0x2A, 0x00 }, - { 0x35, 0x10 }, - { 0x40, 0xF6 }, - { 0x4C, 0x33 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetPosition -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetPosition, 5849, 9, - - XREF_DSBUFFERSETPOSITION, - XRefOne) - - XREF_ENTRY( 0x4A, XREF_DSVOICESETPOSITION ), - - { 0x0F, 0x00 }, - { 0x18, 0x0B }, - { 0x25, 0x05 }, - { 0x32, 0x83 }, - { 0x3F, 0x04 }, - { 0x4E, 0x85 }, - { 0x59, 0xFF }, - { 0x66, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetPosition -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPosition, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_DSBUFFERSETPOSITION ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xE4 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundVoice::SetVelocity -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundVoice_SetVelocity, 5849, 7, - - XREF_DSVOICESETVELOCITY, - XRefZero) - - { 0x09, 0x8B }, - { 0x14, 0x14 }, - { 0x1F, 0x55 }, - { 0x2A, 0x00 }, - { 0x35, 0x10 }, - { 0x40, 0xF6 }, - { 0x4C, 0x33 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetVelocity -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_SetVelocity, 5849, 9, - - XREF_DSBUFFERSETVELOCITY, - XRefOne) - - XREF_ENTRY( 0x4A, XREF_DSVOICESETVELOCITY ), - - { 0x0F, 0x00 }, - { 0x18, 0x0B }, - { 0x25, 0x05 }, - { 0x32, 0x83 }, - { 0x3F, 0x04 }, - { 0x4E, 0x85 }, - { 0x59, 0xFF }, - { 0x66, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundBuffer_SetVelocity -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVelocity, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2D, XREF_DSBUFFERSETVELOCITY ), - - { 0x05, 0x18 }, - { 0x0C, 0x83 }, - { 0x13, 0x8B }, - { 0x1A, 0xE4 }, - { 0x21, 0xD9 }, - { 0x28, 0xD9 }, - { 0x31, 0x5D }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CMcpxBuffer::Pause -// ****************************************************************** -OOVPA_XREF(DirectSound_CMcpxBuffer_Pause, 5849, 7, - - XREF_DirectSound_CMcpxBuffer_Pause, - XRefZero) - - { 0x0D, 0x4D }, - { 0x1C, 0x44 }, - { 0x2B, 0x8B }, - { 0x3A, 0x75 }, - { 0x49, 0x7D }, - { 0x58, 0xEB }, - { 0x67, 0xE8 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::Pause -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundBuffer_Pause, 5849, 8, - - XREF_DirectSound_CDirectSoundBuffer_Pause, - XRefOne) - - XREF_ENTRY( 0x35, XREF_DirectSound_CMcpxBuffer_Pause ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; -// ****************************************************************** -// * IDirectSoundBuffer_Pause -// ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Pause, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x15, XREF_DirectSound_CDirectSoundBuffer_Pause ), - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x83 }, - { 0x0E, 0xD9 }, - { 0x12, 0xC8 }, - { 0x19, 0xC2 }, - { 0x1A, 0x08 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSound::CreateSoundStream -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSound_CreateSoundStream, 5849, 7, - - XREF_DSCREATESOUNDSTREAM, - XRefZero) - - { 0x11, 0xD8 }, - { 0x24, 0x05 }, - { 0x37, 0x74 }, - { 0x4A, 0x81 }, - { 0x5D, 0xE8 }, - { 0x70, 0x85 }, - { 0x83, 0xFF }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_CreateSoundStream -// ****************************************************************** -//OOVPA_XREF(IDirectSound_CreateSoundStream, 5849, 8, -// -// XRefNoSaveIndex, -// XRefOne) -// -// XREF_ENTRY( 0x1D, XREF_DirectSound_CDirectSound_CreateSoundStream ), -// -// { 0x03, 0x10 }, -// { 0x08, 0xFF }, -// { 0x0D, 0xC8 }, -// { 0x12, 0x83 }, -// { 0x17, 0x1B }, -// { 0x1C, 0xE8 }, -// { 0x21, 0xC2 }, -//OOVPA_END; - -// ****************************************************************** -// * DirectSoundCreateStream -// ****************************************************************** -OOVPA_XREF(DirectSoundCreateStream, 5849, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x2F, XREF_DSCREATESOUNDSTREAM ), - - { 0x09, 0x56 }, - { 0x14, 0x45 }, - { 0x1F, 0x8B }, - { 0x2A, 0xFF }, - { 0x35, 0x85 }, - { 0x40, 0xFF }, - { 0x4E, 0x5F }, - { 0x56, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetMixBinVolumes -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5849, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_DSSETMIXBINVOLUMESB ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CMcpxStream::Pause -// ****************************************************************** -OOVPA_XREF(DirectSound_CMcpxStream_Pause, 5849, 7, - - XREF_DSSTREAMPAUSE, - XRefZero) - - { 0x10, 0x07 }, - { 0x23, 0x0F }, - { 0x34, 0x83 }, - { 0x46, 0xF8 }, - { 0x58, 0x03 }, - { 0x6A, 0xBB }, - { 0x7C, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundStream::Pause -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundStream_Pause, 5849, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x35, XREF_DSSTREAMPAUSE ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x39, 0x85 }, - { 0x44, 0xFF }, - { 0x4B, 0xC7 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CDirectSoundStream::FlushEx -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundStream_FlushEx, 5849, 7, - - XREF_DSFLUSHEX2, - XRefZero) - - { 0x0F, 0x00 }, - { 0x1E, 0xFF }, - { 0x28, 0x80 }, - { 0x36, 0x74 }, - { 0x46, 0x8B }, - { 0x52, 0xFF }, - { 0x62, 0x8B }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSoundStream_FlushEx -// ****************************************************************** -OOVPA_XREF(IDirectSoundStream_FlushEx, 5849, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x11, XREF_DSFLUSHEX2 ), - - { 0x01, 0x74 }, - { 0x04, 0xFF }, - { 0x07, 0x10 }, - { 0x0A, 0x24 }, - { 0x0D, 0x74 }, - { 0x10, 0xE8 }, - { 0x15, 0xC2 }, - { 0x16, 0x10 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSoundDoWork -// ****************************************************************** -OOVPA_NO_XREF(DirectSoundDoWork, 5849, 7) - - { 0x06, 0x0F }, - { 0x0E, 0x85 }, - { 0x10, 0x74 }, - { 0x18, 0x85 }, - { 0x1C, 0x0B }, - { 0x22, 0xFF }, - { 0x28, 0xC3 }, -OOVPA_END; - -// ****************************************************************** -// * IDirectSound_SetEffectData -// ****************************************************************** -// * No XRefs! Woohoo! -// ****************************************************************** -OOVPA_NO_XREF(IDirectSound_SetEffectData, 5849, 7) - - { 0x04, 0x75 }, - { 0x0A, 0x75 }, - { 0x10, 0x14 }, - { 0x16, 0x10 }, - { 0x1C, 0x1B }, - { 0x26, 0x5D }, - { 0x28, 0x18 }, -OOVPA_END; - -// ****************************************************************** -// * DirectSound::CMemoryManager::PoolAlloc -// ****************************************************************** -OOVPA_NO_XREF(DirectSound_CMemoryManager_PoolAlloc, 5849, 10) - - { 0x24, 0x83 }, - { 0x25, 0x7C }, - { 0x26, 0x24 }, - { 0x27, 0x10 }, - { 0x28, 0x00 }, - { 0x37, 0xF3 }, - { 0x38, 0xAB }, - { 0x44, 0xC2 }, - { 0x45, 0x0C }, - { 0x46, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * XFileCreateMediaObjectAsync -// ****************************************************************** -OOVPA_NO_XREF(XFileCreateMediaObjectAsync, 5849, 8) - - { 0x0A, 0xC0 }, - { 0x16, 0xF8 }, - { 0x22, 0xE6 }, - { 0x2E, 0x20 }, - { 0x3D, 0x8B }, - { 0x49, 0x8B }, - { 0x52, 0x06 }, - { 0x5E, 0x0C }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSoundStream::SetPitch // ****************************************************************** @@ -1595,26 +87,6 @@ OOVPA_XREF(DirectSound_CDirectSoundStream_SetPitch, 5849, 12, { 0x51, 0x00 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetHeadroom -// ****************************************************************** -OOVPA_XREF(DirectSound_CDirectSoundStream_SetHeadroom, 5849, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_DirectSound_CDirectSoundVoice_SetHeadroom ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; - // ****************************************************************** // * DirectSound::CDirectSound::SetAllParameters // ****************************************************************** @@ -1685,16 +157,6 @@ OOVPA_END; // ****************************************************************** #define DirectSound_CDirectSoundVoice_SetAllParameters_5849 DirectSound_CDirectSoundVoice_SetAllParameters_5558 -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetAllParameters -// ****************************************************************** -#define DirectSound_CDirectSoundBuffer_SetAllParameters_5849 DirectSound_CDirectSoundBuffer_SetAllParameters_5558 - -// ****************************************************************** -// * IDirectSoundBuffer_SetAllParameters -// ****************************************************************** -#define IDirectSoundBuffer_SetAllParameters_5849 IDirectSoundBuffer_SetAllParameters_5558 - // ****************************************************************** // * Direct, 5849 // ****************************************************************** @@ -1704,114 +166,114 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundBuffer, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPlayRegion, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 5849, XREF), + REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 5788, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetBufferData, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5849, XREF), + REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5558, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetStatus, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4134, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5849, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5849, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 5558, XREF), + REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes2, 4627, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5849, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5788, PATCH), REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4134, XREF), REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4134, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVolume, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 5849, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVolume, 5788, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 5788, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4134, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 4134, PATCH), REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH), REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH), REGISTER_OOVPA(IDirectSound_SetOrientation, 3936, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play, 5849, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5344, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5788, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMinDistance, 5344, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMinDistance, 5788, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play, 3925, XREF), // REGISTER_OOVPA(CMcpxBuffer_Play, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4134, PATCH), // (Possibly weak, but quite OK for 4627 DSOUND) REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetHeadroom, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5849, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5849, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_SetPosition, 5849, XREF), - REGISTER_OOVPA(IDirectSound_SetPosition, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5849, XREF), - REGISTER_OOVPA(IDirectSound_SetVelocity, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 5849, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetHeadroom, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBins, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5558, XREF), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetPosition, 5558, XREF), + REGISTER_OOVPA(IDirectSound_SetPosition, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5558, XREF), + REGISTER_OOVPA(IDirectSound_SetVelocity, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 5788, PATCH), REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH), - REGISTER_OOVPA(DirectSound_CMcpxBuffer_SetCurrentPosition, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CMcpxBuffer_Stop, 5849, XREF), // TODO: Use XREF ?Stop@CMcpxBuffer@DirectSound@@QAEJK@Z? - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5849, PATCH), + REGISTER_OOVPA(DirectSound_CMcpxBuffer_SetCurrentPosition, 5788, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetCurrentPosition, 5788, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4134, PATCH), + REGISTER_OOVPA(DirectSound_CMcpxBuffer_Stop, 5788, XREF), // TODO: Use XREF ?Stop@CMcpxBuffer@DirectSound@@QAEJK@Z? + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 5788, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5849, XREF), REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4134, PATCH), // TODO : Use 5344? - REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5849, XREF), + REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5788, XREF), REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 4134, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPitch, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPitch, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffFactor, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffFactor, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDopplerFactor, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPosition, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPosition, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVelocity, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVelocity, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CMcpxBuffer_Pause, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Pause, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Pause, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 5849, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPitch, 4134, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPitch, 4627, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4627, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 5788, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffFactor, 5788, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffFactor, 5788, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDopplerFactor, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDopplerFactor, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPosition, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPosition, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVelocity, 5558, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVelocity, 5558, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CMcpxBuffer_Pause, 4928, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Pause, 4928, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 5558, XREF), REGISTER_OOVPA(IDirectSound_CreateSoundStream, 5558, PATCH), - REGISTER_OOVPA(DirectSoundCreateStream, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CMcpxStream_Pause, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_FlushEx, 5849, XREF), - REGISTER_OOVPA(IDirectSoundStream_FlushEx, 5849, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 5849, PATCH), + REGISTER_OOVPA(DirectSoundCreateStream, 5788, PATCH), + REGISTER_OOVPA(DirectSound_CMcpxStream_Pause, 5788, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_FlushEx, 5788, XREF), + REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), + REGISTER_OOVPA(DirectSoundDoWork, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5558, PATCH), REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(IDirectSound_SetEffectData, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CMemoryManager_PoolAlloc, 5849, XREF), - REGISTER_OOVPA(XFileCreateMediaObjectAsync, 5849, PATCH), + REGISTER_OOVPA(IDirectSound_SetEffectData, 5344, PATCH), + REGISTER_OOVPA(DirectSound_CMemoryManager_PoolAlloc, 5788, XREF), + REGISTER_OOVPA(XFileCreateMediaObjectAsync, 5788, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 5558, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPitch, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 5849, PATCH), - REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play2, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 5849, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 5558, PATCH), + REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play2, 5788, XREF), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 5788, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_Play, 5558, PATCH), REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH), REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 5558, XREF), REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4134, PATCH), @@ -1834,8 +296,8 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetI3DL2Source, 5849, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 5849, PATCH), REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetAllParameters, 5849, XREF), - REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 5849, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 5849, PATCH), + REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 4134, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl index 4dd213df1..495ca3c6f 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl @@ -32,83 +32,6 @@ // * // ****************************************************************** -#if 0 -// ****************************************************************** -// * XGIsSwizzledFormat -// ****************************************************************** -OOVPA_NO_XREF(XGIsSwizzledFormat, 3911, 7) - - { 0x07, 0x7F }, - { 0x10, 0x7C }, - { 0x19, 0x0B }, - { 0x22, 0xF8 }, - { 0x2B, 0x83 }, - { 0x34, 0x0A }, - { 0x3D, 0x7F }, -OOVPA_END; - -// ****************************************************************** -// * XGSwizzleRect -// ****************************************************************** -OOVPA_NO_XREF(XGSwizzleRect, 3911, 8) - - { 0x1E, 0x03 }, - { 0x3E, 0x89 }, - { 0x5E, 0x83 }, - { 0x7E, 0x6C }, - { 0x9E, 0xFF }, - { 0xBE, 0xFF }, - { 0xDE, 0x89 }, - { 0xFE, 0x89 }, -OOVPA_END; - -// ****************************************************************** -// * XGSwizzleBox -// ****************************************************************** -OOVPA_NO_XREF(XGSwizzleBox, 3911, 8) - - { 0x1E, 0x75 }, - { 0x3E, 0x4D }, - { 0x5E, 0x48 }, - { 0x7E, 0x04 }, - { 0x9E, 0xD8 }, - { 0xC0, 0x83 }, - { 0xDE, 0xAF }, - { 0xFE, 0x45 }, -OOVPA_END; - -/* Leave unpatched -// ****************************************************************** -// * XGUnswizzleRect -// ****************************************************************** -OOVPA_NO_XREF(XGUnswizzleRect, 3911, 8) - - { 0x1E, 0x03 }, - { 0x3E, 0x00 }, - { 0x5E, 0xD2 }, - { 0x7E, 0x75 }, - { 0x9E, 0x70 }, - { 0xC1, 0xE9 }, - { 0xDE, 0x89 }, - { 0xFE, 0x60 }, -OOVPA_END; -*/ - -// ****************************************************************** -// * XGWriteSurfaceOrTextureToXPR -// ****************************************************************** -OOVPA_NO_XREF(XGWriteSurfaceOrTextureToXPR, 3911, 7) - - { 0x1E, 0x3D }, - { 0x3E, 0xE0 }, - { 0x5E, 0x75 }, - { 0x7E, 0x33 }, - { 0x9E, 0xC2 }, - { 0xBE, 0xF0 }, - { 0xDE, 0xFC }, -OOVPA_END; -#endif - // ****************************************************************** // * XG_4034 // ****************************************************************** @@ -124,4 +47,4 @@ OOVPATable XG_4034[] = { // ****************************************************************** // * XG_3911_SIZE // ****************************************************************** -uint32 XG_4034_SIZE = sizeof(XG_4034); \ No newline at end of file +uint32 XG_4034_SIZE = sizeof(XG_4034); diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl index b83a93b4d..dec0e155b 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl @@ -84,23 +84,6 @@ OOVPA_NO_XREF(XGSwizzleRect, 4361, 10) { 0xED, 0x0B }, // (Offset,Value)-Pair #10 OOVPA_END; -/* Leave unpatched -// ****************************************************************** -// * XGUnswizzleRect -// ****************************************************************** -OOVPA_NO_XREF(XGUnswizzleRect, 4361, 8) - - { 0x1E, 0x03 }, - { 0x3E, 0x00 }, - { 0x5E, 0xD2 }, - { 0x7E, 0x75 }, - { 0x9E, 0x70 }, - { 0xC1, 0xE9 }, - { 0xDE, 0x89 }, - { 0xFE, 0x60 }, -OOVPA_END; -*/ - // ****************************************************************** // * XGSetVertexBufferHeader // ****************************************************************** @@ -153,7 +136,7 @@ OOVPATable XG_4361[] = { REGISTER_OOVPA(XGIsSwizzledFormat, 4361, PATCH), // REGISTER_OOVPA(XGSwizzleRect, 4361, PATCH), // Leave unpatched - // REGISTER_OOVPA(XGUnswizzleRect, 4361, PATCH), // Leave unpatched + // REGISTER_OOVPA(XGUnswizzleRect, 3911, PATCH), // Leave unpatched REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), REGISTER_OOVPA(XGSetVertexBufferHeader, 4361, XREF), REGISTER_OOVPA(XGSetIndexBufferHeader, 4361, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl index c6f004147..a11976fc1 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl @@ -70,23 +70,6 @@ OOVPA_NO_XREF(XGWriteSurfaceOrTextureToXPR, 4627, 7) { 0xE2, 0x8B }, OOVPA_END; -/* Leave unpatched -// ****************************************************************** -// * XGUnswizzleRect -// ****************************************************************** -OOVPA_NO_XREF(XGUnswizzleRect, 4627, 8) - - { 0x1E, 0x03 }, - { 0x3E, 0x00 }, - { 0x5E, 0xD2 }, - { 0x7E, 0x75 }, - { 0x9E, 0x70 }, - { 0xC1, 0xE9 }, - { 0xDE, 0x89 }, - { 0xFE, 0x60 }, -OOVPA_END; -*/ - // ****************************************************************** // * XG_4627 // ****************************************************************** @@ -94,7 +77,7 @@ OOVPATable XG_4627[] = { REGISTER_OOVPA(XGIsSwizzledFormat, 4361, PATCH), // REGISTER_OOVPA(XGSwizzleRect, 4361, PATCH), // Leave unpatched - // REGISTER_OOVPA(XGUnswizzleRect, 4627, PATCH), // Leave unpatched + // REGISTER_OOVPA(XGUnswizzleRect, 3911, PATCH), // Leave unpatched REGISTER_OOVPA(XGSwizzleBox, 4627, PATCH), REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 4627, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.inl index 5c2f1c5d6..e095d2f86 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.inl @@ -39,7 +39,7 @@ OOVPATable XG_5028[] = { REGISTER_OOVPA(XGIsSwizzledFormat, 4361, PATCH), // REGISTER_OOVPA(XGSwizzleRect, 4361, PATCH), // Leave unpatched - // REGISTER_OOVPA(XGUnswizzleRect, 4627, PATCH), // Leave unpatched + // REGISTER_OOVPA(XGUnswizzleRect, 3911, PATCH), // Leave unpatched REGISTER_OOVPA(XGSwizzleBox, 4627, PATCH), REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 4627, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl index 69fddc022..850dea51c 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl @@ -32,62 +32,6 @@ // * // ****************************************************************** -// ****************************************************************** -// * XGSwizzleBox -// ****************************************************************** -OOVPA_NO_XREF(XGSwizzleBox, 5558, 10) - - // XGSwizzleBox+0x60 : sub ecx, [eax] - { 0x60, 0x2B }, // (Offset,Value)-Pair #1 - { 0x61, 0x08 }, // (Offset,Value)-Pair #2 - - // XGSwizzleBox+0x8E : lea ecx, [ebp+0xD8] - { 0x8E, 0x8D }, // (Offset,Value)-Pair #3 - { 0x8F, 0x4D }, // (Offset,Value)-Pair #4 - { 0x90, 0xD8 }, // (Offset,Value)-Pair #5 - - // XGSwizzleBox+0xD5 : shl eax, 2 - { 0xD5, 0xC1 }, // (Offset,Value)-Pair #6 - { 0xD6, 0xE0 }, // (Offset,Value)-Pair #7 - { 0xD7, 0x02 }, // (Offset,Value)-Pair #8 - - // XGSwizzleBox+0xE2 : test ebx, ebx - { 0xE2, 0x85 }, // (Offset,Value)-Pair #9 - { 0xE3, 0xDB }, // (Offset,Value)-Pair #10 -OOVPA_END; - -// ****************************************************************** -// * XGSwizzleRect -// ****************************************************************** -OOVPA_NO_XREF(XGSwizzleRect, 5558, 8) - - { 0x1E, 0x03 }, - { 0x3E, 0x89 }, - { 0x5E, 0x83 }, - { 0x7E, 0x6C }, - { 0x9E, 0xFF }, - { 0xBE, 0xFF }, - { 0xDE, 0x89 }, - { 0xFE, 0x89 }, -OOVPA_END; - -/* Leave unpatched -// ****************************************************************** -// * XGUnswizzleRect -// ****************************************************************** -OOVPA_NO_XREF(XGUnswizzleRect, 5558, 8) - - { 0x1E, 0x03 }, - { 0x3E, 0x00 }, - { 0x5E, 0xD2 }, - { 0x7E, 0x75 }, - { 0x9E, 0x70 }, - { 0xC1, 0xE9 }, - { 0xDE, 0x89 }, - { 0xFE, 0x60 }, -OOVPA_END; -*/ - // ****************************************************************** // * XGSwizzleBox // ****************************************************************** @@ -125,9 +69,9 @@ OOVPATable XG_5558[] = { REGISTER_OOVPA(XGIsSwizzledFormat, 4361, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 5558, PATCH), // Leave unpatched - REGISTER_OOVPA(XGSwizzleBox, 5558, PATCH), // (* UNTESTED *) - // REGISTER_OOVPA(XGUnswizzleRect, 5558, PATCH), // Leave unpatched + // REGISTER_OOVPA(XGSwizzleRect, 3911, PATCH), // Leave unpatched + REGISTER_OOVPA(XGSwizzleBox, 4627, PATCH), // (* UNTESTED *) + // REGISTER_OOVPA(XGUnswizzleRect, 3911, PATCH), // Leave unpatched // REGISTER_OOVPA(XGUnswizzleBox, 5558, PATCH), // (* UNTESTED *) }; diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl index 281ad7a8b..fc323eb81 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl @@ -32,30 +32,6 @@ // * // ****************************************************************** -// ****************************************************************** -// * XGSwizzleBox -// ****************************************************************** -OOVPA_NO_XREF(XGSwizzleBox, 5788, 10) - - // XGSwizzleBox+0x60 : sub ecx, [eax] - { 0x60, 0x2B }, // (Offset,Value)-Pair #1 - { 0x61, 0x08 }, // (Offset,Value)-Pair #2 - - // XGSwizzleBox+0x8E : lea ecx, [ebp+0xD8] - { 0x8E, 0x8D }, // (Offset,Value)-Pair #3 - { 0x8F, 0x4D }, // (Offset,Value)-Pair #4 - { 0x90, 0xD8 }, // (Offset,Value)-Pair #5 - - // XGSwizzleBox+0xD5 : shl eax, 2 - { 0xD5, 0xC1 }, // (Offset,Value)-Pair #6 - { 0xD6, 0xE0 }, // (Offset,Value)-Pair #7 - { 0xD7, 0x02 }, // (Offset,Value)-Pair #8 - - // XGSwizzleBox+0xE2 : test ebx, ebx - { 0xE2, 0x85 }, // (Offset,Value)-Pair #9 - { 0xE3, 0xDB }, // (Offset,Value)-Pair #10 -OOVPA_END; - // ****************************************************************** // * XFONT_OpenBitmapFontFromMemory // ****************************************************************** @@ -77,8 +53,8 @@ OOVPA_END; OOVPATable XG_5788[1] = { REGISTER_OOVPA(XGIsSwizzledFormat, 4361, DISABLED), - // REGISTER_OOVPA(XGSwizzleRect, 5558, PATCH), - // REGISTER_OOVPA(XGUnswizzleRect, 5558, PATCH), + // REGISTER_OOVPA(XGSwizzleRect, 3911, PATCH), + // REGISTER_OOVPA(XGUnswizzleRect, 3911, PATCH), // REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 5788, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl index 67603ba37..4a1169e75 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl @@ -32,54 +32,15 @@ // * // ****************************************************************** -// ****************************************************************** -// * XGSwizzleBox -// ****************************************************************** -OOVPA_NO_XREF(XGSwizzleBox, 5849, 10) - - // XGSwizzleBox+0x60 : sub ecx, [eax] - { 0x60, 0x2B }, // (Offset,Value)-Pair #1 - { 0x61, 0x08 }, // (Offset,Value)-Pair #2 - - // XGSwizzleBox+0x8E : lea ecx, [ebp+0xD8] - { 0x8E, 0x8D }, // (Offset,Value)-Pair #3 - { 0x8F, 0x4D }, // (Offset,Value)-Pair #4 - { 0x90, 0xD8 }, // (Offset,Value)-Pair #5 - - // XGSwizzleBox+0xD5 : shl eax, 2 - { 0xD5, 0xC1 }, // (Offset,Value)-Pair #6 - { 0xD6, 0xE0 }, // (Offset,Value)-Pair #7 - { 0xD7, 0x02 }, // (Offset,Value)-Pair #8 - - // XGSwizzleBox+0xE2 : test ebx, ebx - { 0xE2, 0x85 }, // (Offset,Value)-Pair #9 - { 0xE3, 0xDB }, // (Offset,Value)-Pair #10 -OOVPA_END; - -// ****************************************************************** -// * XFONT_OpenBitmapFontFromMemory -// ****************************************************************** -OOVPA_NO_XREF(XFONT_OpenBitmapFontFromMemory, 5849, 8) - - { 0x0B, 0x75 }, - { 0x1A, 0x8B }, - { 0x28, 0x8B }, - { 0x32, 0x08 }, - { 0x3F, 0x8B }, - { 0x4C, 0x8B }, - { 0x59, 0x45 }, - { 0x66, 0x0C }, -OOVPA_END; - // ****************************************************************** // * XG_5849 // ****************************************************************** OOVPATable XG_5849[1] = { REGISTER_OOVPA(XGIsSwizzledFormat, 4361, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 5558, PATCH), // Leave unpatched - // REGISTER_OOVPA(XGUnswizzleRect, 5558, PATCH), // Leave unpatched - // REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 5849, PATCH), + // REGISTER_OOVPA(XGSwizzleRect, 3911, PATCH), // Leave unpatched + // REGISTER_OOVPA(XGUnswizzleRect, 3911, PATCH), // Leave unpatched + // REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 5788, PATCH), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl index 1e040474c..c7e02d1e9 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl @@ -101,7 +101,7 @@ OOVPATable XOnline_5233[] = { REGISTER_OOVPA(bind, 4361, EMUTHIS), // REGISTER_OOVPA(listen, 4361, EMUTHIS), REGISTER_OOVPA(ioctlsocket, 4361, EMUTHIS), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 5233, PATCH), + REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), REGISTER_OOVPA(CXo_XOnlineLogon, 5233, XREF), REGISTER_OOVPA(XOnlineLogon, 5233, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl index 81e01d022..f2e6657ca 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl @@ -44,7 +44,7 @@ OOVPATable XOnline_5344[] = { REGISTER_OOVPA(bind, 4361, EMUTHIS), // REGISTER_OOVPA(listen, 4361, EMUTHIS), REGISTER_OOVPA(ioctlsocket, 4361, EMUTHIS), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 5233, PATCH), + REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), REGISTER_OOVPA(CXo_XOnlineLogon, 5233, XREF), REGISTER_OOVPA(XOnlineLogon, 5233, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl index 4b36b3e02..b3cd50ad5 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl @@ -32,75 +32,6 @@ // * // ****************************************************************** -#if 0 -// ****************************************************************** -// * XNetStartup -// ****************************************************************** -OOVPA_NO_XREF(XNetStartup, 5233, 8) - - { 0x01, 0xC0 }, - { 0x04, 0x50 }, - { 0x07, 0x24 }, - { 0x0A, 0x68 }, - { 0x0F, 0xE8 }, - { 0x14, 0xC2 }, - { 0x15, 0x04 }, - { 0x16, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * XNetGetEthernetLinkStatus -// ****************************************************************** -OOVPA_NO_XREF(XNetGetEthernetLinkStatus, 5233, 8) - - { 0x08, 0x33 }, - { 0x10, 0x8A }, - { 0x19, 0x00 }, - { 0x22, 0x56 }, - { 0x2B, 0xFF }, - { 0x34, 0xF0 }, - { 0x3D, 0x24 }, - { 0x46, 0x5B }, -OOVPA_END; - -// ****************************************************************** -// * CXo::XOnlineLogon -// ****************************************************************** -OOVPA_XREF(CXo_XOnlineLogon, 5233, 8, - - XREF_CXo_XOnlineLogon, - XRefZero) - - { 0x21, 0xA8 }, - { 0x3E, 0x80 }, - { 0x5E, 0x00 }, - { 0x7E, 0x04 }, - { 0xA2, 0x85 }, - { 0xBE, 0xEC }, - { 0xDE, 0xF9 }, - { 0xFE, 0x33 }, -OOVPA_END; - -// ****************************************************************** -// * XOnlineLogon -// ****************************************************************** -OOVPA_XREF(XOnlineLogon, 5233, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x0B, XREF_CXo_XOnlineLogon ), - - { 0x00, 0x55 }, - { 0x01, 0x8B }, - { 0x02, 0xEC }, - { 0x03, 0x5D }, - { 0x04, 0x8B }, - { 0x05, 0x0D }, - { 0x0A, 0xE9 }, -OOVPA_END; -#endif - // ****************************************************************** // * WSAStartup // ****************************************************************** @@ -129,7 +60,7 @@ OOVPATable XOnline_5558[] = { REGISTER_OOVPA(bind, 4361, EMUTHIS), // REGISTER_OOVPA(listen, 4361, EMUTHIS), REGISTER_OOVPA(ioctlsocket, 4361, EMUTHIS), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 5233, PATCH), + REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl index e9fdf03d0..86f256769 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl @@ -50,58 +50,14 @@ OOVPA_XREF(XnInit, 5788, 8, { 0xFE, 0x48 }, OOVPA_END; -// ****************************************************************** -// * XNetStartup -// ****************************************************************** -OOVPA_NO_XREF(XNetStartup, 5788, 8) - - { 0x01, 0xC0 }, - { 0x04, 0x50 }, - { 0x07, 0x24 }, - { 0x0A, 0x68 }, - { 0x0F, 0xE8 }, - { 0x14, 0xC2 }, - { 0x15, 0x04 }, - { 0x16, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * WSAStartup -// ****************************************************************** -OOVPA_NO_XREF(WSAStartup, 5788, 7) - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x6A }, - { 0x0E, 0x68 }, - { 0x13, 0xE8 }, - { 0x18, 0xC2 }, - { 0x1A, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * XNetGetEthernetLinkStatus -// ****************************************************************** -OOVPA_NO_XREF(XNetGetEthernetLinkStatus, 5788, 8) - - { 0x08, 0x33 }, - { 0x10, 0x8A }, - { 0x19, 0x00 }, - { 0x22, 0x56 }, - { 0x2B, 0xFF }, - { 0x34, 0xF0 }, - { 0x3D, 0x24 }, - { 0x46, 0x5B }, -OOVPA_END; - // ****************************************************************** // * XOnline_5788 // ****************************************************************** OOVPATable XOnline_5788[] = { - REGISTER_OOVPA(XNetStartup, 5788, PATCH), - REGISTER_OOVPA(WSAStartup, 5788, PATCH), + REGISTER_OOVPA(XNetStartup, 5233, PATCH), + REGISTER_OOVPA(WSAStartup, 5558, PATCH), REGISTER_OOVPA(XnInit, 5788, XREF), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 5788, PATCH), + REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), REGISTER_OOVPA(bind, 4361, EMUTHIS), REGISTER_OOVPA(ioctlsocket, 4361, EMUTHIS), }; diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl index 88f4cb1f9..a3bfd2e56 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl @@ -32,53 +32,6 @@ // * // ****************************************************************** -// ****************************************************************** -// * XnInit -// ****************************************************************** -OOVPA_XREF(XnInit, 5849, 8, - - XREF_XNINIT, - XRefZero) - - { 0x1E, 0x3B }, - { 0x3E, 0x45 }, - { 0x5E, 0x00 }, - { 0x81, 0x57 }, - { 0xA2, 0x57 }, - { 0xC0, 0x33 }, - { 0xDE, 0xFE }, - { 0xFE, 0x48 }, -OOVPA_END; - -// ****************************************************************** -// * XNetStartup -// ****************************************************************** -OOVPA_NO_XREF(XNetStartup, 5849, 8) - - { 0x01, 0xC0 }, - { 0x04, 0x50 }, - { 0x07, 0x24 }, - { 0x0A, 0x68 }, - { 0x0F, 0xE8 }, - { 0x14, 0xC2 }, - { 0x15, 0x04 }, - { 0x16, 0x00 }, -OOVPA_END; - -// ****************************************************************** -// * WSAStartup -// ****************************************************************** -OOVPA_NO_XREF(WSAStartup, 5849, 7) - - { 0x02, 0x24 }, - { 0x06, 0x24 }, - { 0x0A, 0x6A }, - { 0x0E, 0x68 }, - { 0x13, 0xE8 }, - { 0x18, 0xC2 }, - { 0x1A, 0x00 }, -OOVPA_END; - // ****************************************************************** // * XNetGetEthernetLinkStatus // ****************************************************************** @@ -88,9 +41,9 @@ OOVPA_END; // * XOnline_5849 // ****************************************************************** OOVPATable XOnline_5849[] = { - REGISTER_OOVPA(XNetStartup, 5849, PATCH), - REGISTER_OOVPA(WSAStartup, 5849, PATCH), - REGISTER_OOVPA(XnInit, 5849, XREF), + REGISTER_OOVPA(XNetStartup, 5233, PATCH), + REGISTER_OOVPA(WSAStartup, 5558, PATCH), + REGISTER_OOVPA(XnInit, 5788, XREF), REGISTER_OOVPA(XNetGetEthernetLinkStatus, 5849, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl index 0d8c15a9a..871419000 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl @@ -32,36 +32,6 @@ // * // ****************************************************************** -// ****************************************************************** -// * XGetDevices -// ****************************************************************** -OOVPA_NO_XREF(XGetDevices, 4134, 14) - - // XGetDevices+0x07 : mov edx, [esp+arg_0] - { 0x07, 0x8B }, // (Offset,Value)-Pair #1 - { 0x08, 0x54 }, // (Offset,Value)-Pair #2 - { 0x09, 0x24 }, // (Offset,Value)-Pair #3 - { 0x0A, 0x08 }, // (Offset,Value)-Pair #4 - - // XGetDevices+0x0D : and [edx+4], 0 - { 0x0D, 0x83 }, // (Offset,Value)-Pair #5 - { 0x0E, 0x62 }, // (Offset,Value)-Pair #6 - { 0x0F, 0x04 }, // (Offset,Value)-Pair #7 - { 0x10, 0x00 }, // (Offset,Value)-Pair #8 - - // XGetDevices+0x11 : mov cl, al - { 0x11, 0x8A }, // (Offset,Value)-Pair #9 - { 0x12, 0xC8 }, // (Offset,Value)-Pair #10 - - // XGetDevices+0x16 : call KfLowerIrql - { 0x16, 0xFF }, // (Offset,Value)-Pair #11 - { 0x17, 0x15 }, // (Offset,Value)-Pair #12 - - // XGetDevices+0x1F : retn 4 - { 0x1F, 0xC2 }, // (Offset,Value)-Pair #13 - { 0x20, 0x04 }, // (Offset,Value)-Pair #14 -OOVPA_END; - // ****************************************************************** // * XInputOpen // ****************************************************************** @@ -213,7 +183,7 @@ OOVPATable XAPI_4134[] = { REGISTER_OOVPA(XInitDevices, 3911, PATCH), //*/ REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XInputOpen, 4134, PATCH), REGISTER_OOVPA(XInputGetState, 4134, PATCH), REGISTER_OOVPA(XInputSetState, 3911, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl index 4ee08aae5..ce4864e02 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl @@ -340,7 +340,7 @@ OOVPA_END; OOVPATable XAPI_4361[] = { REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XGetDeviceChanges, 3911, DISABLED), REGISTER_OOVPA(XInputOpen, 4361, PATCH), REGISTER_OOVPA(XID_fCloseDevice, 4361, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl index 75e301d7d..4ab8fb416 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl @@ -60,7 +60,7 @@ OOVPA_END; OOVPATable XAPI_4432[] = { REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XInputOpen, 4361, PATCH), REGISTER_OOVPA(XID_fCloseDevice, 4361, XREF), REGISTER_OOVPA(XInputClose, 3911, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl index 3c34ad6b5..9c03ff5f7 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl @@ -46,54 +46,6 @@ OOVPA_NO_XREF(XFormatUtilityDrive, 4627, 7) { 0x7C, 0x40 }, OOVPA_END; -// ****************************************************************** -// * SetThreadPriorityBoost -// ****************************************************************** -OOVPA_NO_XREF(SetThreadPriorityBoost, 4627, 10) - - // SetThreadPriorityBoost+0x0D : push [ebp+0x08] - { 0x0D, 0xFF }, // (Offset,Value)-Pair #1 - { 0x0E, 0x75 }, // (Offset,Value)-Pair #2 - { 0x0F, 0x08 }, // (Offset,Value)-Pair #3 - - // SetThreadPriorityBoost+0x18 : jl +0x20 - { 0x18, 0x7C }, // (Offset,Value)-Pair #4 - { 0x19, 0x20 }, // (Offset,Value)-Pair #5 - - // SetThreadPriorityBoost+0x1F : setnz al - { 0x1F, 0x0F }, // (Offset,Value)-Pair #6 - { 0x20, 0x95 }, // (Offset,Value)-Pair #7 - { 0x21, 0xC0 }, // (Offset,Value)-Pair #8 - - // SetThreadPriorityBoost+0x2C : mov ecx, [ebp+0x08] - { 0x2C, 0x8B }, // (Offset,Value)-Pair #9 - { 0x2D, 0x4D }, // (Offset,Value)-Pair #10 -OOVPA_END; - -// ****************************************************************** -// * GetThreadPriority -// ****************************************************************** -OOVPA_NO_XREF(GetThreadPriority, 4627, 10) - - // GetThreadPriority+0x0D : push [ebp+0x08] - { 0x0D, 0xFF }, // (Offset,Value)-Pair #1 - { 0x0E, 0x75 }, // (Offset,Value)-Pair #2 - { 0x0F, 0x08 }, // (Offset,Value)-Pair #3 - - // GetThreadPriority+0x18 : jl +0x2B - { 0x18, 0x7C }, // (Offset,Value)-Pair #4 - { 0x19, 0x2B }, // (Offset,Value)-Pair #5 - - // GetThreadPriority+0x2F : cmp esi, 0xFFFFFFF0 - { 0x2F, 0x83 }, // (Offset,Value)-Pair #6 - { 0x30, 0xFE }, // (Offset,Value)-Pair #7 - { 0x31, 0xF0 }, // (Offset,Value)-Pair #8 - - // GetThreadPriority+0x37 : mov ecx, [ebp+0x08] - { 0x37, 0x8B }, // (Offset,Value)-Pair #9 - { 0x38, 0x4D }, // (Offset,Value)-Pair #10 -OOVPA_END; - // ****************************************************************** // * XID_fCloseDevice // ****************************************************************** @@ -135,31 +87,6 @@ OOVPA_XREF(XID_fCloseDevice, 4928, 11, { 0x96, 0xC3 }, // (Offset,Value)-Pair #11 OOVPA_END; -// ****************************************************************** -// * XInputClose -// ****************************************************************** -OOVPA_XREF(XInputClose, 4928, 8, - - XRefNoSaveIndex, - XRefOne) - - // XInputClose+0x05 : call [fCloseDevice] - XREF_ENTRY( 0x05, XREF_FCLOSEDEVICE ), // (Offset,Value)-Pair #1 - - // XInputClose+0x00 : mov ecx, [esp+0x04] - { 0x00, 0x8B }, // (Offset,Value)-Pair #2 - { 0x01, 0x4C }, // (Offset,Value)-Pair #3 - { 0x02, 0x24 }, // (Offset,Value)-Pair #4 - { 0x03, 0x04 }, // (Offset,Value)-Pair #5 - - // XInputClose+0x04 : call [fCloseDevice] - { 0x04, 0xE8 }, // (Offset,Value)-Pair #6 - - // XInputClose+0x09 : retn 0x04 - { 0x09, 0xC2 }, // (Offset,Value)-Pair #7 - { 0x0A, 0x04 }, // (Offset,Value)-Pair #8 -OOVPA_END; - // ****************************************************************** // * XInputGetState // ****************************************************************** @@ -214,21 +141,6 @@ OOVPA_NO_XREF(GetOverlappedResult, 4627, 7) { 0x59, 0x56 }, OOVPA_END; -// ****************************************************************** -// * XLaunchNewImageA -// ****************************************************************** -OOVPA_NO_XREF(XLaunchNewImageA, 4627, 8) - - { 0x1E, 0x80 }, - { 0x3E, 0xC0 }, - { 0x5E, 0xFF }, - { 0x7E, 0xFC }, - { 0x9E, 0x08 }, - { 0xBE, 0x50 }, - { 0xDE, 0x05 }, - { 0xFE, 0x85 }, -OOVPA_END; - // ****************************************************************** // * XLaunchNewImageA // ****************************************************************** @@ -251,20 +163,6 @@ OOVPA_NO_XREF(XLaunchNewImageA, 4928, 12) { 0x44, 0x5C }, OOVPA_END; -// ****************************************************************** -// * XGetLaunchInfo -// ****************************************************************** -OOVPA_NO_XREF(XGetLaunchInfo, 4627, 7) - - { 0x0B, 0x8B }, - { 0x18, 0x15 }, - { 0x25, 0x8B }, - { 0x32, 0x30 }, - { 0x3F, 0x00 }, - { 0x4C, 0x83 }, - { 0x59, 0x5E }, -OOVPA_END; - // ****************************************************************** // * XSetProcessQuantumLength // ****************************************************************** @@ -322,21 +220,6 @@ OOVPA_NO_XREF(RaiseException, 4627, 7) { 0x4B, 0xFF }, OOVPA_END; - -// ****************************************************************** -// * XMountAlternateTitleA -// ****************************************************************** -OOVPA_NO_XREF(XMountAlternateTitleA, 4627, 7) - - { 0x1E, 0x0F }, - { 0x3E, 0x56 }, - { 0x5E, 0xFF }, - { 0x7E, 0x8D }, - { 0x9E, 0x50 }, - { 0xBE, 0x66 }, - { 0xDE, 0xF0 }, -OOVPA_END; - // ****************************************************************** // * XMountAlternateTitleA // ****************************************************************** @@ -351,20 +234,6 @@ OOVPA_NO_XREF(XMountAlternateTitleA, 4928, 7) { 0xDE, 0x45 }, OOVPA_END; -// ****************************************************************** -// * XUnmountAlternateTitleA -// ****************************************************************** -OOVPA_NO_XREF(XUnmountAlternateTitleA, 4627, 7) - - { 0x0A, 0x65 }, - { 0x16, 0xFF }, - { 0x23, 0x83 }, - { 0x2E, 0x45 }, - { 0x3A, 0x50 }, - { 0x46, 0x0B }, - { 0x52, 0x50 }, -OOVPA_END; - // ****************************************************************** // * MoveFileA // ****************************************************************** @@ -401,18 +270,18 @@ OOVPA_END; OOVPATable XAPI_4627[] = { REGISTER_OOVPA(XFormatUtilityDrive, 4627, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 4627, PATCH), + REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 4627, PATCH), + REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XInputOpen, 4361, PATCH), REGISTER_OOVPA(XInputPoll, 4134, PATCH), REGISTER_OOVPA(XID_fCloseDevice, 4627, XREF), REGISTER_OOVPA(XID_fCloseDevice, 4928, XREF), - REGISTER_OOVPA(XInputClose, 4928, PATCH), + REGISTER_OOVPA(XInputClose, 3911, PATCH), REGISTER_OOVPA(XInputGetCapabilities, 4361, PATCH), REGISTER_OOVPA(XInputGetState, 4361, PATCH), REGISTER_OOVPA(XInputGetState, 4928, PATCH), @@ -431,18 +300,18 @@ OOVPATable XAPI_4627[] = { REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), REGISTER_OOVPA(GetOverlappedResult, 4627, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 4627, PATCH), + REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH), REGISTER_OOVPA(XLaunchNewImageA, 4928, PATCH), - REGISTER_OOVPA(XGetLaunchInfo, 4627, DISABLED), + REGISTER_OOVPA(XGetLaunchInfo, 3911, DISABLED), REGISTER_OOVPA(XSetProcessQuantumLength, 4627, PATCH), REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), REGISTER_OOVPA(timeSetEvent, 4627, PATCH), REGISTER_OOVPA(timeKillEvent, 4627, PATCH), REGISTER_OOVPA(RaiseException, 4627, PATCH), REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 4627, PATCH), + REGISTER_OOVPA(XMountAlternateTitleA, 3911, PATCH), REGISTER_OOVPA(XMountAlternateTitleA, 4928, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 4627, PATCH), + REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), REGISTER_OOVPA(XInputGetDeviceDescription, 4831, PATCH), REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), // REGISTER_OOVPA(MoveFileA, 4627, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl index 94059b9e1..eb9a80e54 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl @@ -44,7 +44,7 @@ OOVPATable XAPI_4721[] = { // REGISTER_OOVPA(RtlDestroyHeap, 4627, PATCH), // obsolete REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XInputOpen, 4361, PATCH), REGISTER_OOVPA(XInputGetCapabilities, 4361, PATCH), REGISTER_OOVPA(XInputGetState, 4361, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.inl index 09f4c7db5..27d7e3aad 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.inl @@ -38,18 +38,18 @@ OOVPATable XAPI_5028[] = { REGISTER_OOVPA(XFormatUtilityDrive, 4627, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 4627, PATCH), + REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 4627, PATCH), + REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XInputOpen, 4361, PATCH), REGISTER_OOVPA(XInputPoll, 4134, PATCH), REGISTER_OOVPA(XID_fCloseDevice, 4627, XREF), REGISTER_OOVPA(XID_fCloseDevice, 4928, XREF), - REGISTER_OOVPA(XInputClose, 4928, PATCH), + REGISTER_OOVPA(XInputClose, 3911, PATCH), REGISTER_OOVPA(XInputGetCapabilities, 4361, PATCH), REGISTER_OOVPA(XInputGetState, 4361, PATCH), REGISTER_OOVPA(XInputGetState, 4928, PATCH), @@ -68,18 +68,18 @@ OOVPATable XAPI_5028[] = { REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), REGISTER_OOVPA(GetOverlappedResult, 4627, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 4627, PATCH), + REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH), REGISTER_OOVPA(XLaunchNewImageA, 4928, PATCH), - REGISTER_OOVPA(XGetLaunchInfo, 4627, DISABLED), + REGISTER_OOVPA(XGetLaunchInfo, 3911, DISABLED), REGISTER_OOVPA(XSetProcessQuantumLength, 4627, PATCH), REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), REGISTER_OOVPA(timeSetEvent, 4627, PATCH), REGISTER_OOVPA(timeKillEvent, 4627, PATCH), REGISTER_OOVPA(RaiseException, 4627, PATCH), REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 4627, PATCH), + REGISTER_OOVPA(XMountAlternateTitleA, 3911, PATCH), REGISTER_OOVPA(XMountAlternateTitleA, 4928, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 4627, PATCH), + REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), REGISTER_OOVPA(XInputGetDeviceDescription, 4831, PATCH), REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), // REGISTER_OOVPA(MoveFileA, 4627, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl index b56c2cb93..05c0db282 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl @@ -100,17 +100,17 @@ OOVPATable XAPI_5233[] = { REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 4627, PATCH), - REGISTER_OOVPA(GetThreadPriority, 4627, PATCH), + REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), + REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), REGISTER_OOVPA(XInitDevices, 5233, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XGetDeviceChanges, 5233, DISABLED), REGISTER_OOVPA(XInputOpen, 4361, PATCH), REGISTER_OOVPA(XInputGetCapabilities, 5233, PATCH), REGISTER_OOVPA(XID_fCloseDevice, 4928, XREF), - REGISTER_OOVPA(XInputClose, 4928, PATCH), + REGISTER_OOVPA(XInputClose, 3911, PATCH), REGISTER_OOVPA(XInputGetState, 4928, PATCH), REGISTER_OOVPA(XInputSetState, 5233, PATCH), REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.inl index de4d32c41..b852dafff 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.inl @@ -39,17 +39,17 @@ OOVPATable XAPI_5344[] = { REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 4627, PATCH), - REGISTER_OOVPA(GetThreadPriority, 4627, PATCH), + REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), + REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), REGISTER_OOVPA(XInitDevices, 5233, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XGetDeviceChanges, 5233, DISABLED), REGISTER_OOVPA(XInputOpen, 4361, PATCH), REGISTER_OOVPA(XInputGetCapabilities, 5233, PATCH), REGISTER_OOVPA(XID_fCloseDevice, 4928, XREF), - REGISTER_OOVPA(XInputClose, 4928, PATCH), + REGISTER_OOVPA(XInputClose, 3911, PATCH), REGISTER_OOVPA(XInputGetState, 4928, PATCH), REGISTER_OOVPA(XInputSetState, 5233, PATCH), REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl index 4d6e5622e..86952a879 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl @@ -105,35 +105,6 @@ OOVPA_NO_XREF(XLaunchNewImageA, 5558, 7) { 0x3D, 0x10 }, OOVPA_END; -// ****************************************************************** -// * XGetLaunchInfo -// ****************************************************************** -OOVPA_NO_XREF(XGetLaunchInfo, 5558, 7) - - { 0x0B, 0x8B }, - { 0x18, 0x15 }, - { 0x25, 0x8B }, - { 0x32, 0x30 }, - { 0x3F, 0x00 }, - { 0x4C, 0x83 }, - { 0x59, 0x5E }, -OOVPA_END; - -// ****************************************************************** -// * XMountMUA -// ****************************************************************** -OOVPA_NO_XREF(XMountMUA, 5558, 8) - - { 0x22, 0x8A }, - { 0x3E, 0x89 }, - { 0x5E, 0x5C }, - { 0x7E, 0xF4 }, - { 0x9E, 0x50 }, - { 0xBE, 0xF8 }, - { 0xDE, 0x8D }, - { 0xFE, 0x09 }, -OOVPA_END; - // ****************************************************************** // * XapiFiberStartup // ****************************************************************** @@ -194,7 +165,7 @@ OOVPATable XAPI_5558[] = { REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), REGISTER_OOVPA(XInitDevices, 5233, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XGetDeviceChanges, 5233, DISABLED), REGISTER_OOVPA(XInputOpen, 4361, PATCH), REGISTER_OOVPA(XInputGetCapabilities, 5558, PATCH), @@ -202,12 +173,12 @@ OOVPATable XAPI_5558[] = { REGISTER_OOVPA(XInputSetState, 5233, PATCH), // REGISTER_OOVPA(XapiThreadStartup, 4361, PATCH), // obsolete? REGISTER_OOVPA(XLaunchNewImageA, 5558, PATCH), - REGISTER_OOVPA(XGetLaunchInfo, 5558, DISABLED), + REGISTER_OOVPA(XGetLaunchInfo, 3911, DISABLED), REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 4627, PATCH), - REGISTER_OOVPA(GetThreadPriority, 4627, PATCH), + REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), + REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(XMountMUA, 5558, PATCH), + REGISTER_OOVPA(XMountMUA, 4361, PATCH), REGISTER_OOVPA(CreateFiber, 3911, DISABLED), REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl index eea84bedf..6a538aafd 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl @@ -47,20 +47,6 @@ OOVPA_NO_XREF(XapiInitProcess, 5788, 8) { 0xFE, 0x53 }, OOVPA_END; -// ****************************************************************** -// * XGetDeviceChanges -// ****************************************************************** -OOVPA_NO_XREF(XGetDeviceChanges, 5788, 7) - - { 0x0C, 0x75 }, - { 0x1A, 0x53 }, - { 0x28, 0xF7 }, - { 0x36, 0x56 }, - { 0x44, 0x89 }, - { 0x52, 0xC8 }, - { 0x60, 0x5F }, -OOVPA_END; - // ****************************************************************** // * GetThreadPriority // ****************************************************************** @@ -101,20 +87,6 @@ OOVPA_NO_XREF(XGetSectionSize, 5788, 5) { 0x08, 0x04 }, OOVPA_END; -// ****************************************************************** -// * RaiseException -// ****************************************************************** -OOVPA_NO_XREF(RaiseException, 5788, 7) - - { 0x09, 0x83 }, - { 0x14, 0x8B }, - { 0x1F, 0xC7 }, - { 0x2A, 0x10 }, - { 0x35, 0x89 }, - { 0x40, 0x5F }, - { 0x4B, 0xFF }, -OOVPA_END; - // ****************************************************************** // * XGetDeviceEnumerationStatus // ****************************************************************** @@ -150,21 +122,21 @@ OOVPATable XAPI_5788[] = { REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), REGISTER_OOVPA(XInitDevices, 5233, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XInputOpen, 4361, PATCH), REGISTER_OOVPA(XInputGetCapabilities, 5558, PATCH), REGISTER_OOVPA(XInputGetState, 5558, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 5788, DISABLED), // Was PATCH + REGISTER_OOVPA(XGetDeviceChanges, 5233, DISABLED), // Was PATCH // REGISTER_OOVPA(XapiThreadStartup, 4361, PATCH), // obsolete? - REGISTER_OOVPA(XGetLaunchInfo, 5558, DISABLED), + REGISTER_OOVPA(XGetLaunchInfo, 3911, DISABLED), REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), REGISTER_OOVPA(GetThreadPriority, 5788, PATCH), REGISTER_OOVPA(SetThreadPriorityBoost, 5788, PATCH), // REGISTER_OOVPA(GetThreadPriorityBoost, 5788, PATCH), - REGISTER_OOVPA(XMountMUA, 5558, PATCH), + REGISTER_OOVPA(XMountMUA, 4361, PATCH), REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(RaiseException, 5788, PATCH), + REGISTER_OOVPA(RaiseException, 4627, PATCH), REGISTER_OOVPA(XLaunchNewImageA, 5558, PATCH), REGISTER_OOVPA(XInputSetState, 5233, PATCH), REGISTER_OOVPA(XGetDeviceEnumerationStatus, 5788, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl index 2b8d9b25f..85f7ab28f 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl @@ -32,76 +32,7 @@ // * // ****************************************************************** -// ****************************************************************** -// * XapiInitProcess -// ****************************************************************** -OOVPA_NO_XREF(XapiInitProcess, 5849, 8) - - { 0x22, 0x6A }, - { 0x3E, 0x01 }, - { 0x5E, 0x75 }, - { 0x7E, 0x5E }, - { 0x9E, 0x7D }, - { 0xBE, 0x51 }, - { 0xDE, 0x00 }, - { 0xFE, 0x53 }, -OOVPA_END; - -// ****************************************************************** -// * XGetDeviceChanges -// ****************************************************************** -OOVPA_NO_XREF(XGetDeviceChanges, 5849, 7) - - { 0x0C, 0x75 }, - { 0x1A, 0x53 }, - { 0x28, 0xF7 }, - { 0x36, 0x56 }, - { 0x44, 0x89 }, - { 0x52, 0xC8 }, - { 0x60, 0x5F }, -OOVPA_END; - -// ****************************************************************** -// * GetThreadPriority -// ****************************************************************** -OOVPA_NO_XREF(GetThreadPriority, 5849, 7) - - { 0x0D, 0xFF }, - { 0x16, 0x85 }, - { 0x1F, 0x15 }, - { 0x2A, 0x04 }, - { 0x35, 0xF1 }, - { 0x40, 0x8B }, - { 0x4B, 0xB8 }, -OOVPA_END; - -// ****************************************************************** -// * SetThreadPriorityBoost -// ****************************************************************** -OOVPA_NO_XREF(SetThreadPriorityBoost, 5849, 7) - - { 0x07, 0xFF }, - { 0x10, 0xFF }, - { 0x19, 0x20 }, - { 0x22, 0x50 }, - { 0x2C, 0x8B }, - { 0x35, 0x33 }, - { 0x40, 0x33 }, -OOVPA_END; - -// ****************************************************************** -// * XGetSectionSize -// ****************************************************************** -OOVPA_NO_XREF(XGetSectionSize, 5849, 5) - - { 0x00, 0x8B }, - { 0x02, 0x24 }, - { 0x04, 0x8B }, - { 0x06, 0x08 }, - { 0x08, 0x04 }, -OOVPA_END; - -//Xbe Explorer generated pattern, derived from address $0027927D in "EA SPORTS™ RUGBY 2005" : +//Xbe Explorer generated pattern, derived from address $0027927D in "EA SPORTSERUGBY 2005" : //558BEC83EC14536880153200FF15........8B0D........33DB3BCB7548538D 1F 4046 0124 _timeSetEvent@20 ^ 000ED __imp__RtlEnterCriticalSection@4 ^ 0014D _XapiMmTimerThreadState ^ 003FR _CreateThread@24 ^ 0047D _timeSetEvent@20+0112 ^ 004DR _CloseHandle@4 ^ 005CD __imp__KeWaitForSingleObject@20 ^ 0062D _XapiMmTimerThreadState ^0082D _timeSetEvent@20+010F ^0090D _XapiMmTimerSerialNumber ^0097D _XapiMmTimerSerialNumber ^ 00C0R __allmul ^ 00CCD __imp__KeQueryInterruptTime@0 ^00E7D __imp__KeSetTimerEx@20 ^ 00ECD _XapiMmTimerThreadState ^ 00FBD __imp__KeSetEvent@12 ^0119D __imp__RtlLeaveCriticalSection@4 OOVPA_NO_XREF(timeSetEvent, 5849, 9) {0x00, 0x55}, @@ -115,7 +46,7 @@ OOVPA_NO_XREF(timeSetEvent, 5849, 9) {0x18, 0x33} OOVPA_END; -//; Xbe Explorer generated pattern, derived from address $002793A1 in "EA SPORTS™ RUGBY 2005" : +//; Xbe Explorer generated pattern, derived from address $002793A1 in "EA SPORTSERUGBY 2005" : //5657BF8015320057FF15........8B54240C8B0D........0FB7C24885C9743E 1D AD12 006F _timeKillEvent@4 ^ 000AD __imp__RtlEnterCriticalSection@4 ^ 0014D _XapiMmTimerThreadState ^ 003DD __imp__KeCancelTimer@4 ^ 0046D _XapiMmTimerThreadState ^ 0056D __imp__KeSetEvent@12 ^ 0064D __imp__RtlLeaveCriticalSection@4 OOVPA_NO_XREF(timeKillEvent, 5849, 10) { 0x00, 0x56 }, @@ -130,21 +61,6 @@ OOVPA_NO_XREF(timeKillEvent, 5849, 10) { 0x1F, 0x3E } OOVPA_END; - -// ****************************************************************** -// * RaiseException -// ****************************************************************** -OOVPA_NO_XREF(RaiseException, 5849, 7) - - { 0x09, 0x83 }, - { 0x14, 0x8B }, - { 0x1F, 0xC7 }, - { 0x2A, 0x10 }, - { 0x35, 0x89 }, - { 0x40, 0x5F }, - { 0x4B, 0xFF }, -OOVPA_END; - // ****************************************************************** // * XGetDeviceEnumerationStatus // ****************************************************************** @@ -180,19 +96,19 @@ OOVPATable XAPI_5849[] = { REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), REGISTER_OOVPA(XInitDevices, 5233, PATCH), - REGISTER_OOVPA(XGetDevices, 4134, PATCH), + REGISTER_OOVPA(XGetDevices, 3911, PATCH), REGISTER_OOVPA(XInputOpen, 4361, PATCH), REGISTER_OOVPA(XInputGetCapabilities, 5558, PATCH), REGISTER_OOVPA(XInputGetState, 5558, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 5849, DISABLED), + REGISTER_OOVPA(XGetDeviceChanges, 5233, DISABLED), // REGISTER_OOVPA(XapiThreadStartup, 4361, PATCH), // obsolete? REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 5849, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 5849, PATCH), + REGISTER_OOVPA(GetThreadPriority, 5788, PATCH), + REGISTER_OOVPA(SetThreadPriorityBoost, 5788, PATCH), // REGISTER_OOVPA(GetThreadPriorityBoost, 5849, PATCH), REGISTER_OOVPA(timeSetEvent, 5849, PATCH), REGISTER_OOVPA(timeKillEvent, 5849, PATCH), - REGISTER_OOVPA(RaiseException, 5849, PATCH), + REGISTER_OOVPA(RaiseException, 4627, PATCH), REGISTER_OOVPA(XLaunchNewImageA, 5558, PATCH), REGISTER_OOVPA(XInputSetState, 5233, PATCH), REGISTER_OOVPA(XGetDeviceEnumerationStatus, 5849, PATCH),