From f3e660692cda86658b2b0b846d28c4f05237d2d7 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Oct 2017 15:31:36 -0500 Subject: [PATCH 01/16] Mostly Predicted (lowered) Revision for DSound 4134 85% possible correct lowest revision - Add IDirectSoundStream_SetHeadroom to 4134 - Add CDirectSoundStream_SetConeAngles to 4134 - Add CDirectSoundStream_SetFrequency to 4134 - Moved CDirectSound_SetMixBinHeadroom 4627 to 4134 - Moved CDirectSoundStream_SetHeadroom 4627 to 4134 - Moved CDirectSoundStream_SetOutputBuffer 4627 to 4134 - Moved CDirectSoundBuffer_SetNotificationPositions 4627 to 4134 Verified - Add IDirectSoundStream_SetFormat to 4242 - Add CMcpxStream_Flush to 4361 - Moved CDirectSoundBuffer_Play 4361 to 4134 - Improved CMcpxBuffer_Play to 4134 - Improved CMcpxBuffer_Play in 4721 - Improved CMcpxBuffer_Play in 4831 - Improved CDirectSound_SetAllParameters 4134 to support 4361 and possible later titles. NOTE: 4039 and 4134 additions/lowered are not tested, they are predicted and verified with [4361] Hunter: The Reckoning. WARNING: Hunter: The Reckoning title can cause your computer to crash once it reach to main menu. Verified with - [4134] Blood Omen 2 - [4361] Hunter: The Reckoning --- src/CxbxKrnl/HLEDataBase.h | 1 + src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl | 1 + src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl | 17 ++ src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl | 233 ++++++++++++++++++- src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl | 18 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl | 63 ++--- src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 117 ++-------- src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl | 16 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl | 46 +--- src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl | 16 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl | 34 +-- src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl | 11 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl | 10 +- src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl | 79 ++++--- 15 files changed, 400 insertions(+), 264 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h index b4af21dc2..01a1a838b 100644 --- a/src/CxbxKrnl/HLEDataBase.h +++ b/src/CxbxKrnl/HLEDataBase.h @@ -308,6 +308,7 @@ enum XRefDataBaseOffset XREF_CDirectSoundBuffer_SetI3DL2Source, XREF_CDirectSoundVoice_SetFormat, XREF_CDirectSoundBuffer_SetFormat, + XREF_CDirectSoundStream_SetFormat, XREF_CFullHRTFSource_GetCenterVolume, XREF_CHRTFSource_SetFullHRTF5Channel, XREF_CMcpxVoiceClient_SetLFO, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl index 7dfaf8b08..dfdceb9b9 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl @@ -767,6 +767,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_Play // ****************************************************************** +// Generic OOVPA as of 3911 and newer. OOVPA_XREF(IDirectSoundBuffer_Play, 3911, 16, XRefNoSaveIndex, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl index fdb9115a7..9232574ec 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl @@ -976,6 +976,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetPlayRegion // ****************************************************************** +// Generic OOVPA as of 4039 and newer OOVPA_XREF(IDirectSoundBuffer_SetPlayRegion, 4039, 10, XRefNoSaveIndex, @@ -3700,3 +3701,19 @@ OOVPA_XREF(DirectSoundCreateStream, 4039, 11, { 0x4F, 0xC2 }, { 0x50, 0x08 }, OOVPA_END; + +// ****************************************************************** +// * IDirectSoundStream_SetHeadroom +// ****************************************************************** +// Generic OOVPA as of 4039 and newer +OOVPA_XREF(IDirectSoundStream_SetHeadroom, 4039, 2, + + XRefNoSaveIndex, + XRefOne) + + // IDirectSoundStream_SetHeadroom+0x00 : jmp [CDirectSoundStream_SetHeadroom] + XREF_ENTRY(0x01, XREF_CDirectSoundStream_SetHeadroom ), + + // IDirectSoundStream_SetHeadroom+0x00 : jmp 0x........ + { 0x00, 0xE9 }, +OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index 0afc99a07..1f4df842e 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -942,13 +942,16 @@ OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 4134, 10, { 0x53, 0x0C }, OOVPA_END; +#if 0 // Replaced with better OOVPA 4134 // ****************************************************************** // * CDirectSoundBuffer::Play // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 11, +OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 12, XREF_CDirectSoundBuffer_Play, - XRefZero) + XRefOne) + + XREF_ENTRY(0x35, XREF_CMcpxBuffer_Play), { 0x05, 0xFF }, { 0x0D, 0x0F }, @@ -962,6 +965,7 @@ OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 11, { 0x32, 0x24 }, { 0x33, 0x18 }, OOVPA_END; +#endif // ****************************************************************** // * CDirectSound::SetDistanceFactorA @@ -3252,7 +3256,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound::SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParameters, 4134, 13, +OOVPA_XREF(CDirectSound_SetAllParameters, 4134, 11, XREF_CDirectSound_SetAllParameters, XRefZero) @@ -3272,8 +3276,9 @@ OOVPA_XREF(CDirectSound_SetAllParameters, 4134, 13, { 0x55, 0x5A }, { 0x56, 0x44 }, - { 0xE3, 0xC2 }, - { 0xE4, 0x0C }, + // Removed both OVs to support 4361 titles + //{ 0xE3, 0xC2 }, + //{ 0xE4, 0x0C }, OOVPA_END; // ****************************************************************** @@ -3613,6 +3618,224 @@ OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 4134, 18, { 0x4C, 0x08 }, OOVPA_END; +// ****************************************************************** +// * CDirectSound::SetMixBinHeadroom +// ****************************************************************** +OOVPA_XREF(CDirectSound_SetMixBinHeadroom, 4134, 16, + + XREF_CDirectSound_SetMixBinHeadroom, + XRefZero) + + // CDirectSound_SetMixBinHeadroom+0x00 : push esi + { 0x00, 0x56 }, + + // CDirectSound_SetMixBinHeadroom+0x21 : mov eax, 0x80004005 + { 0x21, 0xB8 }, + { 0x22, 0x05 }, + { 0x23, 0x40 }, + { 0x24, 0x00 }, + { 0x25, 0x80 }, + + // CDirectSound_SetMixBinHeadroom+0x34 : mov bl, [esp+0x14] + { 0x34, 0x8A }, + { 0x35, 0x5C }, + { 0x36, 0x24 }, + { 0x37, 0x14 }, + + // CDirectSound_SetMixBinHeadroom+0x39 : mov [edx+ecx+0x14], bl + { 0x39, 0x88 }, + { 0x3A, 0x5C }, + { 0x3B, 0x0A }, + { 0x3C, 0x14 }, + + // CDirectSound_SetMixBinHeadroom+0x5C : retn 0x0C + { 0x5C, 0xC2 }, + { 0x5D, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * DirectSound::CDirectSoundBuffer::SetNotificationPositions +// ****************************************************************** +OOVPA_XREF(CDirectSoundBuffer_SetNotificationPositions, 4134, 11, + + XREF_CDirectSoundBuffer_SetNotificationPositions, + XRefZero) + + // CDirectSoundBuffer_SetNotificationPositions+0x00 : push ebx + { 0x00, 0x53 }, + + { 0x0C, 0x00 }, + { 0x1B, 0xFF }, + { 0x25, 0x80 }, + + { 0x2C, 0x0C }, + { 0x2D, 0x8B }, + { 0x2E, 0x4E }, + { 0x2F, 0x1C }, + + { 0x30, 0x57 }, + + { 0x47, 0xE8 }, + { 0x5D, 0x8B }, +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundStream::SetFrequency +// ****************************************************************** +OOVPA_XREF(CDirectSoundStream_SetFrequency, 4134, 12, + + XREF_CDirectSoundStream_SetFrequency, + XRefOne) + + XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetFrequency ), + + { 0x00, 0x56 }, + + { 0x0C, 0x00 }, + // je XXXXXXXX + 0x0B + { 0x14, 0x74 }, + { 0x15, 0x0B }, + // jmp XXXXXXXX + 0x26 + { 0x26, 0xEB }, + { 0x27, 0x26 }, + + { 0x2A, 0x24 }, + // je XXXXXXXX + 0x0B + { 0x3E, 0x74 }, + { 0x3F, 0x0B }, + + // ret 8 + { 0x4F, 0xC2 }, + { 0x50, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * DirectSound::CDirectSoundStream::SetOutputBuffer +// ****************************************************************** +OOVPA_XREF(CDirectSoundStream_SetOutputBuffer, 4134, 9, + + XREF_CDirectSoundStream_SetOutputBuffer, + XRefOne) + + XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetOutputBuffer ), + + { 0x00, 0x56 }, + + { 0x0C, 0x00 }, + { 0x14, 0x74 }, + { 0x21, 0xB8 }, + { 0x2A, 0x24 }, + { 0x35, 0xE8 }, + { 0x40, 0x68 }, + { 0x4B, 0x8B }, +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundStream_SetConeAngles +// ****************************************************************** +OOVPA_XREF(CDirectSoundStream_SetConeAngles, 4134, 9, + + XREF_CDirectSoundStream_SetConeAngles, + XRefOne) + + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetConeAngles ), + + { 0x00, 0x56 }, + { 0x0C, 0x00 }, + { 0x14, 0x74 }, + { 0x21, 0xB8 }, + + { 0x30, 0x18 }, + { 0x33, 0x04 }, + { 0x37, 0x18 }, + + { 0x3D, 0xE8 }, +OOVPA_END; + +// ****************************************************************** +// * DirectSound::CDirectSoundStream::SetHeadroom +// ****************************************************************** +OOVPA_XREF(CDirectSoundStream_SetHeadroom, 4134, 9, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetHeadroom ), + + { 0x00, 0x56 }, + + { 0x0C, 0x00 }, + { 0x14, 0x74 }, + { 0x21, 0xB8 }, + { 0x2A, 0x24 }, + { 0x35, 0xE8 }, + { 0x40, 0x68 }, + { 0x4B, 0x8B }, +OOVPA_END; + +// ****************************************************************** +// * public: long __thiscall DirectSound::CMcpxBuffer::Play(unsigned long) +// ****************************************************************** +OOVPA_XREF(CMcpxBuffer_Play, 4134, 13, + + XREF_CMcpxBuffer_Play, + XRefZero) + + // CMcpxBuffer_Play+0x00 : push ebx + { 0x00, 0x53 }, + + // CMcpxBuffer_Play+0x0E : cmp ebx, edi + { 0x0E, 0x3B }, + { 0x0F, 0xDF }, + + // CMcpxBuffer_Play+0x18 : test byte ptr [eax+09],0x20 + { 0x18, 0xF6 }, + { 0x19, 0x40 }, + { 0x1A, 0x09 }, + { 0x1B, 0x20 }, + + // CMcpxBuffer_Play+0x1C : jz +0x09 + { 0x1C, 0x74 }, + { 0x1D, 0x09 }, + + // CMcpxBuffer_Play+0x30 : test byte ptr [esi+0x12], 2 + { 0x30, 0xF6 }, + { 0x31, 0x46 }, + { 0x32, 0x12 }, + { 0x33, 0x02 }, + +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundBuffer_Play +// ****************************************************************** +OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 11, + + XREF_CDirectSoundBuffer_Play, + XRefOne) + + // CDirectSoundBuffer_Play+0x35 : call [CMcpxBuffer::Play] + XREF_ENTRY( 0x35, XREF_CMcpxBuffer_Play ), + + // CDirectSoundBuffer_Play+0x00 : push esi + { 0x00, 0x56 }, + + // CDirectSoundBuffer_Play+0x21 : mov eax, 0x80004005 + { 0x21, 0xB8 }, + { 0x22, 0x05 }, + { 0x23, 0x40 }, + { 0x24, 0x00 }, + { 0x25, 0x80 }, + + // CDirectSoundBuffer_Play+0x3D : jz +0x0B + { 0x3D, 0x74 }, + { 0x3E, 0x0B }, + + // CDirectSoundBuffer_Play+0x4E : retn 0x10 + { 0x4E, 0xC2 }, + { 0x4F, 0x10 }, +OOVPA_END; + // ****************************************************************** // * DSound_4134 // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl index 50a32d5d4..90f82ad08 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl @@ -94,7 +94,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundStream_SetFormat, 4242, 9, - XRefNoSaveIndex, + XREF_CDirectSoundStream_SetFormat, XRefOne) XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetFormat ), @@ -232,3 +232,19 @@ OOVPA_XREF(CMcpxStream_Flush, 4242, 10, { 0xD1, 0xC9 }, { 0xD2, 0xC3 }, OOVPA_END; + +// ****************************************************************** +// * IDirectSoundStream_SetFormat +// ****************************************************************** +// Generic OOVPA as of 4___ and newer +OOVPA_XREF(IDirectSoundStream_SetFormat, 4242, 2, + + XRefNoSaveIndex, + XRefOne) + + // IDirectSoundStream_SetFormat+0x00 : jmp [CDirectSoundStream_SetFormat] + XREF_ENTRY(0x01, XREF_CDirectSoundStream_SetFormat ), + + // IDirectSoundStream_SetFormat+0x00 : jmp 0x........ + { 0x00, 0xE9 }, +OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index 62d78b927..9ed876447 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -160,6 +160,7 @@ OOVPA_XREF(CDirectSoundBuffer_SetPlayRegion, 4361, 10, { 0x4A, 0x88 }, OOVPA_END; +#if 0 // Replaced with generic OOVPA 4039 // ****************************************************************** // * IDirectSoundBuffer_SetPlayRegion // ****************************************************************** @@ -179,6 +180,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetPlayRegion, 4361, 9, { 0x1D, 0xC2 }, { 0x1E, 0x0C }, OOVPA_END; +#endif // ****************************************************************** // * public: long __thiscall DirectSound::CMcpxBuffer::Play(unsigned long) @@ -209,33 +211,7 @@ OOVPA_XREF(CMcpxBuffer_Play, 4361, 11, { 0x73, 0x18 }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundBuffer_Play -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 4361, 10, - - XREF_CDirectSoundBuffer_Play, - XRefOne) - - // CDirectSoundBuffer_Play+0x35 : call [CMcpxBuffer::Play] - XREF_ENTRY( 0x35, XREF_CMcpxBuffer_Play ), - - // CDirectSoundBuffer_Play+0x21 : mov eax, 0x80004005 - { 0x21, 0xB8 }, - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // CDirectSoundBuffer_Play+0x3D : jz +0x0B - { 0x3D, 0x74 }, - { 0x3E, 0x0B }, - - // CDirectSoundBuffer_Play+0x4E : retn 0x10 - { 0x4E, 0xC2 }, - { 0x4F, 0x10 }, -OOVPA_END; - +#if 0 // Replaced with generic OOVPA 3911 // ****************************************************************** // * IDirectSoundBuffer_Play // ****************************************************************** @@ -261,6 +237,8 @@ OOVPA_XREF(IDirectSoundBuffer_Play, 4361, 9, { 0x19, 0x23 }, { 0x1A, 0xC8 }, OOVPA_END; +#endif + #if 0 // Moved to 4242 // ****************************************************************** // * CMcpxBuffer_Stop @@ -669,6 +647,31 @@ OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 4361, 12, { 0x32, 0x00 } OOVPA_END; +// ****************************************************************** +// * CMcpxStream_Flush +// ****************************************************************** +OOVPA_XREF(CMcpxStream_Flush, 4361, 10, + XREF_CMcpxStream_Flush, + XRefZero) + + { 0x00, 0x55 }, + { 0x01, 0x8B }, + + { 0x12, 0x33 }, + + { 0x3D, 0x83 }, + { 0x3E, 0xFE }, + { 0x3F, 0x06 }, //4242 only has 0x05 + + { 0x56, 0xE8 }, + + { 0x67, 0xE8 }, + + // Might not be a requirement? Aka comment this out might will enable support detection later XDK revisions. + { 0xD1, 0xC9 }, + { 0xD2, 0xC3 }, +OOVPA_END; + // ****************************************************************** // * DSound_4361 // ****************************************************************** @@ -686,7 +689,7 @@ OOVPATable DSound_4361[] = { REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH), @@ -700,8 +703,8 @@ OOVPATable DSound_4361[] = { REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 4361, PATCH), + REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF), REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF), REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl index 94545137c..6aa848d93 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl @@ -159,7 +159,7 @@ OOVPATable DSound_4432[] = { REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 90d34cee2..24c1b56cf 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -32,38 +32,8 @@ // * // ****************************************************************** -// ****************************************************************** -// * CDirectSound::SetMixBinHeadroom -// ****************************************************************** -OOVPA_XREF(CDirectSound_SetMixBinHeadroom, 4627, 15, - - XREF_CDirectSound_SetMixBinHeadroom, - XRefZero) - - // CDirectSound_SetMixBinHeadroom+0x21 : mov eax, 0x80004005 - { 0x21, 0xB8 }, - { 0x22, 0x05 }, - { 0x23, 0x40 }, - { 0x24, 0x00 }, - { 0x25, 0x80 }, - - // CDirectSound_SetMixBinHeadroom+0x34 : mov bl, [esp+0x14] - { 0x34, 0x8A }, - { 0x35, 0x5C }, - { 0x36, 0x24 }, - { 0x37, 0x14 }, - - // CDirectSound_SetMixBinHeadroom+0x39 : mov [edx+ecx+0x14], bl - { 0x39, 0x88 }, - { 0x3A, 0x5C }, - { 0x3B, 0x0A }, - { 0x3C, 0x14 }, - - // CDirectSound_SetMixBinHeadroom+0x5C : retn 0x0C - { 0x5C, 0xC2 }, - { 0x5D, 0x0C }, -OOVPA_END; +#if 0 // Replaced with generic OOVPA 3911 // ****************************************************************** // * IDirectSound_SetMixBinHeadroom // ****************************************************************** @@ -94,6 +64,7 @@ OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 4627, 12, { 0x15, 0x23 }, { 0x16, 0xC8 }, OOVPA_END; +#endif // ****************************************************************** // * CDirectSound::SetVelocity @@ -326,11 +297,14 @@ OOVPA_END; // ****************************************************************** // * CMcpxBuffer_Play // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play, 4721, 10, +OOVPA_XREF(CMcpxBuffer_Play, 4721, 11, XREF_CMcpxBuffer_Play, XRefZero) + // CMcpxBuffer_Play+0x00 : push ebx + { 0x00, 0x53 }, + // CMcpxBuffer_Play+0x2E : test byte ptr [eax+9], 20h { 0x2E, 0xF6 }, { 0x2F, 0x40 }, @@ -351,11 +325,15 @@ OOVPA_END; // ****************************************************************** // * public: long __thiscall DirectSound::CMcpxBuffer::Play(unsigned long) // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Play, 4831, 10, +// Generic OOVPA as of 4831 and newer +OOVPA_XREF(CMcpxBuffer_Play, 4831, 11, XREF_CMcpxBuffer_Play, XRefZero) + // CMcpxBuffer_Play+0x00 : push ebx + { 0x00, 0x53 }, + // CMcpxBuffer_Play+0x32 : test byte ptr [esi+12h], 42h { 0x32, 0xF6 }, { 0x33, 0x46 }, @@ -1030,24 +1008,6 @@ OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4627, 8, { 0x21, 0x08 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetHeadroom -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetHeadroom, 4627, 8, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, /*XREF_CDirectSoundVoice_SetHeadroom*/ XREF_CDirectSoundVoice_SetHeadroom ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; #if 0 // Moved to 4039 // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetOutputBuffer @@ -1088,25 +1048,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 4627, 8, OOVPA_END; #endif -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetOutputBuffer -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetOutputBuffer, 4627, 8, - - XREF_CDirectSoundStream_SetOutputBuffer, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetOutputBuffer ), - - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; - #if 0 // Moved to 3911 // ****************************************************************** // * IDirectSoundBuffer_SetOutputBuffer @@ -1242,26 +1183,6 @@ OOVPA_NO_XREF(XWaveFileCreateMediaObject, 4627, 7) { 0x67, 0x07 }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundBuffer::SetNotificationPositions -// ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetNotificationPositions, 4627, 10, - - XREF_CDirectSoundBuffer_SetNotificationPositions, - XRefZero) - - { 0x0C, 0x00 }, - { 0x1B, 0xFF }, - { 0x25, 0x80 }, - { 0x2C, 0x0C }, - { 0x2D, 0x8B }, - { 0x2E, 0x4E }, - { 0x2F, 0x1C }, - { 0x30, 0x57 }, - { 0x47, 0xE8 }, - { 0x5D, 0x8B }, -OOVPA_END; - // ****************************************************************** // * XFileCreateMediaObjectEx // ****************************************************************** @@ -1487,13 +1408,13 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(DirectSoundGetSampleTime, 4361, PATCH), REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4134, XREF), REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 4627, PATCH), + REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4134, XREF), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 3911, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 4039, PATCH), REGISTER_OOVPA(CDirectSound_SetVelocity, 4627, XREF), @@ -1552,8 +1473,8 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF), REGISTER_OOVPA(CMcpxBuffer_Play, 4721, XREF), REGISTER_OOVPA(CMcpxBuffer_Play, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 4361, PATCH), + REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), @@ -1652,18 +1573,18 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4627, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4134, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4039, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetOutputBuffer, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4627, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4134, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 4627, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), REGISTER_OOVPA(CDirectSoundStream_SetRolloffCurve, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), REGISTER_OOVPA(XFileCreateMediaObjectEx, 4627, PATCH), REGISTER_OOVPA(XWaveFileCreateMediaObject, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF), // Uncommenting these fixes dashboard 4920 + REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), // Uncommenting these fixes dashboard 4920 REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl index 486732bb3..34d050d67 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl @@ -57,13 +57,13 @@ OOVPATable DSound_5028[] = { REGISTER_OOVPA(DirectSoundGetSampleTime, 4361, PATCH), REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4134, XREF), REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 4627, PATCH), + REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4134, XREF), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 3911, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 4039, PATCH), REGISTER_OOVPA(CDirectSound_SetVelocity, 4627, XREF), @@ -122,8 +122,8 @@ OOVPATable DSound_5028[] = { REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF), REGISTER_OOVPA(CMcpxBuffer_Play, 4721, XREF), REGISTER_OOVPA(CMcpxBuffer_Play, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 4361, PATCH), + REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), @@ -230,18 +230,18 @@ OOVPATable DSound_5028[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4627, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4134, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4039, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetOutputBuffer, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4627, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4134, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 4627, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), REGISTER_OOVPA(CDirectSoundStream_SetRolloffCurve, 4627, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), REGISTER_OOVPA(XFileCreateMediaObjectEx, 5028, PATCH), REGISTER_OOVPA(XWaveFileCreateMediaObject, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF), + REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index efa62d874..d9da28d2c 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -295,34 +295,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetVolume, 5233, 8, { 0x47, 0x8B }, OOVPA_END; -// ****************************************************************** -// * CDirectSoundStream::SetFrequency -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFrequency, 5233, 11, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetFrequency ), - - { 0x0E, 0xB6 }, - // je XXXXXXXX + 0x0B - { 0x14, 0x74 }, - { 0x15, 0x0B }, - // jmp XXXXXXXX + 0x26 - { 0x26, 0xEB }, - { 0x27, 0x26 }, - - { 0x2A, 0x24 }, - // je XXXXXXXX + 0x0B - { 0x3E, 0x74 }, - { 0x3F, 0x0B }, - - // ret 8 - { 0x4F, 0xC2 }, - { 0x50, 0x08 }, -OOVPA_END; - #if 0 // Replaced with generic OOVPA 4134 // ****************************************************************** // * CDirectSoundStream::SetMixBins @@ -388,8 +360,8 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 4627, PATCH), + REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4134, XREF), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 3911, PATCH), REGISTER_OOVPA(CDirectSound_SetPosition, 4627, XREF), REGISTER_OOVPA(IDirectSound_SetPosition, 3911, PATCH), REGISTER_OOVPA(DirectSoundCreateBuffer, 4242, PATCH), @@ -397,7 +369,7 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5233, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 4134, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 5233, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 5233, XREF), @@ -419,8 +391,8 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), REGISTER_OOVPA(CMcpxBuffer_Play, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 4361, PATCH), + REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), REGISTER_OOVPA(CDirectSoundStream_FlushEx, 5233, XREF), REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), REGISTER_OOVPA(CDirectSound_EnableHeadphones, 5233, XREF), @@ -484,8 +456,6 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 4627, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 4627, XREF), REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), @@ -510,7 +480,7 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4039, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetOutputBuffer, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4627, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4134, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 4134, XREF), @@ -519,12 +489,12 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetConeOrientation, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF), + REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl index f67cfed58..d7660f686 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl @@ -908,7 +908,7 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5233, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 4134, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 5233, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 5233, XREF), @@ -929,8 +929,8 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), REGISTER_OOVPA(CMcpxBuffer_Play, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 4361, PATCH), + REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), + REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), REGISTER_OOVPA(CDirectSoundStream_FlushEx, 5233, XREF), REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), REGISTER_OOVPA(CDirectSound_EnableHeadphones, 5344, XREF), @@ -996,8 +996,8 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 4627, PATCH), + REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4134, XREF), + REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 3911, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 4627, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 5344, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5344, PATCH), @@ -1027,7 +1027,7 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4039, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetOutputBuffer, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4627, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4134, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5344, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), @@ -1041,13 +1041,13 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetConeOrientation, 5344, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetConeOrientation, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF), + REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index d97e1afd2..2fe599eaf 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -539,6 +539,7 @@ OOVPA_XREF(CDirectSoundBuffer_Play, 5558, 9, { 0x4B, 0xC7 }, OOVPA_END; +#if 0 // Replaced with generic OOVPA 3911 // ****************************************************************** // * IDirectSoundBuffer_Play // ****************************************************************** @@ -557,6 +558,7 @@ OOVPA_XREF(IDirectSoundBuffer_Play, 5558, 8, { 0x1C, 0xE8 }, { 0x21, 0xC2 }, OOVPA_END; +#endif // ****************************************************************** // * CMcpxBuffer_GetStatus @@ -1188,26 +1190,6 @@ OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 5558, 8, { 0x47, 0x8B }, OOVPA_END; -// ****************************************************************** -// * DirectSound::CDirectSoundStream::SetHeadroom -// ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetHeadroom, 5558, 9, - - XRefNoSaveIndex, - XRefOne) - - XREF_ENTRY( 0x36, XREF_CDirectSoundVoice_SetHeadroom ), - - { 0x00, 0x56 }, - { 0x0C, 0x00 }, - { 0x14, 0x74 }, - { 0x21, 0xB8 }, - { 0x2A, 0x24 }, - { 0x35, 0xE8 }, - { 0x40, 0x68 }, - { 0x4B, 0x8B }, -OOVPA_END; - // ****************************************************************** // * IDirectSoundBuffer_SetHeadroom // ****************************************************************** @@ -1668,7 +1650,7 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3911, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5233, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 4134, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4134, XREF), @@ -1680,7 +1662,7 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4039, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetOutputBuffer, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4627, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4134, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 5344, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 5344, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), @@ -1722,12 +1704,12 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), REGISTER_OOVPA(CMcpxBuffer_Play2, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_Play, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 5558, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), @@ -1765,7 +1747,7 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 5558, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4134, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetFormat, 4242, PATCH), @@ -1800,7 +1782,7 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(CDirectSoundBuffer_Use3DVoiceData, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Use3DVoiceData, 5558, PATCH), REGISTER_OOVPA(CDirectSoundStream_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF), + REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index be858469e..8bd9a89d5 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -556,7 +556,6 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 5788, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), @@ -643,7 +642,7 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 5558, XREF), @@ -668,7 +667,7 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 5788, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5233, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 4134, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5558, PATCH), @@ -700,12 +699,12 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(WaveFormat_CreateXboxAdpcmFormat, 5344, XREF), REGISTER_OOVPA(XAudioCreateAdpcmFormat, 5344, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 5558, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4134, PATCH), REGISTER_OOVPA(CDirectSound_CreateSoundStream, 5558, XREF), REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), REGISTER_OOVPA(CMcpxBuffer_Play2, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_Play, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 5558, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), REGISTER_OOVPA(CMcpxVoiceClient_SetEG, 4242, XREF), REGISTER_OOVPA(CDirectSoundVoice_SetEG, 4039, XREF), REGISTER_OOVPA(CDirectSoundStream_SetEG, 4134, PATCH), @@ -726,7 +725,7 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(CDirectSoundBuffer_Use3DVoiceData, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Use3DVoiceData, 5558, PATCH), REGISTER_OOVPA(CDirectSoundStream_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF), + REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl index 2810e9945..bec1355eb 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl @@ -95,7 +95,7 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 5788, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), @@ -205,10 +205,10 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(DS_CMemoryManager_PoolAlloc, 5788, XREF), REGISTER_OOVPA(XFileCreateMediaObjectAsync, 5788, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 5558, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4134, PATCH), REGISTER_OOVPA(CMcpxBuffer_Play2, 4361, XREF), REGISTER_OOVPA(CDirectSoundBuffer_Play, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 5558, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 5558, XREF), @@ -238,9 +238,9 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(CDirectSoundBuffer_Use3DVoiceData, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Use3DVoiceData, 5558, PATCH), REGISTER_OOVPA(CDirectSoundStream_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF), + REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5233, PATCH), + REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 4134, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl index 5c5cf48b0..675c595ab 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl @@ -52,33 +52,33 @@ // * IDirectSoundStream_AddRef (Using IUnknown_AddRef) // * IDirectSoundStream_Release (Using IUnknown_Release) // * 3911 to ????: These functions does not exist until newer XDK revision -// * IDirectSound_GetOutputLevels -// * IDirectSound_SynchPlayback -// * IDirectSoundBuffer_GetVoiceProperties -// * IDirectSoundBuffer_SetFormat -// * IDirectSoundBuffer_SetDistanceFactor -// * IDirectSoundBuffer_SetDopplerFactor -// * IDirectSoundBuffer_SetRolloffFactor -// * IDirectSoundBuffer_SetRolloffCurve -// * IDirectSoundBuffer_Pause -// * IDirectSoundBuffer_PauseEx +// * IDirectSound_GetOutputLevels (Lowest found was 4361) +// * IDirectSound_SynchPlayback (Lowest found was 5344) +// * IDirectSoundBuffer_GetVoiceProperties (Lowest found was 5344) +// * IDirectSoundBuffer_SetFormat (Lowest found was 4242) +// * IDirectSoundBuffer_SetDistanceFactor (Lowest found was 4134) +// * IDirectSoundBuffer_SetDopplerFactor (Lowest found was 4134) +// * IDirectSoundBuffer_SetRolloffFactor (Lowest found was 4134) +// * IDirectSoundBuffer_SetRolloffCurve (Lowest found was 4361) +// * IDirectSoundBuffer_Pause (Lowest found was 4928) +// * IDirectSoundBuffer_PauseEx (Lowest found was 5344, could be 4928 or lower) // * IDirectSoundBuffer_SetPlayRegion (Introduce in 4039, last known earliest revision) -// * IDirectSoundStream_FlushEx -// * IDirectSoundStream_GetVoiceProperties -// * IDirectSoundStream_PauseEx -// * IDirectSoundStream_SetDistanceFactor -// * IDirectSoundStream_SetDopplerFactor -// * IDirectSoundStream_SetFormat -// * IDirectSoundStream_SetRolloffCurve -// * IDirectSoundStream_SetRolloffFactor -// * DirectSoundDumpMemoryUsage -// * DirectSoundGetSampleTime -// * DirectSoundOverrideSpeakerConfig -// * XAudioDownloadEffectsImage -// * XAudioGetSpeakerConfig -// * XAudioSetEffectData -// * DirectSoundUseFullHRTF4Channel -// * DirectSoundUseLightHRTF4Channel +// * IDirectSoundStream_FlushEx (Lowest found was 4361) +// * IDirectSoundStream_GetVoiceProperties (Lowest found was 5344) +// * IDirectSoundStream_PauseEx (Lowest found was 4361) +// * IDirectSoundStream_SetDistanceFactor (Lowest found was 4361) +// * IDirectSoundStream_SetDopplerFactor (Lowest found was 4361) +// * IDirectSoundStream_SetFormat (Lowest found was 4361) +// * IDirectSoundStream_SetRolloffCurve (Lowest found was 4361) +// * IDirectSoundStream_SetRolloffFactor (Lowest found was 4361) +// * DirectSoundDumpMemoryUsage (Lowest found was 4361) +// * DirectSoundGetSampleTime (Need verify between 4039 to 4361) +// * DirectSoundOverrideSpeakerConfig (Lowest found was 4361) +// * XAudioDownloadEffectsImage (Lowest found was 4361) +// * XGetAudioFlags (Lowest found was 3911, XAudioGetSpeakerConfig introduced later as alias, is part of Xapi section) +// * XAudioSetEffectData (Lowest found was 5344?) +// * DirectSoundUseFullHRTF4Channel (Lowest found was 5344) +// * DirectSoundUseLightHRTF4Channel (Lowest found was 5344) // * 3911 to 3936: Following separater functions has exact asm codes as whole function are... // * IDirectSoundStream_SetVolume & CDirectSoundStream_SetVolume // * IDirectSoundStream_SetPitch & CDirectSoundStream_SetPitch @@ -148,6 +148,8 @@ // * Need to review what's the difference and why is it necessary to be separated. // * It also have various revisions, we should be able to narrow it down to remove duplicates. // * 4039 CDirectSoundVoice_SetPitch need to be strengthen by using XREF to CMcpxVoiceClient_SetPitch function. +// * CMcpxStream_Flush 4134, 4242, and 4361 has only one value changed at offset 0x3F (except 4134 is off by -1 offset for the leave/return op code) +// * It is possible to re-make this into generic support for 4134 to 5849. #ifndef DSOUND_OOVPA_INL @@ -192,14 +194,14 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CMcpxBuffer_GetCurrentPosition, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CMcpxBuffer_GetStatus, XREF, 3911, 4039, 4134, 4721, 4831, 5558), REGISTER_OOVPAS(CMcpxBuffer_Pause, XREF, 4831), - REGISTER_OOVPAS(CMcpxBuffer_Play, XREF, 3911, 4361, 4721, 4831), // NOTE: ?Play@CMcpxBuffer@DirectSound@@QAEJK@Z + REGISTER_OOVPAS(CMcpxBuffer_Play, XREF, 3911, 4134, 4721, 4831), // NOTE: ?Play@CMcpxBuffer@DirectSound@@QAEJK@Z REGISTER_OOVPAS(CMcpxBuffer_Play2, XREF, 4361, 5558), // NOTE: ?Play@CMcpxBuffer@DirectSound@@QAEJ_JK@Z REGISTER_OOVPAS(CMcpxBuffer_SetBufferData, XREF, 4134, 5788), REGISTER_OOVPAS(CMcpxBuffer_SetCurrentPosition, XREF, 3911, 4039, 4134, 5558, 5788), REGISTER_OOVPAS(CMcpxBuffer_Stop, XREF, 3911, 4134, 4242), // NOTE: ?Stop@CMcpxBuffer@DirectSound@@QAEJK@Z REGISTER_OOVPAS(CMcpxBuffer_Stop2, XREF, 4361), // NOTE: ?Stop@CMcpxBuffer@DirectSound@@QAEJ_JK@Z REGISTER_OOVPAS(CMcpxStream_Discontinuity, XREF, 3911, 4039, 4134), - REGISTER_OOVPAS(CMcpxStream_Flush, XREF, 3911, 3936, 4039, 4134, 4242), + REGISTER_OOVPAS(CMcpxStream_Flush, XREF, 3911, 3936, 4039, 4134, 4242, 4361), REGISTER_OOVPAS(CMcpxStream_GetStatus, XREF, 4134), REGISTER_OOVPAS(CMcpxStream_Pause, XREF, 3911, 4039, 4134, /*4361,*/ 4831, 5788), REGISTER_OOVPAS(CSensaura3d_GetFullHRTFFilterPair, XREF, 3911, 3936), @@ -255,7 +257,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundBuffer_GetStatus, XREF, 3911, 4039, 4134, 4721), REGISTER_OOVPAS(CDirectSoundBuffer_Lock, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_Pause, XREF, 4928), - REGISTER_OOVPAS(CDirectSoundBuffer_Play, XREF, 3911, 4039, 4134, 4361, 5558, 5788), + REGISTER_OOVPAS(CDirectSoundBuffer_Play, XREF, 3911, 4039, 4134, 5558, 5788), REGISTER_OOVPAS(CDirectSoundBuffer_PlayEx, XREF, 3911, 4361, 5788), REGISTER_OOVPAS(CDirectSoundBuffer_SetAllParameters, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetBufferData, XREF, 3911, 4039, 4134, 5558, 5788), @@ -278,7 +280,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundBuffer_SetMixBins, XREF, 4039, 4134, 5558), REGISTER_OOVPAS(CDirectSoundBuffer_SetMixBinVolumes, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetMode, XREF, 4039, 4134, 5233), - REGISTER_OOVPAS(CDirectSoundBuffer_SetNotificationPositions, XREF, 3911, 4627), // Uncommenting these fixes dashboard 4920 (from 4627 comment) + REGISTER_OOVPAS(CDirectSoundBuffer_SetNotificationPositions, XREF, 3911, 4134), // Uncommenting these fixes dashboard 4920 (from 4627 comment) REGISTER_OOVPAS(CDirectSoundBuffer_SetOutputBuffer, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetPitch, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetPlayRegion, XREF, 4039, 4361, 5558), @@ -300,14 +302,14 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundStream_Process, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_Release, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetAllParameters, PATCH, 3911, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundStream_SetConeAngles, PATCH, 3911, 4039), + REGISTER_OOVPAS(CDirectSoundStream_SetConeAngles, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetConeOrientation, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetConeOutsideVolume, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetEG, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetFilter, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetFormat, PATCH, 4242), - REGISTER_OOVPAS(CDirectSoundStream_SetFrequency, PATCH, 3911, 4039, 5233), - REGISTER_OOVPAS(CDirectSoundStream_SetHeadroom, PATCH, 3911, 4627, 5558), + REGISTER_OOVPAS(CDirectSoundStream_SetFrequency, PATCH, 3911, 4039, 4134), + REGISTER_OOVPAS(CDirectSoundStream_SetHeadroom, PATCH, 3911, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetI3DL2Source, PATCH, 3911, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetLFO, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetMaxDistance, PATCH, 3911, 4039, 4134), @@ -316,7 +318,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundStream_SetMixBinVolumes_12, PATCH, 3911), //This revision is only used in XDK 3911 to 3936. REGISTER_OOVPAS(CDirectSoundStream_SetMixBinVolumes_8, PATCH, 4039), //Then it has changed in XDK 4039 and higher. REGISTER_OOVPAS(CDirectSoundStream_SetMode, PATCH, 3911, 4039, 4134), - REGISTER_OOVPAS(CDirectSoundStream_SetOutputBuffer, PATCH, 3911, 4039, 4627), + REGISTER_OOVPAS(CDirectSoundStream_SetOutputBuffer, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetPitch, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetPosition, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetRolloffCurve, XREF, 4627, 5558), @@ -342,7 +344,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSound_SetDopplerFactor, XREF, 3911, 4039, 4134, 4627, 5344, 5558, 5788), REGISTER_OOVPAS(CDirectSound_SetEffectData, XREF, 3911, 4134), REGISTER_OOVPAS(CDirectSound_SetI3DL2Listener, XREF, 3911, 4039, 4134, 5344, 5558), - REGISTER_OOVPAS(CDirectSound_SetMixBinHeadroom, XREF, 3911, 4627, 5558), + REGISTER_OOVPAS(CDirectSound_SetMixBinHeadroom, XREF, 3911, 4134, 5558), REGISTER_OOVPAS(CDirectSound_SetOrientation, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSound_SetPosition, XREF, 3911, 4039, 4134, 4627, 5344, 5558), REGISTER_OOVPAS(CDirectSound_SetRolloffFactor, XREF, 3911, 4039, 4134, 5344, 5558, 5788, 5849), @@ -353,7 +355,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(IDirectSoundBuffer_GetStatus, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_Lock, PATCH, 3911, 5558), REGISTER_OOVPAS(IDirectSoundBuffer_Pause, PATCH, 4928), - REGISTER_OOVPAS(IDirectSoundBuffer_Play, PATCH, 3911, 4361, 5558), + REGISTER_OOVPAS(IDirectSoundBuffer_Play, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_PlayEx, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_Release, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_SetAllParameters, PATCH, 3911, 4039), @@ -381,7 +383,7 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(IDirectSoundBuffer_SetNotificationPositions, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_SetOutputBuffer, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_SetPitch, PATCH, 3911, 4039), - REGISTER_OOVPAS(IDirectSoundBuffer_SetPlayRegion, PATCH, 4039, 4361), + REGISTER_OOVPAS(IDirectSoundBuffer_SetPlayRegion, PATCH, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_SetPosition, PATCH, 3911, 5558), REGISTER_OOVPAS(IDirectSoundBuffer_SetRolloffCurve, PATCH, 4627), REGISTER_OOVPAS(IDirectSoundBuffer_SetRolloffFactor, PATCH, 4134, 5788), @@ -400,8 +402,9 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(IDirectSoundStream_SetEG, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundStream_SetLFO, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundStream_SetFilter, PATCH, 3911, 4039), + REGISTER_OOVPAS(IDirectSoundStream_SetFormat, UNPATCHED, 4242), REGISTER_OOVPAS(IDirectSoundStream_SetFrequency, PATCH, 3911, 4039), - REGISTER_OOVPAS(IDirectSoundStream_SetHeadroom, PATCH, 3911), + REGISTER_OOVPAS(IDirectSoundStream_SetHeadroom, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundStream_SetI3DL2Source, UNPATCHED, 3911), //NOTE: 3911 only perform a jmp, later XDK revision may need a patch? REGISTER_OOVPAS(IDirectSoundStream_SetMaxDistance, UNPATCHED, 3911), REGISTER_OOVPAS(IDirectSoundStream_SetMinDistance, UNPATCHED, 3911), From e15e4e0d0a79709abec29db5a48730b30762e250 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Oct 2017 21:54:47 -0500 Subject: [PATCH 02/16] Removed DSound v1 Database --- build/win32/Cxbx.vcxproj.filters | 33 --- src/CxbxKrnl/HLEDataBase.cpp | 13 -- src/CxbxKrnl/HLEDataBase.h | 11 - src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl | 158 -------------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl | 143 ------------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl | 80 ------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl | 75 ------- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 203 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl | 211 ------------------- src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl | 171 --------------- src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl | 183 ---------------- src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl | 177 ---------------- src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl | 189 ----------------- src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl | 163 -------------- src/CxbxKrnl/HLEIntercept.cpp | 13 -- 15 files changed, 1823 deletions(-) diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index 2973c5f61..d54ebbd3d 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -447,39 +447,6 @@ HLEDatabase\D3D8 - - HLEDatabase\DSound - - - HLEDatabase\DSound - - - HLEDatabase\DSound - - - HLEDatabase\DSound - - - HLEDatabase\DSound - - - HLEDatabase\DSound - - - HLEDatabase\DSound - - - HLEDatabase\DSound - - - HLEDatabase\DSound - - - HLEDatabase\DSound - - - HLEDatabase\DSound - HLEDatabase\XactEng diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index 0422b219b..9ae8ba042 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -116,19 +116,6 @@ const HLEData HLEDataBase[] = HLE_ENTRY(Lib_D3D8, D3D8, 5788), HLE_ENTRY(Lib_D3D8, D3D8, 5849), #endif -#if ENABLE_LEGACY_DSOUND_DB - HLE_ENTRY(Lib_DSOUND, DSound, 3936), - HLE_ENTRY(Lib_DSOUND, DSound, 4134), - HLE_ENTRY(Lib_DSOUND, DSound, 4361), - HLE_ENTRY(Lib_DSOUND, DSound, 4432), - HLE_ENTRY(Lib_DSOUND, DSound, 4627), - HLE_ENTRY(Lib_DSOUND, DSound, 5028), - HLE_ENTRY(Lib_DSOUND, DSound, 5233), - HLE_ENTRY(Lib_DSOUND, DSound, 5344), - HLE_ENTRY(Lib_DSOUND, DSound, 5558), - HLE_ENTRY(Lib_DSOUND, DSound, 5788), - HLE_ENTRY(Lib_DSOUND, DSound, 5849), -#endif #if ENABLE_LEGACY_XACTENG_DB HLE_ENTRY(Lib_XACTENG, XactEng, 4627), HLE_ENTRY(Lib_XACTENG, XactEng, 4928), diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h index 01a1a838b..40572a103 100644 --- a/src/CxbxKrnl/HLEDataBase.h +++ b/src/CxbxKrnl/HLEDataBase.h @@ -60,17 +60,6 @@ #include "HLEDataBase/D3D8.1.0.5558.h" #include "HLEDataBase/D3D8.1.0.5788.h" #include "HLEDataBase/D3D8.1.0.5849.h" -#include "HLEDataBase/DSound.1.0.3936.h" -#include "HLEDataBase/DSound.1.0.4134.h" -#include "HLEDataBase/DSound.1.0.4361.h" -#include "HLEDataBase/DSound.1.0.4432.h" -#include "HLEDataBase/DSound.1.0.4627.h" -#include "HLEDataBase/DSound.1.0.5028.h" -#include "HLEDataBase/DSound.1.0.5233.h" -#include "HLEDataBase/DSound.1.0.5344.h" -#include "HLEDataBase/DSound.1.0.5558.h" -#include "HLEDataBase/DSound.1.0.5788.h" -#include "HLEDataBase/DSound.1.0.5849.h" #include "HLEDataBase/XG.1.0.3911.h" #include "HLEDataBase/XG.1.0.4034.h" #include "HLEDataBase/XG.1.0.4361.h" diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl index f8a5f1398..4f1349cab 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl @@ -4059,161 +4059,3 @@ OOVPA_XREF(CSensaura3d_GetLiteHRTFFilterPair, 3936, 10, { 0x38, 0x10 }, { 0x39, 0x00 }, OOVPA_END; - -// ****************************************************************** -// * DSound_3936 -// ****************************************************************** -OOVPATable DSound_3936[] = { - - REGISTER_OOVPA(DirectSoundCreate, 3911, PATCH), - REGISTER_OOVPA(CMcpxAPU_ServiceDeferredCommandsLow, 3911, XREF), - REGISTER_OOVPA(CDirectSound_DoWork, 3911, XREF), - REGISTER_OOVPA(DirectSoundDoWork, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 3911, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 3911, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetPitch, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 3911, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 3911, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_Lock, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetMixBins, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 3911, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 3911, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play, 3911, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetConeAngles, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_Set3dConeOutsideVolume, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOutsideVolume, 3911, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetConeOutsideVolume, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_Set3dParameters, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 3911, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetAllParameters, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_Set3dMaxDistance, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 3911, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundStream_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_Set3dMinDistance, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 3911, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundStream_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_Set3dVelocity, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 3911, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundStream_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_Set3dConeOrientation, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOrientation, 3911, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetConeOrientation, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundStream_SetConeOrientation, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_Set3dPosition, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 3911, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetPosition, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundStream_SetPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 3911, PATCH), - REGISTER_OOVPA(XAudioCalculatePitch, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 3911, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_Set3dMode, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), - REGISTER_OOVPA(CMcpxAPU_Commit3dSettings, 3911, XREF), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 3911, XREF), - REGISTER_OOVPA(IDirectSound_CommitDeferredSettings, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(CMcpxAPU_Set3dDistanceFactor, 3911, XREF), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 3911, XREF), - REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3911, PATCH), - REGISTER_OOVPA(CMcpxAPU_Set3dRolloffFactor, 3911, XREF), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 3911, XREF), - REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 3911, PATCH), - REGISTER_OOVPA(CMcpxAPU_SetMixBinHeadroom, 3911, XREF), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 3911, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 3911, PATCH), - REGISTER_OOVPA(CMcpxAPU_Set3dPosition, 3911, XREF), - REGISTER_OOVPA(CDirectSound_SetPosition, 3911, XREF), - REGISTER_OOVPA(IDirectSound_SetPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxAPU_Set3dVelocity, 3911, XREF), - REGISTER_OOVPA(CDirectSound_SetVelocity, 3911, XREF), - REGISTER_OOVPA(IDirectSound_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CMcpxAPU_Set3dParameters, 3911, XREF), - REGISTER_OOVPA(CDirectSound_SetAllParameters, 3911, XREF), - REGISTER_OOVPA(IDirectSound_SetAllParameters, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMode, 3911, PATCH), - REGISTER_OOVPA(CMcpxAPU_Set3dDopplerFactor, 3911, XREF), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 3911, XREF), - REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3911, PATCH), - REGISTER_OOVPA(CSensaura3d_GetFullHRTFFilterPair, 3911, XREF), - REGISTER_OOVPA(CSensaura3d_GetFullHRTFFilterPair, 3936, XREF), - REGISTER_OOVPA(DirectSoundUseFullHRTF, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetCaps, 3911, XREF), - REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 3911, PATCH), - REGISTER_OOVPA(DirectSoundEnterCriticalSection, 3911, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(DirectSoundGetSampleTime, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_Commit3dSettings, 3911, XREF), - REGISTER_OOVPA(CMcpxVoiceClient_SetI3DL2Source, 3911, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 3911, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetI3DL2Source, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes_12, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 3911, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_EnableHeadphones, 3911, XREF), - REGISTER_OOVPA(IDirectSound_EnableHeadphones, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes_12, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_Pause, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 3911, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOutsideVolume, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_3936_SIZE -// ****************************************************************** -uint32 DSound_3936_SIZE = sizeof(DSound_3936); diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index 1f4df842e..0c248541a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -3835,146 +3835,3 @@ OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 11, { 0x4E, 0xC2 }, { 0x4F, 0x10 }, OOVPA_END; - -// ****************************************************************** -// * DSound_4134 -// ****************************************************************** -OOVPATable DSound_4134[] = { - - REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateStream, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 4039, PATCH), - REGISTER_OOVPA(IDirectSound_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_SetAllParameters, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), - REGISTER_OOVPA(CDirectSound_SetPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetPosition, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_Lock, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMaxDistance, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMinDistance, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 4134, XREF), // s+ - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetRolloffFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOrientation, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetConeOrientation, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOutsideVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOutsideVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetConeOutsideVolume, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPosition, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVelocity, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetI3DL2Source, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetAllParameters, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMode, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMode, 4134, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetFilter, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4039, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(CDirectSound_SetEffectData, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetEffectData, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_4134_SIZE -// ****************************************************************** -uint32 DSound_4134_SIZE = sizeof(DSound_4134); diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index 9ed876447..c6fad850f 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -671,83 +671,3 @@ OOVPA_XREF(CMcpxStream_Flush, 4361, 10, { 0xD1, 0xC9 }, { 0xD2, 0xC3 }, OOVPA_END; - -// ****************************************************************** -// * DSound_4361 -// ****************************************************************** -OOVPATable DSound_4361[] = { - - REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 4134, PATCH), - REGISTER_OOVPA(DirectSoundGetSampleTime, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateStream, 4134, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4134, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF), - REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(CMcpxBuffer_Play2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4242, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFormat, 4242, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetLFO, 4134, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetEG, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetEG, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetEG, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_4361_SIZE -// ****************************************************************** -uint32 DSound_4361_SIZE = sizeof(DSound_4361); diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl index 6aa848d93..2090e20b5 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl @@ -110,78 +110,3 @@ OOVPA_XREF(CDirectSoundVoiceSettings_SetMixBins, 4432, 10, { 0xB3, 0x04 }, OOVPA_END; #endif - -// ****************************************************************** -// * DSound_4432 -// ****************************************************************** -OOVPATable DSound_4432[] = { - - REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 4134, PATCH), - REGISTER_OOVPA(DirectSoundGetSampleTime, 4361, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4134, XREF), - REGISTER_OOVPA(DirectSoundCreateStream, 4134, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4134, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CommitDeferredSettings, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), - REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetLFO, 4134, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetEG, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetEG, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetEG, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_4432_SIZE -// ****************************************************************** -uint32 DSound_4432_SIZE = sizeof(DSound_4432); diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 24c1b56cf..251736b58 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -1397,206 +1397,3 @@ OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 4627, 12, { 0x31, 0x0C }, { 0x32, 0x00 } OOVPA_END; - -// ****************************************************************** -// * DSound_4627 -// ****************************************************************** -OOVPATable DSound_4627[] = { - - REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 4134, PATCH), - REGISTER_OOVPA(DirectSoundGetSampleTime, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 4039, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetAllParametersA, 4627, XREF), - REGISTER_OOVPA(CDirectSound_SetAllParametersA, 4721, XREF), - REGISTER_OOVPA(CDirectSound_SetAllParametersA, 4831, XREF), - REGISTER_OOVPA(CDirectSound_SetAllParameters, 4831, XREF), - REGISTER_OOVPA(IDirectSound_SetAllParameters, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(CDirectSound_SetPosition, 4627, XREF), - REGISTER_OOVPA(CDirectSound_SetPosition, 4134, XREF), // TODO: Find a cure for laziness... - REGISTER_OOVPA(IDirectSound_SetPosition, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateBuffer, 4242, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_Lock, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateStream, 4134, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 4134, XREF), - REGISTER_OOVPA(CMcpxStream_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4721, XREF), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4721, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetSpeakerConfig, 4627, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF), - REGISTER_OOVPA(CMcpxBuffer_Play, 4721, XREF), - REGISTER_OOVPA(CMcpxBuffer_Play, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 4134, XREF), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CommitDeferredSettings, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 4134, XREF), // s+ - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOrientation, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOutsideVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOutsideVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4039, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4721, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(CDirectSound_EnableHeadphones, 4627, XREF), - REGISTER_OOVPA(IDirectSound_EnableHeadphones, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetOutputLevels, 4627, XREF), - REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Pause, 4928, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4721, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 4134, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetEG, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetEG, 4039, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetEG, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_FlushEx, 4627, XREF), - REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), - REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMode, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 4039, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetFilter, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4039, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetOutputBuffer, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), - REGISTER_OOVPA(XFileCreateMediaObjectEx, 4627, PATCH), - REGISTER_OOVPA(XWaveFileCreateMediaObject, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), // Uncommenting these fixes dashboard 4920 - REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetLFO, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), - REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_4627_SIZE -// ****************************************************************** -uint32 DSound_4627_SIZE = sizeof(DSound_4627); diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl index 34d050d67..01f7f8f06 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl @@ -46,214 +46,3 @@ OOVPA_NO_XREF(XFileCreateMediaObjectEx, 5028, 8) { 0xAC, 0x0C }, { 0xAD, 0x57 }, OOVPA_END; - -// ****************************************************************** -// * DSound_5028 -// ****************************************************************** -OOVPATable DSound_5028[] = { - - REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 4134, PATCH), - REGISTER_OOVPA(DirectSoundGetSampleTime, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 4039, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetAllParametersA, 4627, XREF), - REGISTER_OOVPA(CDirectSound_SetAllParametersA, 4721, XREF), - REGISTER_OOVPA(CDirectSound_SetAllParametersA, 4831, XREF), - REGISTER_OOVPA(CDirectSound_SetAllParameters, 4831, XREF), - REGISTER_OOVPA(IDirectSound_SetAllParameters, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(CDirectSound_SetPosition, 4627, XREF), - REGISTER_OOVPA(CDirectSound_SetPosition, 4134, XREF), // TODO: Find a cure for laziness... - REGISTER_OOVPA(IDirectSound_SetPosition, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateBuffer, 4242, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_Lock, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateStream, 4134, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 4134, XREF), - REGISTER_OOVPA(CMcpxStream_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4721, XREF), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetSpeakerConfig, 4627, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF), - REGISTER_OOVPA(CMcpxBuffer_Play, 4721, XREF), - REGISTER_OOVPA(CMcpxBuffer_Play, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 4134, XREF), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CommitDeferredSettings, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMaxDistance, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMinDistance, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 4134, XREF), // s+ - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetRolloffFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOrientation, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetConeOrientation, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOutsideVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOutsideVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetConeOutsideVolume, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPosition, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVelocity, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetI3DL2Source, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4721, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSound_EnableHeadphones, 4627, XREF), - REGISTER_OOVPA(IDirectSound_EnableHeadphones, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetOutputLevels, 4627, XREF), - REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetAllParameters, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Pause, 4928, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4721, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 4134, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetEG, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetEG, 4039, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetEG, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_FlushEx, 4627, XREF), - REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), - REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMode, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMode, 4134, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetFilter, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4039, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetOutputBuffer, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), - REGISTER_OOVPA(XFileCreateMediaObjectEx, 5028, PATCH), - REGISTER_OOVPA(XWaveFileCreateMediaObject, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetLFO, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), - REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_5028_SIZE -// ****************************************************************** -uint32 DSound_5028_SIZE = sizeof(DSound_5028); diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index d9da28d2c..4ae338d09 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -335,174 +335,3 @@ OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 5233, 8, { 0x3E, 0x33 }, OOVPA_END; #endif -// ****************************************************************** -// * DSound_5233 -// ****************************************************************** -OOVPATable DSound_5233[] = { - REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 4134, PATCH), - REGISTER_OOVPA(DirectSoundGetSampleTime, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(CMcpxAPU_SynchPlayback, 5233, XREF), - REGISTER_OOVPA(CDirectSound_SynchPlayback, 5233, XREF), - REGISTER_OOVPA(IDirectSound_SynchPlayback, 5233, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Pause, 4928, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetPosition, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetPosition, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateBuffer, 4242, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 4134, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_Lock, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateStream, 4134, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_FlushEx, 5233, XREF), - REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_EnableHeadphones, 5233, XREF), - REGISTER_OOVPA(IDirectSound_EnableHeadphones, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 4627, XREF), - REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 4134, XREF), - REGISTER_OOVPA(IDirectSound_CommitDeferredSettings, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4039, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), // (This is actually the XREF we are using) - REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4721, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMode, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 4627, XREF), - REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4039, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetEG, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetEG, 4039, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetEG, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFilter, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetOutputLevels, 4627, XREF), - REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetOutputBuffer, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOutsideVolume, 4039, PATCH), - - REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), - REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetConeOrientation, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), - REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_5233_SIZE -// ****************************************************************** -uint32 DSound_5233_SIZE = sizeof(DSound_5233); diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl index d7660f686..b9af744fd 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl @@ -876,186 +876,3 @@ OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 5344, 8, { 0x50, 0x14 }, { 0x51, 0x00 } OOVPA_END; - -// ****************************************************************** -// * DSound_5344 -// ****************************************************************** -OOVPATable DSound_5344[] = { - - REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 4134, PATCH), - REGISTER_OOVPA(DirectSoundGetSampleTime, 4361, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(CMcpxAPU_SynchPlayback, 5233, XREF), - REGISTER_OOVPA(CDirectSound_SynchPlayback, 5344, XREF), - REGISTER_OOVPA(IDirectSound_SynchPlayback, 5233, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Pause, 4928, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 5344, XREF), - REGISTER_OOVPA(IDirectSound_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 5344, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetPosition, 5344, XREF), - REGISTER_OOVPA(IDirectSound_SetPosition, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateBuffer, 4242, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 4134, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_Lock, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4134, XREF), - REGISTER_OOVPA(DirectSoundCreateStream, 4134, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_FlushEx, 5233, XREF), - REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_EnableHeadphones, 5344, XREF), - REGISTER_OOVPA(IDirectSound_EnableHeadphones, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 5344, XREF), - REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 5344, XREF), - REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 5344, XREF), - REGISTER_OOVPA(IDirectSound_CommitDeferredSettings, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 5344, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetMinDistance, 5344, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4039, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4721, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMode, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 5344, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 5344, XREF), - REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 3911, PATCH), // Was 4134 - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 4627, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 5344, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5344, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4039, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetEG, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetEG, 4039, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetEG, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4039, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetFilter, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetOutputLevels, 4627, XREF), - REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH), - REGISTER_OOVPA(IDirectSound_SetEffectData, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetOutputBuffer, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOutsideVolume, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOutsideVolume, 4039, PATCH), - REGISTER_OOVPA(WaveFormat_CreateXboxAdpcmFormat, 5344, XREF), - REGISTER_OOVPA(XAudioCreateAdpcmFormat, 5344, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), - REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeOrientation, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetConeOrientation, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), - REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_5344_SIZE -// ****************************************************************** -uint32 DSound_5344_SIZE = sizeof(DSound_5344); diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index 2fe599eaf..eab51a3ea 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -1621,180 +1621,3 @@ OOVPA_XREF(CDirectSoundStream_Use3DVoiceData, 5558, 9, { 0x4D, 0xC2 }, { 0x4E, 0x08 }, OOVPA_END; - -// ****************************************************************** -// * DSound_5558 -// ****************************************************************** -OOVPATable DSound_5558[] = { - - REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(CDirectSound_SynchPlayback, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SynchPlayback, 5233, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 5558, XREF), - REGISTER_OOVPA(IDirectSound_CommitDeferredSettings, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 5558, XREF), - REGISTER_OOVPA(CDirectSoundStream_FlushEx, 5233, XREF), - REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), - REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4134, XREF), - REGISTER_OOVPA(DirectSoundCreateStream, 4134, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetOutputBuffer, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 5344, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetRolloffCurve, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5558, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(CFullHRTFSource_GetCenterVolume, 5558, XREF), - REGISTER_OOVPA(CHRTFSource_SetFullHRTF5Channel, 5558, XREF), - REGISTER_OOVPA(DirectSoundUseFullHRTF, 4134, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 5558, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 5558, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play2, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), - REGISTER_OOVPA(WaveFormat_CreateXboxAdpcmFormat, 5344, XREF), - REGISTER_OOVPA(XAudioCreateAdpcmFormat, 5344, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetRolloffCurve, 5558, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_CommitDeferredSettings, 5558, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), // (This is actually the XREF we are using) - REGISTER_OOVPA(DirectSoundCreateBuffer, 4242, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_EnableHeadphones, 5558, XREF), - REGISTER_OOVPA(IDirectSound_EnableHeadphones, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetOutputLevels, 5558, XREF), - REGISTER_OOVPA(IDirectSound_GetOutputLevels, 5558, PATCH), - REGISTER_OOVPA(XAudioDownloadEffectsImage, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_SetPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetVelocity, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 5558, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetEG, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetEG, 4039, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetEG, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4039, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetAllParameters, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetFilter, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Use3DVoiceData, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundStream_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), - REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_5558_SIZE -// ****************************************************************** -uint32 DSound_5558_SIZE = sizeof(DSound_5558); diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index 8bd9a89d5..dd52f36bd 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -548,192 +548,3 @@ OOVPA_END; #define CDirectSoundBuffer_SetBufferData_5788 CDirectSoundBuffer_SetBufferData_4134 #define IDirectSoundBuffer_SetBufferData_5788 IDirectSoundBuffer_SetBufferData_4134 #define XAudioDownloadEffectsImage_5788 XAudioDownloadEffectsImage_4627 - -// ****************************************************************** -// * DSound_5788 -// ****************************************************************** -OOVPATable DSound_5788[] = { - - REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 5788, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffCurve, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffCurve, 4627, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetRolloffCurve, 5558, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffCurve, 4627, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF), - REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(CFullHRTFSource_GetCenterVolume, 5558, XREF), - REGISTER_OOVPA(CHRTFSource_SetFullHRTF5Channel, 5558, XREF), - REGISTER_OOVPA(DirectSoundUseFullHRTF, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 5558, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_SetPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetVelocity, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDistanceFactor, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDistanceFactor, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 5788, XREF), - REGISTER_OOVPA(IDirectSound_CommitDeferredSettings, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateBuffer, 4242, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 5788, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetLFO, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetLFO, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 5788, XREF), - REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 5788, XREF), - REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 5233, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), // This is actually the XREF we are using - REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 5788, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 5788, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 5558, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Pause, 4928, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), - REGISTER_OOVPA(DirectSoundCreateStream, 5788, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 5788, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundStream_FlushEx, 5788, XREF), - REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SynchPlayback, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_EnableHeadphones, 5558, XREF), - REGISTER_OOVPA(IDirectSound_EnableHeadphones, 3911, PATCH), - REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_GetOutputLevels, 5558, XREF), - REGISTER_OOVPA(CDirectSound_GetOutputLevels, 5558, XREF), - REGISTER_OOVPA(IDirectSound_GetOutputLevels, 5558, PATCH), - REGISTER_OOVPA(IDirectSound_SetEffectData, 3911, PATCH), - REGISTER_OOVPA(DS_CMemoryManager_PoolAlloc, 5788, XREF), - REGISTER_OOVPA(XFileCreateMediaObjectAsync, 5788, PATCH), - REGISTER_OOVPA(WaveFormat_CreateXboxAdpcmFormat, 5344, XREF), - REGISTER_OOVPA(XAudioCreateAdpcmFormat, 5344, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 5558, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play2, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetEG, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetEG, 4039, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetEG, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4039, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetAllParameters, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetFilter, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMode, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Use3DVoiceData, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundStream_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), - REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_5788_SIZE -// ****************************************************************** -uint32 DSound_5788_SIZE = sizeof(DSound_5788); diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl index bec1355eb..e5f9c5a5a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl @@ -87,166 +87,3 @@ OOVPA_XREF(CDirectSoundStream_SetPitch, 5849, 12, { 0x51, 0x00 }, OOVPA_END; #endif -// ****************************************************************** -// * DSound_5849 -// ****************************************************************** -OOVPATable DSound_5849[] = { - - REGISTER_OOVPA(DirectSoundCreate, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4039, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 5788, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetBufferData, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_GetStatus, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_GetStatus, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes_8, 4039, PATCH), - REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4039, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetVolume, 4134, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVolume, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), - REGISTER_OOVPA(IDirectSound_Release, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetOrientation, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetOrientation, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMaxDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMaxDistance, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMinDistance, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF), - REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 5558, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMixBins, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetMixBins, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SetMixBinHeadroom, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_SetPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetVelocity, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetVelocity, 5558, PATCH), - REGISTER_OOVPA(CDirectSound_CommitDeferredSettings, 5788, XREF), - REGISTER_OOVPA(IDirectSound_CommitDeferredSettings, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateBuffer, 4242, PATCH), - REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 5788, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetCurrentPosition, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_GetCurrentPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetRolloffFactor, 5849, XREF), - REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDopplerFactor, 5788, XREF), - REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF), - REGISTER_OOVPA(CMcpxBuffer_Play2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 5788, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 5788, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetPosition, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetPosition, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetPosition, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetVelocity, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetVelocity, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetVelocity, 5558, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Pause, 4831, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Pause, 4928, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), - REGISTER_OOVPA(CDirectSound_CreateSoundStream, 5558, XREF), - REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), - REGISTER_OOVPA(DirectSoundCreateStream, 5788, PATCH), - REGISTER_OOVPA(CMcpxStream_Pause, 5788, XREF), - REGISTER_OOVPA(CDirectSoundStream_Pause, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundStream_FlushEx, 5788, XREF), - REGISTER_OOVPA(IDirectSoundStream_FlushEx, 4627, PATCH), - REGISTER_OOVPA(DirectSoundDoWork, 4134, PATCH), - REGISTER_OOVPA(CDirectSound_SynchPlayback, 5558, PATCH), - REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(CDirectSound_SetEffectData, 4134, XREF), - REGISTER_OOVPA(IDirectSound_SetEffectData, 3911, PATCH), - REGISTER_OOVPA(DS_CMemoryManager_PoolAlloc, 5788, XREF), - REGISTER_OOVPA(XFileCreateMediaObjectAsync, 5788, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFormat, 4242, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetHeadroom, 4134, PATCH), - REGISTER_OOVPA(CMcpxBuffer_Play2, 4361, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Play, 5788, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Play, 3911, PATCH), - REGISTER_OOVPA(IDirectSound_AddRef, 3911, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(IDirectSound_SetAllParameters, 3911, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetFilter, 4039, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetFilter, 4134, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetFilter, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4039, PATCH), - REGISTER_OOVPA(CMcpxVoiceClient_SetEG, 4242, XREF), - REGISTER_OOVPA(CDirectSoundVoice_SetEG, 4039, XREF), - REGISTER_OOVPA(CDirectSoundStream_SetEG, 4134, PATCH), - REGISTER_OOVPA(CDirectSoundBuffer_SetEG, 4242, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetEG, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetMode, 5344, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetMode, 5233, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetMode, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), - REGISTER_OOVPA(CDirectSoundVoice_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_Use3DVoiceData, 5558, PATCH), - REGISTER_OOVPA(CDirectSoundStream_Use3DVoiceData, 5558, XREF), - REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 3911, PATCH), - REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 4134, PATCH), - REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH), - REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF), - REGISTER_OOVPA(IDirectSound_GetCaps, 3911, PATCH), -}; - -// ****************************************************************** -// * DSound_5849_SIZE -// ****************************************************************** -uint32 DSound_5849_SIZE = sizeof(DSound_5849); diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp index 3320b437e..8788ea1fc 100644 --- a/src/CxbxKrnl/HLEIntercept.cpp +++ b/src/CxbxKrnl/HLEIntercept.cpp @@ -351,19 +351,6 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) // Skip scanning for DSOUND symbols when LLE APU is selected if (bLLE_APU) continue; - -#if ENABLE_LEGACY_DSOUND_DB - // Several 3911 titles has different DSound builds. - if (BuildVersion < 4034) { - BuildVersion = 3936; - } - - // Redirect other highly similar DSOUND library versions - if (BuildVersion == 4361 || BuildVersion == 4400 || BuildVersion == 4432 || - BuildVersion == 4531) - BuildVersion = 4627; -#endif - } if (strcmp(LibraryName.c_str(), Lib_XAPILIB) == 0) { From 13c128d92276555571c1a072a715f974b78fb36a Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Oct 2017 22:11:29 -0500 Subject: [PATCH 03/16] Append Previous Commit --- build/win32/Cxbx.vcxproj | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index 0a4ab05c6..e2058b41c 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -245,17 +245,6 @@ $(SOLUTIONDIR)Export.bat - - - - - - - - - - - From 159e6d6a73b61b003aefa137f594c6443d6db5de Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Oct 2017 22:16:35 -0500 Subject: [PATCH 04/16] Removed D3D8 v1 Database --- build/win32/Cxbx.vcxproj | 14 -- build/win32/Cxbx.vcxproj.filters | 42 ---- src/CxbxKrnl/HLEDataBase.cpp | 14 -- src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl | 203 ---------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl | 211 ----------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl | 209 ----------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl | 204 ---------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl | 208 ----------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl | 240 ------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl | 230 ------------------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl | 223 ------------------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl | 223 ------------------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl | 243 ------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl | 220 ------------------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl | 215 ----------------- src/CxbxKrnl/HLEIntercept.cpp | 257 +++------------------ 16 files changed, 27 insertions(+), 2929 deletions(-) diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index e2058b41c..0a28c051b 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -231,20 +231,6 @@ $(SOLUTIONDIR)Export.bat - - - - - - - - - - - - - - diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index d54ebbd3d..030e36c96 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -405,48 +405,6 @@ Shared - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - - - HLEDatabase\D3D8 - HLEDatabase\XactEng diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index 9ae8ba042..896475160 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -102,20 +102,6 @@ const HLEData HLEDataBase[] = HLE_ENTRY(Lib_XAPILIB, XAPI, 5788), HLE_ENTRY(Lib_XAPILIB, XAPI, 5849), #endif -#if ENABLE_LEGACY_D3D8_DB - HLE_ENTRY(Lib_D3D8, D3D8, 3925), - HLE_ENTRY(Lib_D3D8, D3D8, 4034), - HLE_ENTRY(Lib_D3D8, D3D8, 4134), - HLE_ENTRY(Lib_D3D8, D3D8, 4361), - HLE_ENTRY(Lib_D3D8, D3D8, 4432), - HLE_ENTRY(Lib_D3D8, D3D8, 4627), - HLE_ENTRY(Lib_D3D8, D3D8, 5028), - HLE_ENTRY(Lib_D3D8, D3D8, 5233), - HLE_ENTRY(Lib_D3D8, D3D8, 5344), - HLE_ENTRY(Lib_D3D8, D3D8, 5558), - HLE_ENTRY(Lib_D3D8, D3D8, 5788), - HLE_ENTRY(Lib_D3D8, D3D8, 5849), -#endif #if ENABLE_LEGACY_XACTENG_DB HLE_ENTRY(Lib_XACTENG, XactEng, 4627), HLE_ENTRY(Lib_XACTENG, XactEng, 4928), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl index 7aa1ea9b1..dc15b0eee 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl @@ -4777,206 +4777,3 @@ OOVPA_NO_XREF(D3DDevice_UpdateOverlay, 3911, 11) { 0x87, 0xE1 }, OOVPA_END; #endif - -// ****************************************************************** -// * D3D8_3925 -// ****************************************************************** -// No longer supported XDK 3948 by HLEDB_v1 -OOVPATable D3D8_3925[] = { - - REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetViewport, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_End, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Present, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 3911, PATCH), - REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(D3DResource_GetType, 3911, DISABLED), // Probably not even necessary... - REGISTER_OOVPA(D3D_AllocContiguousMemory, 3911, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH - REGISTER_OOVPA(D3DDevice_SetRenderState_Deferred, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - // REGISTER_OOVPA(D3DDevice_SetRenderTarget, 3948, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(XMETAL_StartPush, 3911, DISABLED), - REGISTER_OOVPA(D3D_SetFence, 3911, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3D_SetCommonDebugRegisters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 3911, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 3911, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 3911, PATCH), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTile, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 3911, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 3911, PATCH), - REGISTER_OOVPA(CMiniport_InitHardware, 3911, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 3911, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetStateUP, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetStateVB, 3911, DISABLED), - REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), -}; - -// ****************************************************************** -// * D3D8_3925_SIZE -// ****************************************************************** -uint32 D3D8_3925_SIZE = sizeof(D3D8_3925); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl index 4c1f0ac3d..15c7984e8 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl @@ -2595,214 +2595,3 @@ OOVPA_NO_XREF(D3DDevice_AddRef, 4039, 10) { 0x0E, 0xB4 }, { 0x0F, 0x05 }, OOVPA_END; - -// ****************************************************************** -// * D3D8_4034 -// ****************************************************************** -OOVPATable D3D8_4034[] = { - - REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - - // ****************************************************************** - // Tested on version 4039, The Simpsons - Road Rage (PAL) 4039 etc - // TODO: This needs to be verified on 4034 - // ****************************************************************** - REGISTER_OOVPA(D3DDevice_GetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 4034, PATCH), - REGISTER_OOVPA(D3D_SetFence, 4034, XREF), - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 4034, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTile, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4034, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - // ****************************************************************** - - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_GetType, 4034, PATCH), - REGISTER_OOVPA(D3D_AllocContiguousMemory, 3911, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH - REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 3911, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePatch, 3911, DISABLED), // (TODO) - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), // TODO: Unused? - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), - REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4034, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_AddRef, 4039, PATCH), - - // ****************************************************************** - // Provisional registration functions in XDK 4034 - // TODO: Need test cases - // ****************************************************************** -// REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_Present, 3911, PATCH), - REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), -// REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_InsertCallback, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), -// REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_SetModelView, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * D3D8_4034_SIZE -// ****************************************************************** -uint32 D3D8_4034_SIZE = sizeof(D3D8_4034); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl index 2a4282dab..f7f418017 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl @@ -2861,212 +2861,3 @@ OOVPA_END; // ****************************************************************** #define D3DDevice_BeginVisibilityTest_4134 D3DDevice_BeginVisibilityTest_3925 #define D3DDevice_EndVisibilityTest_4134 D3DDevice_EndVisibilityTest_3925 - -// ****************************************************************** -// * D3D8_4134 -// ****************************************************************** -OOVPATable D3D8_4134[] = { - - REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - - REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Present, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), // Just calls Lock3DSurface - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), // Just calls Lock2DSurface - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 4034, PATCH), - REGISTER_OOVPA(D3D_CreateStandAloneSurface, 4034, XREF), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4034, PATCH), - REGISTER_OOVPA(D3D_SetFence, 4134, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTile, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4134, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 3911, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 4039, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4134, PATCH), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - - // ****************************************************************** - // Provisional registration functions in XDK 4134 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), -// REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * D3D8_4134_SIZE -// ****************************************************************** -uint32 D3D8_4134_SIZE = sizeof(D3D8_4134); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl index 73048fb91..fa50e9de2 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl @@ -1223,207 +1223,3 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShaderInputDirect, 4361, 13) { 0x29, 0x5E }, { 0x32, 0xE9 }, OOVPA_END; - -// ****************************************************************** -// * D3D8_4361 -// ****************************************************************** -OOVPATable D3D8_4361[] = { - - REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - - REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 4242, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4242, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4242, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED), // TODO: This needs to be verified on 4361, not just 4242! - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4034, PATCH), - REGISTER_OOVPA(D3D_SetFence, 4134, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4242, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTile, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4242, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 3911, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), // Just calls Lock3DSurface - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), // Just calls Lock2DSurface - REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), - REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 4034, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), -}; - -// ****************************************************************** -// * D3D8_4361_SIZE -// ****************************************************************** -uint32 D3D8_4361_SIZE = sizeof(D3D8_4361); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl index 8c0c12d7b..34c23ce4b 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl @@ -699,211 +699,3 @@ OOVPA_NO_XREF(D3DDevice_SetDepthClipPlanes, 4432, 15) { 0x18, 0x8B }, { 0x1F, 0x0C }, OOVPA_END; - -// ****************************************************************** -// * D3D8_4432 -// ****************************************************************** -// No longer supported XDK 4531 by HLEDB_v1 -OOVPATable D3D8_4432[] { - - REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - - REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 4242, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4034, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4242, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH), - // REGISTER_OOVPA(D3DDevice_Swap, 4531, PATCH), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH), - REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - // REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4531, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4034, PATCH), - REGISTER_OOVPA(D3D_SetFence, 4134, XREF), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH), - // REGISTER_OOVPA(D3DVertexBuffer_Lock, 4531, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),// Just calls Lock2DSurface - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), - REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_SetTile, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 4034, PATCH), - REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - - // ****************************************************************** - // Provisional registration functions in XDK 4432 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * D3D8_4432_SIZE -// ****************************************************************** -uint32 D3D8_4432_SIZE = sizeof(D3D8_4432); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl index 52a197de6..bafc365d8 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl @@ -3740,243 +3740,3 @@ OOVPA_XREF(IDirect3DVertexBuffer8_Lock, 4627, 11, { 0x0C, 0x54 }, { 0x0D, 0x24 }, OOVPA_END; - -// ****************************************************************** -// * D3D8_4627 -// ****************************************************************** -// No longer supported XDK 4831 to 4928 by HLEDB_v1 -OOVPATable D3D8_4627[] = { - - REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3D_CreateDeviceX, 4627, DISABLED), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4627, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPush, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4627, DISABLED), // Called D3DDevice_GetBackBuffer2 - REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), - REGISTER_OOVPA(D3D_CommonSetRenderTarget, 4627, XREF), - REGISTER_OOVPA(D3D_CommonSetRenderTargetB, 4627, XREF), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4627, DISABLED), // Called D3DDevice_GetRenderTarget2 - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 4627, DISABLED), // Called D3DDevice_GetDepthStencilSurface2 - REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), - REGISTER_OOVPA(D3D_SetTileNoWait, 4627, XREF), - REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 4627, PATCH), - // REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 4627, DISABLED), // Called D3DDevice_CreateTexture2 - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), - // REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 4531, PATCH), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 4627, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DResource_GetType, 4034, DISABLED), - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3D_SetFence, 4134, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 4531, PATCH), - // REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), // Beware of the typo... - REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetStateVB, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_SetStateUP, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 4627, PATCH), - // REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 4627, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), // Just calls Lock3DSurface - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH),//TODO 4721,4928 - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4627, PATCH), // Called D3DCubeTexture_GetCubeMapSurface2 - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette, 4627, PATCH), // Called D3DDevice_CreatePalette2 - REGISTER_OOVPA(D3DPalette_Lock, 4531, PATCH), - REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DPalette_Lock, 4627, PATCH), // Called D3DPalette_Lock2 - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), - // REGISTER_OOVPA(D3DDevice_GetPersistedSurface2, 4928, PATCH), // For only on Unreal Championship - REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_KickPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4627, PATCH), - REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(CMiniport_IsFlipPending, 4627, XREF), - REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH),//TODO 4831 - REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 4039, PATCH), -}; - -// ****************************************************************** -// * D3D8_4627_SIZE -// ****************************************************************** -uint32 D3D8_4627_SIZE = sizeof(D3D8_4627); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl index e8d276494..9064cd3cc 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl @@ -1241,233 +1241,3 @@ OOVPA_END; // * Rollback support signature(s) // ****************************************************************** #define D3DDevice_Begin_5028 D3DDevice_Begin_4361 - -// ****************************************************************** -// * D3D8_5028 -// ****************************************************************** -// No longer supported XDK 5120 by HLEDB_v1 -OOVPATable D3D8_5028[] = { - - REGISTER_OOVPA(CMiniport_InitHardware, 4034, XREF), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, XREF), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, XREF), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 5028, PATCH), - - REGISTER_OOVPA(Direct3D_CreateDevice, 5028, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), - REGISTER_OOVPA(D3D_CommonSetRenderTarget, 5028, XREF), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), - REGISTER_OOVPA(D3D_SetTileNoWait, 4627, XREF), - REGISTER_OOVPA(D3D_SetTileNoWait, 4627, XREF), - REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 4531, PATCH), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DResource_GetType, 4034, DISABLED), // I forget why I had this in here... - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3D_SetFence, 5028, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), // Beware of the typo... - REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetStateVB, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_SetStateUP, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), // Just calls Lock3DSurface - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette2, 4627, PATCH), - REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_KickPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4627, PATCH), - REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), - - // ****************************************************************** - // Provisional registration functions in XDK 5028 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), - // REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * D3D8_5028_SIZE -// ****************************************************************** -uint32 D3D8_5028_SIZE = sizeof(D3D8_5028); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index fe85d3ed2..46539d46a 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -655,226 +655,3 @@ OOVPA_NO_XREF(D3DDevice_EndPushBuffer, 5233, 7) { 0x7C, 0x88 }, OOVPA_END; #endif - -// ****************************************************************** -// * D3D8_5233 -// ****************************************************************** -OOVPATable D3D8_5233[] = { - - REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - - REGISTER_OOVPA(Direct3D_CreateDevice, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), - REGISTER_OOVPA(D3D_CommonSetRenderTarget, 5028, XREF), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3D_SetTileNoWait, 4627, XREF), - REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), - REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), - REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4034, PATCH), - REGISTER_OOVPA(D3D_SetFence, 5028, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), // Beware of the typo... - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), // Was 4627 - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), - - REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 5028, PATCH), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), - - // ****************************************************************** - // Provisional registration functions in XDK 5233 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH), - // ****************************************************************** - -}; - -// ****************************************************************** -// * D3D8_5233_SIZE -// ****************************************************************** -uint32 D3D8_5233_SIZE = sizeof(D3D8_5233); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl index 4189c26a7..6f621648b 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl @@ -1381,226 +1381,3 @@ OOVPA_END; // * Rollback support signature(s) // ****************************************************************** #define D3DDevice_GetTransform_5344 D3DDevice_GetTransform_3925 - -// ****************************************************************** -// * D3D8_5344 -// ****************************************************************** -OOVPATable D3D8_5344[] = { - - REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), - - REGISTER_OOVPA(Direct3D_CreateDevice, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 5028, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH), // Was 5233 - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3D_SetTileNoWait, 4627, XREF), - REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), // Was 4627 - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), // Was 4928 - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), // Was 4627 - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), - REGISTER_OOVPA(D3DDevice_End, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5344, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), // Was 5233 - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), // Was 5233 - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 5344, PATCH), // Was 4134 - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), // Was 5233 - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 5344, PATCH), // Was 4627 - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), - REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), // 5233 - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), // Was 4627 - REGISTER_OOVPA(D3DDevice_SetViewport, 5344, PATCH), // Was 5233 - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), // Was 5233 - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4034, PATCH), // Was 5233 - REGISTER_OOVPA(D3D_SetFence, 5028, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, PATCH), // 4134 - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), // Was 4627 - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5344, PATCH), // Was 5233 - REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5233, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette2, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), - REGISTER_OOVPA(D3DPalette_Lock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetTexture2, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - - // ****************************************************************** - // Unused functions in XDK 5344 - // TODO: Remove - // ****************************************************************** - REGISTER_OOVPA(D3D_CommonSetRenderTarget, 5028, XREF), // Used between 4627 to 5233 - // ****************************************************************** -}; - -// ****************************************************************** -// * D3D8_5344_SIZE -// ****************************************************************** -uint32 D3D8_5344_SIZE = sizeof(D3D8_5344); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl index 12bce2e34..62d94738f 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl @@ -2213,246 +2213,3 @@ OOVPA_END; #define Direct3D_CreateDevice_5558 Direct3D_CreateDevice_3911 #define D3DDevice_GetTransform_5558 D3DDevice_GetTransform_4039 #define D3DDevice_SetVertexShaderConstantNotInline_5558 D3DDevice_SetVertexShaderConstantNotInline_4627 - -// ****************************************************************** -// * D3D8_5558 -// ****************************************************************** -// No longer supported XDK 5659 by HLEDB_v1 -OOVPATable D3D8_5558[] = { - - REGISTER_OOVPA(CMiniport_InitHardware, 5455, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - - REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette2, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_End, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 5558, PATCH), - // REGISTER_OOVPA(D3DDevice_SetMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 5558, PATCH), - // REGISTER_OOVPA(D3DDevice_GetMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), - REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 3911, DISABLED), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3D_SetFence, 5558, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 5558, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5344, PATCH), // For 5455 - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5558, PATCH), - // REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5558, PATCH), - // REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_MakeSpace, 4134, DISABLED), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3D_SetTileNoWait, 5455, XREF), - REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), // for 5455 - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetTexture2, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH), -}; - -// ****************************************************************** -// * D3D8_5558_SIZE -// ****************************************************************** -uint32 D3D8_5558_SIZE = sizeof(D3D8_5558); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl index 95988448b..70cdceef8 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl @@ -1140,223 +1140,3 @@ OOVPA_NO_XREF(D3DDevice_GetTexture2, 5788, 23) // Up to 5849 // { 0x21, 0xC2 }, OOVPA_END; #endif - -// ****************************************************************** -// * D3D8_5788 -// ****************************************************************** -OOVPATable D3D8_5788[] = { - - REGISTER_OOVPA(CMiniport_InitHardware, 5455, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - - REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_End, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), // Not implemented yet. - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), // Not implemented yet. - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), - REGISTER_OOVPA(D3DDevice_GetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), - REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 4627, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH), - REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 3911, DISABLED), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3D_AllocContiguousMemory, 5455, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), - REGISTER_OOVPA(D3D_SetTileNoWait, 5455, XREF), - REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette2, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 5558, XREF), - REGISTER_OOVPA(D3DDevice_MakeSpace, 4134, DISABLED), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 5659, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3D_RecordStateBlock, 5788, XREF), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetTexture2, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1Fast, 4627, XREF), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3D_SetFence, 5558, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 5558, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5455, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH), -}; - -// ****************************************************************** -// * D3D8_5788_SIZE -// ****************************************************************** -uint32 D3D8_5788_SIZE = sizeof(D3D8_5788); diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl index 322450f09..abf163a47 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl @@ -169,218 +169,3 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilFail, 5849, 8) { 0x60, 0x04 }, { 0x6E, 0x00 }, OOVPA_END; - -// ****************************************************************** -// * D3D8_5849 -// ****************************************************************** -OOVPATable D3D8_5849[] = { - - REGISTER_OOVPA(CMiniport_InitHardware, 5455, PATCH), - REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), - REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), - - REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_End, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 5849, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), // Not implemented yet. - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), // Not implemented yet. - REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), - REGISTER_OOVPA(D3DDevice_GetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), - REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 4627, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), - REGISTER_OOVPA(D3D_SetFence, 5558, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 5558, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3D_AllocContiguousMemory, 5455, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH - REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), - REGISTER_OOVPA(D3D_SetTileNoWait, 5455, XREF), - REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 5849, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 5558, XREF), - REGISTER_OOVPA(D3DDevice_MakeSpace, 4134, DISABLED), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 5659, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3D_RecordStateBlock, 5788, XREF), - REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetTexture2, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED), - REGISTER_OOVPA(D3DDevice_CreatePalette2, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1Fast, 4627, XREF), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 5659, PATCH), - REGISTER_OOVPA(D3D_LazySetPointParams, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH), -}; - -// ****************************************************************** -// * D3D8_5849_SIZE -// ****************************************************************** -uint32 D3D8_5849_SIZE = sizeof(D3D8_5849); diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp index 8788ea1fc..aa80e8d67 100644 --- a/src/CxbxKrnl/HLEIntercept.cpp +++ b/src/CxbxKrnl/HLEIntercept.cpp @@ -339,11 +339,6 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) // Skip scanning for D3D8 symbols when LLE GPU is selected if (bLLE_GPU) continue; -#if ENABLE_LEGACY_D3D8_DB - // Some 3911 titles have different D3D8 builds - if (BuildVersion <= 3948) - BuildVersion = 3925; -#endif } if (strcmp(LibraryName.c_str(), Lib_DSOUND) == 0) { @@ -398,26 +393,24 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) || BuildVersion == 5344 || BuildVersion == 5558 || BuildVersion == 5788 || BuildVersion == 5849)) { xbaddr lower = pXbeHeader->dwBaseAddr; - xbaddr upper = pXbeHeader->dwBaseAddr + pXbeHeader->dwSizeofImage; + xbaddr upper = pXbeHeader->dwBaseAddr + pXbeHeader->dwSizeofImage; } -#ifndef ENABLE_LEGACY_D3D8_DB - else if (strcmp(LibraryName.c_str(), Lib_D3D8) == 0) - { + else if (strcmp(LibraryName.c_str(), Lib_D3D8) == 0) { // Save D3D8 build version g_BuildVersion = OrigBuildVersion; - xbaddr lower = pXbeHeader->dwBaseAddr; - xbaddr upper = pXbeHeader->dwBaseAddr + pXbeHeader->dwSizeofImage; - xbaddr pFunc = (xbaddr)nullptr; + xbaddr lower = pXbeHeader->dwBaseAddr; + xbaddr upper = pXbeHeader->dwBaseAddr + pXbeHeader->dwSizeofImage; + xbaddr pFunc = (xbaddr)nullptr; - if(OrigBuildVersion >= 3911 && OrigBuildVersion < 4034) + if (OrigBuildVersion >= 3911 && OrigBuildVersion < 4034) { pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetRenderState_CullMode_3911, lower, upper); - else + } else { pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetRenderState_CullMode_4034, lower, upper); + } // locate D3DDeferredRenderState - if(pFunc != (xbaddr)nullptr) - { + if(pFunc != (xbaddr)nullptr) { // offset for stencil cull enable render state in the deferred render state buffer xbaddr DerivedAddr_D3DRS_CULLMODE = NULL; int Decrement = 0; // TODO : Rename into something understandable @@ -427,8 +420,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) // Read address of D3DRS_CULLMODE from D3DDevice_SetRenderState_CullMode // TODO : Simplify this when XREF_D3DRS_CULLMODE derivation is deemed stable { - if (OrigBuildVersion >= 3911 && OrigBuildVersion < 4034) - { + if (OrigBuildVersion >= 3911 && OrigBuildVersion < 4034) { DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x25); Decrement = 0x1FC; // TODO: Clean up (?) Increment = 82 * 4; @@ -437,23 +429,17 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) //Decrement = 0x19F; // TODO: Clean up (?) //Increment = 72 * 4; //patchOffset = 142*4; // TODO: Verify - } - else if (OrigBuildVersion >= 4034 && OrigBuildVersion <= 4361) - { + } else if (OrigBuildVersion >= 4034 && OrigBuildVersion <= 4361) { DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x2B); Decrement = 0x200; Increment = 82 * 4; patchOffset = 142 * 4; - } - else if (OrigBuildVersion >= 4432 && OrigBuildVersion < 4627) - { + } else if (OrigBuildVersion >= 4432 && OrigBuildVersion < 4627) { DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x2B); Decrement = 0x204; Increment = 83 * 4; patchOffset = 143 * 4; - } - else if (OrigBuildVersion >= 4627 && OrigBuildVersion <= 5933) - { + } else if (OrigBuildVersion >= 4627 && OrigBuildVersion <= 5933) { DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x2B); Decrement = 0x24C; Increment = 92 * 4; @@ -462,8 +448,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) // Temporary verification - is XREF_D3DDEVICE derived correctly? xbaddr DerivedAddr_D3DDevice = *(xbaddr*)((xbaddr)pFunc + 0x03); - if (XRefDataBase[XREF_D3DDEVICE] != DerivedAddr_D3DDevice) - { + if (XRefDataBase[XREF_D3DDEVICE] != DerivedAddr_D3DDevice) { if (XRefDataBase[XREF_D3DDEVICE] != XREF_ADDR_DERIVE) CxbxPopupMessage("Second derived XREF_D3DDEVICE differs from first!"); @@ -473,8 +458,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) g_SymbolAddresses["D3DDEVICE"] = DerivedAddr_D3DDevice; // Temporary verification - is XREF_D3DRS_CULLMODE derived correctly? - if (XRefDataBase[XREF_D3DRS_CULLMODE] != DerivedAddr_D3DRS_CULLMODE) - { + if (XRefDataBase[XREF_D3DRS_CULLMODE] != DerivedAddr_D3DRS_CULLMODE) { if (XRefDataBase[XREF_D3DRS_CULLMODE] != XREF_ADDR_DERIVE) CxbxPopupMessage("Second derived XREF_D3DRS_CULLMODE differs from first!"); @@ -494,17 +478,14 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) XRefDataBase[XREF_D3DRS_ROPZREAD] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 2*4; XRefDataBase[XREF_D3DRS_DONOTCULLUNCOMPRESSED] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 3*4; - for(int v=0;v<44;v++) - { + for(int v=0;v<44;v++) { XTL::EmuD3DDeferredRenderState[v] = XTL::X_D3DRS_UNK; } g_SymbolAddresses["D3DDeferredRenderState"] = (DWORD)XTL::EmuD3DDeferredRenderState; printf("HLE: 0x%.08X -> EmuD3DDeferredRenderState\n", XTL::EmuD3DDeferredRenderState); //DbgPrintf("HLE: 0x%.08X -> XREF_D3DRS_ROPZCMPALWAYSREAD\n", XRefDataBase[XREF_D3DRS_ROPZCMPALWAYSREAD] ); - } - else - { + } else { XTL::EmuD3DDeferredRenderState = nullptr; CxbxKrnlCleanup("EmuD3DDeferredRenderState was not found!"); } @@ -522,8 +503,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) else if(OrigBuildVersion >= 4627) pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_4627, lower, upper); - if (pFunc != (xbaddr)nullptr) - { + if (pFunc != (xbaddr)nullptr) { xbaddr DerivedAddr_D3DTSS_TEXCOORDINDEX = NULL; int Decrement = 0x70; // TODO : Rename into something understandable @@ -537,10 +517,10 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) DerivedAddr_D3DTSS_TEXCOORDINDEX = *(xbaddr*)(pFunc + 0x19); // Temporary verification - is XREF_D3DTSS_TEXCOORDINDEX derived correctly? - if (XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] != DerivedAddr_D3DTSS_TEXCOORDINDEX) - { - if (XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] != XREF_ADDR_DERIVE) - CxbxPopupMessage("Second derived XREF_D3DTSS_TEXCOORDINDEX differs from first!"); + if (XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] != DerivedAddr_D3DTSS_TEXCOORDINDEX) { + if (XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] != XREF_ADDR_DERIVE) { + CxbxPopupMessage("Second derived XREF_D3DTSS_TEXCOORDINDEX differs from first!"); + } XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] = DerivedAddr_D3DTSS_TEXCOORDINDEX; } @@ -548,202 +528,19 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) XTL::EmuD3DDeferredTextureState = (DWORD*)(DerivedAddr_D3DTSS_TEXCOORDINDEX - Decrement); - for(int s=0;s<4;s++) - { - for(int v=0;v<32;v++) - XTL::EmuD3DDeferredTextureState[v+s*32] = X_D3DTSS_UNK; + for(int s = 0; s < 4; s++) { + for (int v = 0; v < 32; v++) { + XTL::EmuD3DDeferredTextureState[v + s * 32] = X_D3DTSS_UNK; + } } g_SymbolAddresses["D3DDeferredTextureState"] = (DWORD)XTL::EmuD3DDeferredTextureState; printf("HLE: 0x%.08X -> EmuD3DDeferredTextureState\n", XTL::EmuD3DDeferredTextureState); - } - else - { + } else { XTL::EmuD3DDeferredTextureState = nullptr; CxbxKrnlCleanup("EmuD3DDeferredTextureState was not found!"); } } -#else - else if (strcmp(LibraryName.c_str(), Lib_D3D8) == 0 && - (BuildVersion == 3925 || BuildVersion == 4034 || BuildVersion == 4134 || BuildVersion == 4361 - || BuildVersion == 4432 || BuildVersion == 4627 || BuildVersion == 5028 || BuildVersion == 5233 - || BuildVersion == 5344 || BuildVersion == 5558 || BuildVersion == 5788 || BuildVersion == 5849)) - { - // Save D3D8 build version - g_BuildVersion = BuildVersion; - - xbaddr lower = pXbeHeader->dwBaseAddr; - xbaddr upper = pXbeHeader->dwBaseAddr + pXbeHeader->dwSizeofImage; - xbaddr pFunc = (xbaddr)nullptr; - - if(BuildVersion < 4034) - pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetRenderState_CullMode_3911, lower, upper); - else - pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetRenderState_CullMode_4034, lower, upper); - - // locate D3DDeferredRenderState - if(pFunc != (xbaddr)nullptr) - { - // offset for stencil cull enable render state in the deferred render state buffer - xbaddr DerivedAddr_D3DRS_CULLMODE = NULL; - int Decrement = 0; // TODO : Rename into something understandable - int Increment = 0; // TODO : Rename into something understandable - int patchOffset = 0; // TODO : Rename into something understandable - - // Read address of D3DRS_CULLMODE from D3DDevice_SetRenderState_CullMode - // TODO : Simplify this when XREF_D3DRS_CULLMODE derivation is deemed stable - { - if (BuildVersion == 3925) - { - DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x25); - Decrement = 0x1FC; // TODO: Clean up (?) - Increment = 82 * 4; - patchOffset = 140 * 4; // Verified 3925 and 3948 - - //Decrement = 0x19F; // TODO: Clean up (?) - //Increment = 72 * 4; - //patchOffset = 142*4; // TODO: Verify - } -#if 0 // Same as 4134 - else if (BuildVersion == 4034) - { - DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x2B); - Decrement = 0x248; // TODO: Verify - Increment = 82 * 4; - patchOffset = 142 * 4; - } -#endif - else if (BuildVersion == 4034 || BuildVersion == 4134 || BuildVersion == 4361) - { - DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x2B); - Decrement = 0x200; - Increment = 82 * 4; - patchOffset = 142 * 4; - } - else if (BuildVersion == 4432) - { - DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x2B); - Decrement = 0x204; - Increment = 83 * 4; - patchOffset = 143 * 4; - } - else if (BuildVersion == 4627 || BuildVersion == 5028 || BuildVersion == 5233 || BuildVersion == 5344 - || BuildVersion == 5558 || BuildVersion == 5788 || BuildVersion == 5849) - { - // WARNING: Not thoroughly tested (just seemed very correct right away) - DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x2B); - Decrement = 0x24C; - Increment = 92 * 4; - patchOffset = 162 * 4; - } - - // Temporary verification - is XREF_D3DDEVICE derived correctly? - xbaddr DerivedAddr_D3DDevice = *(xbaddr*)((xbaddr)pFunc + 0x03); - if (XRefDataBase[XREF_D3DDEVICE] != DerivedAddr_D3DDevice) - { - if (XRefDataBase[XREF_D3DDEVICE] != XREF_ADDR_DERIVE) - CxbxPopupMessage("Second derived XREF_D3DDEVICE differs from first!"); - - XRefDataBase[XREF_D3DDEVICE] = DerivedAddr_D3DDevice; - } - - g_SymbolAddresses["D3DDEVICE"] = DerivedAddr_D3DDevice; - - // Temporary verification - is XREF_D3DRS_CULLMODE derived correctly? - if (XRefDataBase[XREF_D3DRS_CULLMODE] != DerivedAddr_D3DRS_CULLMODE) - { - if (XRefDataBase[XREF_D3DRS_CULLMODE] != XREF_ADDR_DERIVE) - CxbxPopupMessage("Second derived XREF_D3DRS_CULLMODE differs from first!"); - - XRefDataBase[XREF_D3DRS_CULLMODE] = DerivedAddr_D3DRS_CULLMODE; - } - } - - // Derive address of EmuD3DDeferredRenderState from D3DRS_CULLMODE - XTL::EmuD3DDeferredRenderState = (DWORD*)(DerivedAddr_D3DRS_CULLMODE - Decrement + Increment); - patchOffset -= Increment; - - // Derive address of a few other deferred render state slots (to help xref-based function location) - XRefDataBase[XREF_D3DRS_MULTISAMPLEMODE] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset - 8*4; - XRefDataBase[XREF_D3DRS_MULTISAMPLERENDERTARGETMODE] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset - 7*4; - XRefDataBase[XREF_D3DRS_STENCILCULLENABLE] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 0*4; - XRefDataBase[XREF_D3DRS_ROPZCMPALWAYSREAD] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 1*4; - XRefDataBase[XREF_D3DRS_ROPZREAD] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 2*4; - XRefDataBase[XREF_D3DRS_DONOTCULLUNCOMPRESSED] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 3*4; - - for(int v=0;v<44;v++) - { - XTL::EmuD3DDeferredRenderState[v] = XTL::X_D3DRS_UNK; - } - - g_SymbolAddresses["D3DDeferredRenderState"] = (DWORD)XTL::EmuD3DDeferredRenderState; - printf("HLE: 0x%.08X -> EmuD3DDeferredRenderState\n", XTL::EmuD3DDeferredRenderState); - //DbgPrintf("HLE: 0x%.08X -> XREF_D3DRS_ROPZCMPALWAYSREAD\n", XRefDataBase[XREF_D3DRS_ROPZCMPALWAYSREAD] ); - } - else - { - XTL::EmuD3DDeferredRenderState = nullptr; - CxbxKrnlCleanup("EmuD3DDeferredRenderState was not found!"); - } - - // locate D3DDeferredTextureState - { - pFunc = (xbaddr)nullptr; - - if(BuildVersion < 4034) - pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_3911, lower, upper); - // TODO : What about 4034? Use it once it's offset to XREF_D3DTSS_TEXCOORDINDEX is verified - else if(BuildVersion == 4034 || BuildVersion == 4134) - pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_4034, lower, upper); - else if(BuildVersion == 4361 || BuildVersion == 4432) - pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_4242, lower, upper); - else if(BuildVersion == 4627 || BuildVersion == 5028 || BuildVersion == 5233 || BuildVersion == 5344 - || BuildVersion == 5558 || BuildVersion == 5788 || BuildVersion == 5849) - pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_4627, lower, upper); - - if (pFunc != (xbaddr)nullptr) - { - xbaddr DerivedAddr_D3DTSS_TEXCOORDINDEX = NULL; - int Decrement = 0x70; // TODO : Rename into something understandable - - // TODO : Remove this when XREF_D3DTSS_TEXCOORDINDEX derivation is deemed stable - { - if (BuildVersion == 3925) // 0x18F180 - DerivedAddr_D3DTSS_TEXCOORDINDEX = *(xbaddr*)(pFunc + 0x11); - else if (BuildVersion == 4034 || BuildVersion == 4134) - DerivedAddr_D3DTSS_TEXCOORDINDEX = *(xbaddr*)(pFunc + 0x18); - else - DerivedAddr_D3DTSS_TEXCOORDINDEX = *(xbaddr*)(pFunc + 0x19); - - - // Temporary verification - is XREF_D3DTSS_TEXCOORDINDEX derived correctly? - if (XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] != DerivedAddr_D3DTSS_TEXCOORDINDEX) - { - if (XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] != XREF_ADDR_DERIVE) - CxbxPopupMessage("Second derived XREF_D3DTSS_TEXCOORDINDEX differs from first!"); - - XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] = DerivedAddr_D3DTSS_TEXCOORDINDEX; - } - } - - XTL::EmuD3DDeferredTextureState = (DWORD*)(DerivedAddr_D3DTSS_TEXCOORDINDEX - Decrement); - - for(int s=0;s<4;s++) - { - for(int v=0;v<32;v++) - XTL::EmuD3DDeferredTextureState[v+s*32] = X_D3DTSS_UNK; - } - - g_SymbolAddresses["D3DDeferredTextureState"] = (DWORD)XTL::EmuD3DDeferredTextureState; - printf("HLE: 0x%.08X -> EmuD3DDeferredTextureState\n", XTL::EmuD3DDeferredTextureState); - } - else - { - XTL::EmuD3DDeferredTextureState = nullptr; - CxbxKrnlCleanup("EmuD3DDeferredTextureState was not found!"); - } - } -#endif } } From 178618956e0f61f6ee7accc7f502be9a884b6e9a Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Oct 2017 22:36:51 -0500 Subject: [PATCH 05/16] Removed XActEng v1 Database --- build/win32/Cxbx.vcxproj | 8 ---- build/win32/Cxbx.vcxproj.filters | 24 ----------- src/CxbxKrnl/HLEDataBase.cpp | 9 ---- src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl | 33 --------------- src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.inl | 39 ------------------ src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.inl | 41 ------------------- src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.inl | 41 ------------------- src/CxbxKrnl/HLEDataBase/XactEng.1.0.5558.inl | 41 ------------------- src/CxbxKrnl/HLEDataBase/XactEng.1.0.5849.inl | 41 ------------------- src/CxbxKrnl/HLEIntercept.cpp | 6 --- 10 files changed, 283 deletions(-) diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index 0a28c051b..d691f84c2 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -231,13 +231,6 @@ $(SOLUTIONDIR)Export.bat - - - - - - - @@ -345,7 +338,6 @@ $(SOLUTIONDIR)Export.bat - diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index 030e36c96..16e69d8e6 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -405,27 +405,6 @@ Shared - - HLEDatabase\XactEng - - - HLEDatabase\XactEng - - - HLEDatabase\XactEng - - - HLEDatabase\XactEng - - - HLEDatabase\XactEng - - - HLEDatabase\XactEng - - - HLEDatabase\XactEng - HLEDatabase\Xapi @@ -683,9 +662,6 @@ HLEDatabase\XactEng - - HLEDatabase\XactEng - HLEDatabase\XactEng diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index 896475160..ae0bcbb82 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -102,15 +102,6 @@ const HLEData HLEDataBase[] = HLE_ENTRY(Lib_XAPILIB, XAPI, 5788), HLE_ENTRY(Lib_XAPILIB, XAPI, 5849), #endif -#if ENABLE_LEGACY_XACTENG_DB - HLE_ENTRY(Lib_XACTENG, XactEng, 4627), - HLE_ENTRY(Lib_XACTENG, XactEng, 4928), - HLE_ENTRY(Lib_XACTENG, XactEng, 5233), - HLE_ENTRY(Lib_XACTENG, XactEng, 5344), - HLE_ENTRY(Lib_XACTENG, XactEng, 5558), - HLE_ENTRY(Lib_XACTENG, XactEng, 5788), - HLE_ENTRY(Lib_XACTENG, XactEng, 5849), -#endif #if ENABLE_LEGACY_XGRAPHC_DB HLE_ENTRY(Lib_XGRAPHC, XG, 3911), HLE_ENTRY(Lib_XGRAPHC, XG, 4034), diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl index ad858123e..44e23ea7e 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl @@ -415,36 +415,3 @@ OOVPA_XREF(IXACTEngine_UnRegisterWaveBank, 4627, 8, { 0x19, 0xC2 }, { 0x1A, 0x08 }, OOVPA_END; - -// ****************************************************************** -// * XactEng_4627 -// ****************************************************************** -OOVPATable XactEng_4627[] = { - - REGISTER_OOVPA(XACTEngineCreate, 4627, PATCH), - REGISTER_OOVPA(XACTEngineDoWork, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterWaveBank, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterWaveBank, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterStreamedWaveBank, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterStreamedWaveBank, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundBank, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundBank, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_DownloadEffectsImage, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_DownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundSource, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundSource, 4627, PATCH), - REGISTER_OOVPA(XACT_CSoundBank_GetSoundCueIndexFromFriendlyName, 4627, XREF), - REGISTER_OOVPA(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4627, PATCH), - REGISTER_OOVPA(IXACTSoundBank_Play, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterNotification, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_GetNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_GetNotification, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_UnRegisterWaveBank, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_UnRegisterWaveBank, 4627, PATCH), -}; - -// ****************************************************************** -// * XACTENG_4627_SIZE -// ****************************************************************** -uint32 XactEng_4627_SIZE = sizeof(XactEng_4627); diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.inl index c32c613e2..2146b9e04 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.inl @@ -374,42 +374,3 @@ OOVPA_XREF(IXACTEngine_RegisterNotification, 4928, 8, { 0x38, 0xC2 }, { 0x39, 0x08 }, OOVPA_END; - -// ****************************************************************** -// * XactEng_4928 -// ****************************************************************** -OOVPATable XactEng_4928[] = { - - REGISTER_OOVPA(XACTEngineCreate, 4928, PATCH), - REGISTER_OOVPA(XACTEngineDoWork, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterStreamedWaveBank, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterStreamedWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundBank, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_UnRegisterWaveBank, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_UnRegisterWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_GetNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_GetNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CSoundBank_GetSoundCueIndexFromFriendlyName, 4928, XREF), - REGISTER_OOVPA(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundSource, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundSource, 4928, PATCH), - - // ****************************************************************** - // Provisional registration functions in XDK 4928 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(XACT_CEngine_DownloadEffectsImage, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_DownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterWaveBank, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterWaveBank, 4627, PATCH), - REGISTER_OOVPA(IXACTSoundBank_Play, 4627, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * XACTENG_4928_SIZE -// ****************************************************************** -uint32 XactEng_4928_SIZE = sizeof(XactEng_4928); diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.inl index 5419ccce7..b92cd8ea3 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.inl @@ -182,44 +182,3 @@ OOVPA_XREF(IXACTEngine_RegisterWaveBank, 5120, 10, { 0x41, 0x10 }, OOVPA_END; #endif - -// ****************************************************************** -// * XactEng_5233 -// ****************************************************************** -OOVPATable XactEng_5233[] = { - - REGISTER_OOVPA(XACTEngineCreate, 5120, PATCH), - REGISTER_OOVPA(XACTEngineDoWork, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterStreamedWaveBank, 4928, XREF), // For 5120 - REGISTER_OOVPA(XACT_CEngine_RegisterStreamedWaveBank, 5233, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterStreamedWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundBank, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_UnRegisterWaveBank, 5120, XREF), - REGISTER_OOVPA(IXACTEngine_UnRegisterWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_GetNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_GetNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterWaveBank, 5120, XREF), - REGISTER_OOVPA(XACT_CEngine_RegisterWaveBank, 5233, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterWaveBank, 5120, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundSource, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundSource, 4928, PATCH), - - // ****************************************************************** - // Provisional registration functions in XDK 5233 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(XACT_CSoundBank_GetSoundCueIndexFromFriendlyName, 4928, XREF), - REGISTER_OOVPA(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_DownloadEffectsImage, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_DownloadEffectsImage, 4627, PATCH), - REGISTER_OOVPA(IXACTSoundBank_Play, 4627, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * XACTENG_5233_SIZE -// ****************************************************************** -uint32 XactEng_5233_SIZE = sizeof(XactEng_5233); diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.inl index 4638bfcdc..41a4a4ca0 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.inl @@ -125,44 +125,3 @@ OOVPA_XREF(IXACTSoundBank_PlayEx, 5344, 11, { 0x30, 0xC2 }, { 0x31, 0x0C }, OOVPA_END; - -// ****************************************************************** -// * XactEng_5344 -// ****************************************************************** -OOVPATable XactEng_5344[] = { - - REGISTER_OOVPA(XACTEngineCreate, 5120, PATCH), - REGISTER_OOVPA(XACTEngineDoWork, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterStreamedWaveBank, 5233, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterStreamedWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundBank, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_UnRegisterWaveBank, 5120, XREF), - REGISTER_OOVPA(IXACTEngine_UnRegisterWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_GetNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_GetNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CSoundBank_GetSoundCueIndexFromFriendlyName, 4928, XREF), - REGISTER_OOVPA(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterWaveBank, 5233, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterWaveBank, 5120, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundSource, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundSource, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_DownloadEffectsImage, 5344, XREF), - REGISTER_OOVPA(IXACTEngine_DownloadEffectsImage, 5344, PATCH), - REGISTER_OOVPA(XACT_CSoundBank_Play, 5344, XREF), - REGISTER_OOVPA(IXACTSoundBank_PlayEx, 5344, XREF), // Not Implemented yet. - - // ****************************************************************** - // Provisional registration functions in XDK 5344 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(IXACTSoundBank_Play, 4627, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * XACTENG_5344_SIZE -// ****************************************************************** -uint32 XactEng_5344_SIZE = sizeof(XactEng_5344); diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5558.inl index cac9248e0..fff84f592 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5558.inl @@ -55,44 +55,3 @@ OOVPA_XREF(XACT_CSoundBank_Play, 5558, 12, { 0x3B, 0xE9 }, { 0x55, 0x35 }, OOVPA_END; - -// ****************************************************************** -// * XactEng_5558 -// ****************************************************************** -OOVPATable XactEng_5558[] = { - - REGISTER_OOVPA(XACTEngineCreate, 5120, PATCH), - REGISTER_OOVPA(XACTEngineDoWork, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterStreamedWaveBank, 5233, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterStreamedWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundBank, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_UnRegisterWaveBank, 5120, XREF), - REGISTER_OOVPA(IXACTEngine_UnRegisterWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_GetNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_GetNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CSoundBank_GetSoundCueIndexFromFriendlyName, 4928, XREF), - REGISTER_OOVPA(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterWaveBank, 5233, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterWaveBank, 5120, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundSource, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundSource, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_DownloadEffectsImage, 5344, XREF), - REGISTER_OOVPA(IXACTEngine_DownloadEffectsImage, 5344, PATCH), - REGISTER_OOVPA(XACT_CSoundBank_Play, 5558, XREF), - REGISTER_OOVPA(IXACTSoundBank_PlayEx, 5344, XREF), // Not Implemented yet. - - // ****************************************************************** - // Provisional registration functions in XDK 5558 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(IXACTSoundBank_Play, 4627, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * XACTENG_5558_SIZE -// ****************************************************************** -uint32 XactEng_5558_SIZE = sizeof(XactEng_5558); diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5849.inl index df4088312..b323ea3ae 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5849.inl @@ -57,44 +57,3 @@ OOVPA_NO_XREF(XACTEngineCreate, 5849, 11) { 0xA3, 0x08 }, OOVPA_END; #endif - -// ****************************************************************** -// * XactEng_5849 -// ****************************************************************** -OOVPATable XactEng_5849[] = { - - REGISTER_OOVPA(XACTEngineCreate, 5120, PATCH), - REGISTER_OOVPA(XACTEngineDoWork, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterStreamedWaveBank, 5233, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterStreamedWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundBank, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_UnRegisterWaveBank, 5120, XREF), - REGISTER_OOVPA(IXACTEngine_UnRegisterWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_GetNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_GetNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CSoundBank_GetSoundCueIndexFromFriendlyName, 4928, XREF), - REGISTER_OOVPA(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterWaveBank, 5233, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterWaveBank, 5120, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundSource, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundSource, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_DownloadEffectsImage, 5344, XREF), - REGISTER_OOVPA(IXACTEngine_DownloadEffectsImage, 5344, PATCH), - REGISTER_OOVPA(XACT_CSoundBank_Play, 5558, XREF), - REGISTER_OOVPA(IXACTSoundBank_PlayEx, 5344, XREF), // Not Implemented yet. - - // ****************************************************************** - // Provisional registration functions in XDK 5849 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(IXACTSoundBank_Play, 4627, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * XACTENG_5849_SIZE -// ****************************************************************** -uint32 XactEng_5849_SIZE = sizeof(XactEng_5849); diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp index aa80e8d67..bae3c97be 100644 --- a/src/CxbxKrnl/HLEIntercept.cpp +++ b/src/CxbxKrnl/HLEIntercept.cpp @@ -377,12 +377,6 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) // Skip scanning for XACTENG symbols when LLE APU is selected if (bLLE_APU) continue; - -#if ENABLE_LEGACY_XACTENG_DB - // Change a few XACTENG versions to similar counterparts - if (OrigBuildVersion == 4928 || BuildVersion == 5028) - BuildVersion = 4928; -#endif } if(bXRefFirstPass) From 530f2d6e5ca5ba81ed1bb3a1fcf62a93e25e6097 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Oct 2017 22:48:51 -0500 Subject: [PATCH 06/16] Removed Xapi v1 Database --- build/win32/Cxbx.vcxproj | 13 ----- build/win32/Cxbx.vcxproj.filters | 39 -------------- src/CxbxKrnl/HLEDataBase.cpp | 15 ------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl | 55 ------------------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl | 53 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl | 47 ---------------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl | 49 ----------------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl | 49 ----------------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl | 63 ---------------------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl | 56 ------------------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.inl | 63 ---------------------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl | 55 ------------------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.inl | 50 ----------------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl | 53 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl | 54 ------------------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl | 52 ------------------ src/CxbxKrnl/HLEIntercept.cpp | 12 ----- 17 files changed, 778 deletions(-) diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index d691f84c2..3fcb8bc86 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -231,19 +231,6 @@ $(SOLUTIONDIR)Export.bat - - - - - - - - - - - - - diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index 16e69d8e6..aea0fb47b 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -405,45 +405,6 @@ Shared - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - - - HLEDatabase\Xapi - HLEDatabase\XG diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index ae0bcbb82..413b6d2ff 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -87,21 +87,6 @@ const char *Sec_XNET = "XNET"; const HLEData HLEDataBase[] = { -#if ENABLE_LEGACY_XAPI_DB - HLE_ENTRY(Lib_XAPILIB, XAPI, 3911), - HLE_ENTRY(Lib_XAPILIB, XAPI, 4034), - HLE_ENTRY(Lib_XAPILIB, XAPI, 4134), - HLE_ENTRY(Lib_XAPILIB, XAPI, 4361), - HLE_ENTRY(Lib_XAPILIB, XAPI, 4432), - HLE_ENTRY(Lib_XAPILIB, XAPI, 4627), - HLE_ENTRY(Lib_XAPILIB, XAPI, 4721), - HLE_ENTRY(Lib_XAPILIB, XAPI, 5028), - HLE_ENTRY(Lib_XAPILIB, XAPI, 5233), - HLE_ENTRY(Lib_XAPILIB, XAPI, 5344), - HLE_ENTRY(Lib_XAPILIB, XAPI, 5558), - HLE_ENTRY(Lib_XAPILIB, XAPI, 5788), - HLE_ENTRY(Lib_XAPILIB, XAPI, 5849), -#endif #if ENABLE_LEGACY_XGRAPHC_DB HLE_ENTRY(Lib_XGRAPHC, XG, 3911), HLE_ENTRY(Lib_XGRAPHC, XG, 4034), diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl index 294caccdc..d12ca7040 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl @@ -1375,58 +1375,3 @@ OOVPA_NO_XREF(XapiFiberStartup, 3911, 14) { 0x44, 0xCC }, OOVPA_END; - -// ****************************************************************** -// * XAPI_3911 -// ****************************************************************** -OOVPATable XAPI_3911[] = { - - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(XInitDevices, 3911, PATCH), - // REGISTER_OOVPA(CreateMutex, 3911, PATCH), // Too High Level - // REGISTER_OOVPA(CreateThread, 3911, PATCH), // Too High Level - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), //*/ - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - // REGISTER_OOVPA(XCalculateSignatureBegin, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 3911, PATCH), - REGISTER_OOVPA(XInputOpen, 3911, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 3911, XREF), - REGISTER_OOVPA(XInputClose, 3911, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 3911, PATCH), - REGISTER_OOVPA(XInputGetState, 3911, PATCH), - REGISTER_OOVPA(XInputSetState, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - // REGISTER_OOVPA(lstrcmpiW, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 3911, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH), - REGISTER_OOVPA(XGetLaunchInfo, 3911, DISABLED), - REGISTER_OOVPA(XAutoPowerDownResetTimer, 3911, DISABLED), // Just calls KeSetTimer - REGISTER_OOVPA(XMountMURootA, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 3911, PATCH), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(timeSetEvent, 3911, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), - // REGISTER_OOVPA(ReadFileEx, 3911, PATCH), - // REGISTER_OOVPA(WriteFileEx, 3911, PATCH), - // REGISTER_OOVPA(CloseHandle, 3911, PATCH), - // REGISTER_OOVPA(ExitThread, 3911, PATCH), -}; - -// ****************************************************************** -// * XAPI_3911_SIZE -// ****************************************************************** -uint32 XAPI_3911_SIZE = sizeof(XAPI_3911); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl index a3e14ecf5..ea315fd73 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl @@ -157,56 +157,3 @@ OOVPA_NO_XREF(XapiInitProcess, 4361, 7) { 0x43, 0x0B }, OOVPA_END; */ - -// ****************************************************************** -// * XAPI_4034 -// ****************************************************************** -OOVPATable XAPI_4034[] = { - - REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - // REGISTER_OOVPA(CreateThread, 3911, PATCH), // Too High Level - // REGISTER_OOVPA(CloseHandle, (???, PATCH)), - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(XInputSetState, 3911, PATCH), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 3911, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 3911, XREF), - REGISTER_OOVPA(XInputClose, 3911, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(XInputOpen, 3911, PATCH), - REGISTER_OOVPA(XInputGetState, 3911, PATCH), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 3911, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH), - REGISTER_OOVPA(XMountMURootA, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 3911, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(timeSetEvent, 3911, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), - - // ****************************************************************** - // Provisional registration functions in XDK 4034 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * XAPI_4034_SIZE -// ****************************************************************** -uint32 XAPI_4034_SIZE = sizeof(XAPI_4034); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl index ea18d4c81..75861004e 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl @@ -222,50 +222,3 @@ OOVPA_XREF(GetTypeInformation, 4134, 24, XREF_XAPI_GetTypeInformation, XRefZero) { 0x1E, 0x04 }, { 0x1F, 0x3B } OOVPA_END; - -// ****************************************************************** -// * XAPI_4134 -// ****************************************************************** -OOVPATable XAPI_4134[] = { - - REGISTER_OOVPA(XInitDevices, 3911, PATCH), //*/ - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XInputOpen, 4134, PATCH), - REGISTER_OOVPA(XInputGetState, 4134, PATCH), - REGISTER_OOVPA(XInputSetState, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 4134, PATCH), - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(GetTypeInformation, 4134, XREF), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 3911, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 3911, XREF), - REGISTER_OOVPA(XInputClose, 3911, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 3911, PATCH), - REGISTER_OOVPA(timeSetEvent, 3911, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XMountMURootA, 3911, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), -}; - -// ****************************************************************** -// * XAPI_4134_SIZE -// ****************************************************************** -uint32 XAPI_4134_SIZE = sizeof(XAPI_4134); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl index bd1635382..6306e962d 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl @@ -387,52 +387,3 @@ OOVPA_NO_XREF(XMountMURootA, 4242, 12) { 0x72, 0xE8 }, OOVPA_END; #endif - -// ****************************************************************** -// * XAPI_4361 -// ****************************************************************** -OOVPATable XAPI_4361[] = { - - REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 3911, PATCH), - REGISTER_OOVPA(XInputOpen, 4242, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 4242, XREF), - REGISTER_OOVPA(XInputClose, 3911, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 4242, PATCH), - REGISTER_OOVPA(XInputGetState, 4242, PATCH), - REGISTER_OOVPA(XInputSetState, 4242, PATCH), - // REGISTER_OOVPA(XapiThreadStartup, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 4134, PATCH), // TODO: This needs to be verified on 4361, not just 4242! - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetTypeInformation, 4134, XREF), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 4242, PATCH), - REGISTER_OOVPA(timeSetEvent, 3911, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(XFormatUtilityDrive, 4242, PATCH), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH), - REGISTER_OOVPA(XMountMURootA, 4242, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), -}; - -// ****************************************************************** -// * XAPI_4361_SIZE -// ****************************************************************** -uint32 XAPI_4361_SIZE = sizeof(XAPI_4361); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl index 30501a9ba..3aac14667 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl @@ -53,52 +53,3 @@ OOVPA_NO_XREF(XMountUtilityDrive, 4432, 8) // TODO: Finish signature, toss out function call basically OOVPA_END; - -// ****************************************************************** -// * XAPI_4432 -// ****************************************************************** -OOVPATable XAPI_4432[] = { - - REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), - REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XInputOpen, 4242, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 4242, XREF), - REGISTER_OOVPA(XInputClose, 3911, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 4242, PATCH), - REGISTER_OOVPA(XInputGetState, 4242, PATCH), - REGISTER_OOVPA(XInputSetState, 4242, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 3911, PATCH), - // REGISTER_OOVPA(XapiThreadStartup, 3911, PATCH), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(timeSetEvent, 3911, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetTypeInformation, 4134, XREF), - REGISTER_OOVPA(XMountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 4242, PATCH), - REGISTER_OOVPA(XMountMURootA, 4242, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(XFormatUtilityDrive, 4242, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), -}; - -// ****************************************************************** -// * XAPI_4432_SIZE -// ****************************************************************** -uint32 XAPI_4432_SIZE = sizeof(XAPI_4432); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl index 30f911a92..e0475c5b6 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl @@ -330,66 +330,3 @@ OOVPA_NO_XREF(XGetDeviceEnumerationStatus, 4831, 14) { 0x28, 0xC3 }, OOVPA_END; #endif - -// ****************************************************************** -// * XAPI_4627 -// ****************************************************************** -OOVPATable XAPI_4627[] = { -// No longer supported XDK 4721 to 4928 by HLEDB_v1 - - REGISTER_OOVPA(XFormatUtilityDrive, 4242, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetTypeInformation, 4134, XREF), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), - REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XInputOpen, 4242, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 4627, XREF), - // REGISTER_OOVPA(XID_fCloseDevice, 4831, XREF), - REGISTER_OOVPA(XInputClose, 3911, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 4242, PATCH), - REGISTER_OOVPA(XInputGetState, 4242, PATCH), - // REGISTER_OOVPA(XInputGetState, 4831, PATCH), - REGISTER_OOVPA(XInputSetState, 4242, PATCH), - // REGISTER_OOVPA(XInputSetState, 4831, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 3911, PATCH), - // REGISTER_OOVPA(XapiThreadStartup, 3911, PATCH), // obsolete? - // REGISTER_OOVPA(XInputGetCapabilities, 4831, PATCH), - // REGISTER_OOVPA(XCalculateSignatureBeginEx, 4627, PATCH), // +s, not necessary? - // REGISTER_OOVPA(XCalculateSignatureBegin, 4627, PATCH), - // REGISTER_OOVPA(XCalculateSignatureUpdate, 4627, PATCH), - // REGISTER_OOVPA(XCalculateSignatureEnd, 4627, PATCH), // s+ - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH), - // REGISTER_OOVPA(XLaunchNewImageA, 4721, PATCH), - REGISTER_OOVPA(XGetLaunchInfo, 3911, DISABLED), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(timeSetEvent, 3911, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - // REGISTER_OOVPA(XInputGetDeviceDescription, 4831, PATCH), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - // REGISTER_OOVPA(MoveFileA, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 4242, PATCH), - REGISTER_OOVPA(XMountMURootA, 4242, PATCH), - // REGISTER_OOVPA(XGetDeviceEnumerationStatus, 4831, PATCH), -}; - -// ****************************************************************** -// * XAPI_4627_SIZE -// ****************************************************************** -uint32 XAPI_4627_SIZE = sizeof(XAPI_4627); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl index aee52b6ff..68c7dd3bf 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl @@ -56,59 +56,3 @@ OOVPA_NO_XREF(XLaunchNewImageA, 4721, 15) { 0xC1, 0x15 }, OOVPA_END; - -// ****************************************************************** -// * XAPI_4721 -// ****************************************************************** -OOVPATable XAPI_4721[] = { - - // REGISTER_OOVPA(RtlCreateHeap, 3911, PATCH), // obsolete, (* unchanged since 1.0.4361 *) (* OR FARTHER *) - // REGISTER_OOVPA(RtlAllocateHeap, 3911, PATCH), // obsolete (* unchanged since 1.0.4361 *) (* OR FARTHER *) - // REGISTER_OOVPA(RtlReAllocateHeap, 4627, PATCH), // obsolete - // REGISTER_OOVPA(RtlFreeHeap, 4627, PATCH), // obsolete - // REGISTER_OOVPA(RtlSizeHeap, 4627, PATCH), // obsolete - // REGISTER_OOVPA(RtlDestroyHeap, 4627, PATCH), // obsolete - REGISTER_OOVPA(GetTypeInformation, 4134, XREF), - REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), - REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XInputOpen, 4242, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 4242, PATCH), - REGISTER_OOVPA(XInputGetState, 4242, PATCH), - REGISTER_OOVPA(XInputSetState, 4242, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 4242, XREF), - REGISTER_OOVPA(XInputClose, 3911, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 3911, PATCH), - // REGISTER_OOVPA(XapiThreadStartup, 3911, PATCH), // obsolete - // REGISTER_OOVPA(XapiInitProcess, 4361, PATCH), // obsolete, Too High Level - // REGISTER_OOVPA(XapiBootDash, 3911, PATCH), // obsolete - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 4242, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 4721, PATCH), - REGISTER_OOVPA(XMountMURootA, 4242, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(timeSetEvent, 3911, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(XFormatUtilityDrive, 4242, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), -}; - -// ****************************************************************** -// * XAPI_4721_SIZE -// ****************************************************************** -uint32 XAPI_4721_SIZE = sizeof(XAPI_4721); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.inl index 3dfe859e2..007a699ae 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.inl @@ -76,66 +76,3 @@ OOVPA_NO_XREF(XapiInitProcess, 5028, 12) { 0x28, 0x7D }, { 0x29, 0xCC }, OOVPA_END; - -// ****************************************************************** -// * XAPI_5028 -// ****************************************************************** -OOVPATable XAPI_5028[] = { - - REGISTER_OOVPA(XFormatUtilityDrive, 4242, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetTypeInformation, 4134, XREF), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), - REGISTER_OOVPA(XInitDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XInputOpen, 4242, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 4831, XREF), - REGISTER_OOVPA(XInputClose, 3911, PATCH), - REGISTER_OOVPA(XInputGetState, 4831, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 4831, PATCH), - REGISTER_OOVPA(XInputSetState, 4831, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 3911, PATCH), - // REGISTER_OOVPA(XapiThreadStartup, 3911, PATCH), // obsolete? - // REGISTER_OOVPA(XCalculateSignatureBeginEx, 4627, PATCH), // +s, not necessary? - // REGISTER_OOVPA(XCalculateSignatureBegin, 4627, PATCH), - // REGISTER_OOVPA(XCalculateSignatureUpdate, 4627, PATCH), - // REGISTER_OOVPA(XCalculateSignatureEnd, 4627, PATCH), // s+ - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 4721, PATCH), - REGISTER_OOVPA(XGetLaunchInfo, 3911, DISABLED), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(timeSetEvent, 3911, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 5028, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - // REGISTER_OOVPA(XInputGetDeviceDescription, 4831, PATCH), // Was NOT XInputGetDeviceDescription - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - // REGISTER_OOVPA(MoveFileA, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 4242, PATCH), - REGISTER_OOVPA(XGetDeviceEnumerationStatus, 4831, PATCH), - - // ****************************************************************** - // Provisional registration functions in XDK 5028 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(XMountMURootA, 4242, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * XAPI_5028_SIZE -// ****************************************************************** -uint32 XAPI_5028_SIZE = sizeof(XAPI_5028); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl index 214b453ab..369d38b16 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl @@ -93,58 +93,3 @@ OOVPA_NO_XREF(XInputSetState, 5233, 7) { 0x28, 0x88 }, { 0x30, 0xC2 }, OOVPA_END; - -// ****************************************************************** -// * XAPI_5233 -// ****************************************************************** -OOVPATable XAPI_5233[] = { - - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetTypeInformation, 4134, XREF), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), - REGISTER_OOVPA(XInitDevices, 5120, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 5233, PATCH), - REGISTER_OOVPA(XInputOpen, 4242, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 5233, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 4831, XREF), - REGISTER_OOVPA(XInputClose, 3911, PATCH), - REGISTER_OOVPA(XInputGetState, 4831, PATCH), - REGISTER_OOVPA(XInputSetState, 5233, PATCH), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 5028, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 4242, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 4721, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(XFormatUtilityDrive, 4242, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), - REGISTER_OOVPA(XGetDeviceEnumerationStatus, 4831, PATCH), - - // ****************************************************************** - // Provisional registration functions in XDK 5233 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(XMountMURootA, 4242, PATCH), - REGISTER_OOVPA(timeSetEvent, 3911, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * XAPI_5233_SIZE -// ****************************************************************** -uint32 XAPI_5233_SIZE = sizeof(XAPI_5233); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.inl index 8bc4c3373..9a052d331 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.inl @@ -77,53 +77,3 @@ OOVPA_NO_XREF(XLaunchNewImageA, 5344, 11) { 0x30, 0xC2 }, { 0x41, 0xEE }, OOVPA_END; - -// ****************************************************************** -// * XAPI_5344 -// ****************************************************************** -OOVPATable XAPI_5344[] = { - - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetTypeInformation, 4134, XREF), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), - REGISTER_OOVPA(XInitDevices, 5120, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 5233, PATCH), - REGISTER_OOVPA(XInputOpen, 4242, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 5233, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 4831, XREF), - REGISTER_OOVPA(XInputClose, 3911, PATCH), - REGISTER_OOVPA(XInputGetState, 4831, PATCH), - REGISTER_OOVPA(XInputSetState, 5233, PATCH), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 5028, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 4242, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 5344, PATCH), - REGISTER_OOVPA(XMountMURootA, 4242, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(timeSetEvent, 3911, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(XFormatUtilityDrive, 4242, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), - REGISTER_OOVPA(XInputGetDeviceDescription, 4831, PATCH), - REGISTER_OOVPA(XGetDeviceEnumerationStatus, 4831, PATCH), -}; - -// ****************************************************************** -// * XAPI_5344_SIZE -// ****************************************************************** -uint32 XAPI_5344_SIZE = sizeof(XAPI_5344); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl index 907a512d4..3ec3899bd 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl @@ -184,56 +184,3 @@ OOVPA_NO_XREF(XMountAlternateTitleA, 5455, 11) { 0xD0, 0x15 }, OOVPA_END; #endif - -// ****************************************************************** -// * XAPI_5558 -// ****************************************************************** -OOVPATable XAPI_5558[] = { - - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), - REGISTER_OOVPA(XInitDevices, 5120, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 5233, PATCH), - REGISTER_OOVPA(XInputOpen, 4242, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 5455, PATCH), - REGISTER_OOVPA(XInputGetState, 5455, PATCH), - REGISTER_OOVPA(XInputSetState, 5233, PATCH), - // REGISTER_OOVPA(XapiThreadStartup, 3911, PATCH), // obsolete? - REGISTER_OOVPA(XLaunchNewImageA, 5558, PATCH), - REGISTER_OOVPA(XGetLaunchInfo, 3911, DISABLED), - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(SetThreadPriorityBoost, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(GetTypeInformation, 4134, XREF), - REGISTER_OOVPA(XMountMUA, 4242, PATCH), - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(XapiFiberStartup, 3911, DISABLED), - REGISTER_OOVPA(XID_fCloseDevice, 5455, XREF), - REGISTER_OOVPA(XInputClose, 5455, PATCH), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 5455, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XMountMURootA, 4242, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(timeSetEvent, 5455, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(XFormatUtilityDrive, 4242, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), - REGISTER_OOVPA(XInputGetDeviceDescription, 4831, PATCH), - REGISTER_OOVPA(XGetDeviceEnumerationStatus, 4831, PATCH), -}; - -// ****************************************************************** -// * XAPI_5558_SIZE -// ****************************************************************** -uint32 XAPI_5558_SIZE = sizeof(XAPI_5558); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl index 7c148fd90..23ca6e877 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl @@ -119,57 +119,3 @@ OOVPA_NO_XREF(SwitchToThread, 5788, 6) { 0x10, 0x8B }, OOVPA_END; #endif - -// ****************************************************************** -// * XAPI_5788 -// ****************************************************************** -OOVPATable XAPI_5788[] = { - - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), - REGISTER_OOVPA(XInitDevices, 5120, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XInputOpen, 4242, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 5455, PATCH), - REGISTER_OOVPA(XInputGetState, 5455, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 5233, PATCH), // Was PATCH - // REGISTER_OOVPA(XapiThreadStartup, 3911, PATCH), // obsolete? - 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(GetTypeInformation, 4134, XREF), - // REGISTER_OOVPA(GetThreadPriorityBoost, 5788, PATCH), - REGISTER_OOVPA(XMountMUA, 4242, PATCH), - REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED), - REGISTER_OOVPA(RaiseException, 3911, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 5558, PATCH), - REGISTER_OOVPA(XInputSetState, 5233, PATCH), - REGISTER_OOVPA(XGetDeviceEnumerationStatus, 4831, PATCH), - // REGISTER_OOVPA(SwitchToThread, 3911, PATCH), - REGISTER_OOVPA(XFormatUtilityDrive, 4242, PATCH), - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(XID_fCloseDevice, 5455, XREF), - REGISTER_OOVPA(XInputClose, 5455, PATCH), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 5455, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XMountMURootA, 4242, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(timeSetEvent, 5455, PATCH), - REGISTER_OOVPA(timeKillEvent, 3911, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(XInputGetDeviceDescription, 4831, PATCH), -}; - -// ****************************************************************** -// * XAPI_5788_SIZE -// ****************************************************************** -uint32 XAPI_5788_SIZE = sizeof(XAPI_5788); diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl index 79fc8ba35..51a16c7f1 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl @@ -96,55 +96,3 @@ OOVPA_NO_XREF(SwitchToThread, 5849, 6) { 0x10, 0x8B }, OOVPA_END; #endif - -// ****************************************************************** -// * XAPI_5849 -// ****************************************************************** -OOVPATable XAPI_5849[] = { - - REGISTER_OOVPA(SetThreadPriority, 3911, PATCH), - REGISTER_OOVPA(XMountUtilityDrive, 4432, PATCH), - REGISTER_OOVPA(XInitDevices, 5120, PATCH), - REGISTER_OOVPA(XGetDevices, 3911, PATCH), - REGISTER_OOVPA(XInputOpen, 4242, PATCH), - REGISTER_OOVPA(XID_fCloseDevice, 5455, XREF), - REGISTER_OOVPA(XInputClose, 5455, PATCH), - REGISTER_OOVPA(XInputGetCapabilities, 5455, PATCH), - REGISTER_OOVPA(XInputGetState, 5455, PATCH), - REGISTER_OOVPA(XGetDeviceChanges, 5233, PATCH), - // REGISTER_OOVPA(XapiThreadStartup, 3911, PATCH), // obsolete? - REGISTER_OOVPA(QueueUserAPC, 3911, PATCH), - REGISTER_OOVPA(GetThreadPriority, 5788, PATCH), - REGISTER_OOVPA(GetTypeInformation, 4134, XREF), - REGISTER_OOVPA(SetThreadPriorityBoost, 5788, PATCH), - // REGISTER_OOVPA(GetThreadPriorityBoost, 5849, PATCH), - REGISTER_OOVPA(timeSetEvent, 5455, PATCH), - REGISTER_OOVPA(timeKillEvent, 5849, PATCH), - REGISTER_OOVPA(RaiseException, 3911, PATCH), - REGISTER_OOVPA(XLaunchNewImageA, 5558, PATCH), - REGISTER_OOVPA(XInputSetState, 5233, PATCH), - REGISTER_OOVPA(XGetDeviceEnumerationStatus, 4831, PATCH), - // REGISTER_OOVPA(SwitchToThread, 3911, PATCH), - REGISTER_OOVPA(XFormatUtilityDrive, 4242, PATCH), - REGISTER_OOVPA(CreateFiber, 3911, DISABLED), - REGISTER_OOVPA(DeleteFiber, 3911, DISABLED), - REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED), - REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED), - REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH), - REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH), - REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH), - REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH), - REGISTER_OOVPA(XMountAlternateTitleA, 5455, PATCH), - REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH), - REGISTER_OOVPA(XMountMUA, 4242, PATCH), - REGISTER_OOVPA(XMountMURootA, 4242, PATCH), - REGISTER_OOVPA(XInputPoll, 3911, PATCH), - REGISTER_OOVPA(GetOverlappedResult, 3911, PATCH), - REGISTER_OOVPA(XSetProcessQuantumLength, 4134, PATCH), - REGISTER_OOVPA(XInputGetDeviceDescription, 4831, PATCH), -}; - -// ****************************************************************** -// * XAPI_5849_SIZE -// ****************************************************************** -uint32 XAPI_5849_SIZE = sizeof(XAPI_5849); diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp index bae3c97be..040a484c5 100644 --- a/src/CxbxKrnl/HLEIntercept.cpp +++ b/src/CxbxKrnl/HLEIntercept.cpp @@ -347,18 +347,6 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) if (bLLE_APU) continue; } - if (strcmp(LibraryName.c_str(), Lib_XAPILIB) == 0) - { -#if ENABLE_LEGACY_XAPI_DB - // Change a few XAPILIB versions to similar counterparts - if(BuildVersion == 3944) - BuildVersion = 3911; - if(BuildVersion == 3950) - BuildVersion = 3911; - if(OrigBuildVersion == 4531) - BuildVersion = 4627; -#endif - } if (strcmp(LibraryName.c_str(), Lib_XGRAPHC) == 0) { // Skip scanning for XGRAPHC (XG) symbols when LLE GPU is selected From 4dd02587380f654e8caa8bd4e3ca60282a684ded Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Oct 2017 22:58:39 -0500 Subject: [PATCH 07/16] Removed XG v1 Database --- build/win32/Cxbx.vcxproj | 11 -------- build/win32/Cxbx.vcxproj.filters | 33 ------------------------ src/CxbxKrnl/HLEDataBase.cpp | 13 ---------- src/CxbxKrnl/HLEDataBase/XG.1.0.3911.inl | 22 ---------------- src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl | 21 --------------- src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl | 23 ----------------- src/CxbxKrnl/HLEDataBase/XG.1.0.4432.inl | 30 --------------------- src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl | 22 ---------------- src/CxbxKrnl/HLEDataBase/XG.1.0.5028.inl | 27 ------------------- src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl | 22 ---------------- src/CxbxKrnl/HLEDataBase/XG.1.0.5344.inl | 22 ---------------- src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl | 22 ---------------- src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl | 22 ---------------- src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl | 22 ---------------- src/CxbxKrnl/HLEIntercept.cpp | 7 ----- 15 files changed, 319 deletions(-) diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index 3fcb8bc86..20ce51c0d 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -231,17 +231,6 @@ $(SOLUTIONDIR)Export.bat - - - - - - - - - - - diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index aea0fb47b..f6800569c 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -405,39 +405,6 @@ Shared - - HLEDatabase\XG - - - HLEDatabase\XG - - - HLEDatabase\XG - - - HLEDatabase\XG - - - HLEDatabase\XG - - - HLEDatabase\XG - - - HLEDatabase\XG - - - HLEDatabase\XG - - - HLEDatabase\XG - - - HLEDatabase\XG - - - HLEDatabase\XG - HLEDatabase\XOnline diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index 413b6d2ff..036ecffd0 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -87,19 +87,6 @@ const char *Sec_XNET = "XNET"; const HLEData HLEDataBase[] = { -#if ENABLE_LEGACY_XGRAPHC_DB - HLE_ENTRY(Lib_XGRAPHC, XG, 3911), - HLE_ENTRY(Lib_XGRAPHC, XG, 4034), - HLE_ENTRY(Lib_XGRAPHC, XG, 4361), - HLE_ENTRY(Lib_XGRAPHC, XG, 4432), - HLE_ENTRY(Lib_XGRAPHC, XG, 4627), - HLE_ENTRY(Lib_XGRAPHC, XG, 5028), - HLE_ENTRY(Lib_XGRAPHC, XG, 5233), - HLE_ENTRY(Lib_XGRAPHC, XG, 5344), - HLE_ENTRY(Lib_XGRAPHC, XG, 5558), - HLE_ENTRY(Lib_XGRAPHC, XG, 5788), - HLE_ENTRY(Lib_XGRAPHC, XG, 5849), -#endif #if ENABLE_LEGACY_XNETS_DB HLE_ENTRY(Lib_XNETS, XNet, 3911), HLE_ENTRY(Lib_XNETS, XNet, 4627), diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.inl index 26be78802..c96080cc3 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.inl @@ -231,25 +231,3 @@ OOVPA_NO_XREF(XGSetVertexBufferHeader, 3911, 13) { 0x11, 0xC2 }, { 0x12, 0x18 }, OOVPA_END; - -// ****************************************************************** -// * XG_3911 -// ****************************************************************** -OOVPATable XG_3911[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 3911, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 3911, XREF), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), -}; - -// ****************************************************************** -// * XG_3911_SIZE -// ****************************************************************** -uint32 XG_3911_SIZE = sizeof(XG_3911); \ No newline at end of file diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl index 46224f51b..1c773ff2f 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl @@ -32,24 +32,3 @@ // * // ****************************************************************** -// ****************************************************************** -// * XG_4034 -// ****************************************************************** -OOVPATable XG_4034[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 3911, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 3911, XREF), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), -}; - -// ****************************************************************** -// * XG_4034_SIZE -// ****************************************************************** -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 ae1f6e6d6..2644104d2 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl @@ -156,26 +156,3 @@ OOVPA_NO_XREF(XFONT_OpenBitmapFontFromMemory, 4361, 8) { 0x59, 0x45 }, { 0x66, 0x0C }, OOVPA_END; - -// ****************************************************************** -// * XG_4361 -// ****************************************************************** -OOVPATable XG_4361[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), - REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 4361, XREF), -}; - -// ****************************************************************** -// * XG_4361_SIZE -// ****************************************************************** -uint32 XG_4361_SIZE = sizeof(XG_4361); diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.inl index 39772642c..9973d9e53 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.inl @@ -32,33 +32,3 @@ // * // ****************************************************************** - - -// ****************************************************************** -// * XG_4432 -// ****************************************************************** -OOVPATable XG_4432[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), - - // ****************************************************************** - // Provisional registration functions in XDK 4432 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 4361, XREF), - // ****************************************************************** -}; - -// ****************************************************************** -// * XG_4432_SIZE -// ****************************************************************** -uint32 XG_4432_SIZE = sizeof(XG_4432); diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl index 29faf2fed..f9e1b0666 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl @@ -72,25 +72,3 @@ OOVPA_NO_XREF(XGWriteSurfaceOrTextureToXPR, 4627, 7) { 0xE2, 0x8B }, OOVPA_END; #endif -// ****************************************************************** -// * XG_4627 -// ****************************************************************** -OOVPATable XG_4627[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), - REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 4361, XREF), -}; - -// ****************************************************************** -// * XG_4627_SIZE -// ****************************************************************** -uint32 XG_4627_SIZE = sizeof(XG_4627); diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.inl index 2576e8db7..eb323944f 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.inl @@ -32,30 +32,3 @@ // * // ****************************************************************** -// ****************************************************************** -// * XG_5028 -// ****************************************************************** -OOVPATable XG_5028[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), - REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 4361, XREF), - - // ****************************************************************** - // Provisional registration functions in XDK 5028 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - // ****************************************************************** -}; -// ****************************************************************** -// * XG_5028_SIZE -// ****************************************************************** -uint32 XG_5028_SIZE = sizeof(XG_5028); diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl index 94be2358d..54c5bc2e1 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl @@ -32,25 +32,3 @@ // * // ****************************************************************** -// ****************************************************************** -// * XG_5233 -// ****************************************************************** -OOVPATable XG_5233[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), - REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 4361, XREF), -}; - -// ****************************************************************** -// * XG_5233_SIZE -// ****************************************************************** -uint32 XG_5233_SIZE = sizeof(XG_5233); diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5344.inl index ac32843d0..a17e3a2a1 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5344.inl @@ -32,25 +32,3 @@ // * // ****************************************************************** -// ****************************************************************** -// * XG_5344 -// ****************************************************************** -OOVPATable XG_5344[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), - REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 4361, XREF), -}; - -// ****************************************************************** -// * XG_5344_SIZE -// ****************************************************************** -uint32 XG_5344_SIZE = sizeof(XG_5344); diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl index 60453b26d..f10557cdc 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl @@ -62,25 +62,3 @@ OOVPA_NO_XREF(XGUnswizzleBox, 5558, 8) { 0xFE, 0x20 }, OOVPA_END; #endif -// ****************************************************************** -// * XG_5558 -// ****************************************************************** -OOVPATable XG_5558[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), - REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 4361, XREF), -}; - -// ****************************************************************** -// * XG_5558_SIZE -// ****************************************************************** -uint32 XG_5558_SIZE = sizeof(XG_5558); diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl index eb35a12a9..5bdbae994 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl @@ -49,25 +49,3 @@ OOVPA_NO_XREF(XFONT_OpenBitmapFontFromMemory, 5788, 8) OOVPA_END; #endif -// ****************************************************************** -// * XG_5788 -// ****************************************************************** -OOVPATable XG_5788[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), - REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 4361, XREF), -}; - -// ****************************************************************** -// * XG_5788_SIZE -// ****************************************************************** -uint32 XG_5788_SIZE = sizeof(XG_5788); diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl index 9b9fbe55b..6dc7af2a5 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl @@ -32,25 +32,3 @@ // * // ****************************************************************** -// ****************************************************************** -// * XG_5849 -// ****************************************************************** -OOVPATable XG_5849[] = { - - REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH), - // REGISTER_OOVPA(XGSwizzleRect, 3911, DISABLED), // TODO : Uncomment - // REGISTER_OOVPA(XGUnswizzleRect, 3911, DISABLED), // TODO : Uncomment - REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH), - REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH), - REGISTER_OOVPA(XGSetTextureHeader, 3911, PATCH), - REGISTER_OOVPA(XGSetVertexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGSetIndexBufferHeader, 4134, XREF), - REGISTER_OOVPA(XGCompressRect, 3911, XREF), - REGISTER_OOVPA(XGUnswizzleBox, 3911, DISABLED), - REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 4361, XREF), -}; - -// ****************************************************************** -// * XG_5849_SIZE -// ****************************************************************** -uint32 XG_5849_SIZE = sizeof(XG_5849); diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp index 040a484c5..33da58e41 100644 --- a/src/CxbxKrnl/HLEIntercept.cpp +++ b/src/CxbxKrnl/HLEIntercept.cpp @@ -352,13 +352,6 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) // Skip scanning for XGRAPHC (XG) symbols when LLE GPU is selected if (bLLE_GPU) continue; - -#if ENABLE_LEGACY_XGRAPHC_DB - if (BuildVersion == 3944) - BuildVersion = 3911; - if (OrigBuildVersion == 4531) - BuildVersion = 4361; -#endif } if (strcmp(LibraryName.c_str(), Lib_XACTENG) == 0) { From 52fdebbcde433936c784887022ae46403c9e121e Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Oct 2017 23:02:43 -0500 Subject: [PATCH 08/16] Removed XNet v1 Database --- build/win32/Cxbx.vcxproj | 2 -- build/win32/Cxbx.vcxproj.filters | 6 ------ src/CxbxKrnl/HLEDataBase.cpp | 4 ---- src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl | 23 ---------------------- src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl | 22 --------------------- 5 files changed, 57 deletions(-) diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index 20ce51c0d..c5dbb70f8 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -231,8 +231,6 @@ $(SOLUTIONDIR)Export.bat - - diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index f6800569c..c97391612 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -243,12 +243,6 @@ EmuD3D8 - - HLEDatabase\XNet - - - HLEDatabase\XNet - Kernel diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index 036ecffd0..704bd2c2b 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -87,10 +87,6 @@ const char *Sec_XNET = "XNET"; const HLEData HLEDataBase[] = { -#if ENABLE_LEGACY_XNETS_DB - HLE_ENTRY(Lib_XNETS, XNet, 3911), - HLE_ENTRY(Lib_XNETS, XNet, 4627), -#endif HLE_ENTRY(Lib_XONLINE, XOnline, 4361), // TODO : Typo for XONLINES? diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl index 38e06c78b..d4c51f615 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl @@ -318,26 +318,3 @@ OOVPA_NO_XREF(recv, 3911, 14) { 0x12, 0x00 }, { 0x1A, 0x00 }, OOVPA_END; - -// ****************************************************************** -// * XNet_3911 -// ****************************************************************** -OOVPATable XNet_3911[] = { - - REGISTER_OOVPA(XnInit, 3911, XREF), - REGISTER_OOVPA(XNetStartup, 3911, PATCH), - REGISTER_OOVPA(WSAStartup, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 3911, PATCH), - REGISTER_OOVPA(socket, 3911, PATCH), - REGISTER_OOVPA(bind, 3911, PATCH), - REGISTER_OOVPA(listen, 3911, PATCH), - REGISTER_OOVPA(ioctlsocket, 3911, PATCH), - REGISTER_OOVPA(connect, 3911, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), -}; - -// ****************************************************************** -// * XNet_3911_SIZE -// ****************************************************************** -uint32 XNet_3911_SIZE = sizeof(XNet_3911); diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl index cb1b9b4c9..f86005f74 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl @@ -434,25 +434,3 @@ OOVPA_NO_XREF(XNetGetEthernetLinkStatus, 4627, 8) { 0x3D, 0x24 }, { 0x46, 0x5B }, OOVPA_END; - -// ****************************************************************** -// * XNet_4627 -// ****************************************************************** -OOVPATable XNet_4627[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 4627, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(connect, 4627, PATCH), - REGISTER_OOVPA(send, 4627, PATCH), - REGISTER_OOVPA(recv, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), -}; - -// ****************************************************************** -// * XNet_4627_SIZE -// ****************************************************************** -uint32 XNet_4627_SIZE = sizeof(XNet_4627); From fabc87fc7024a3c40babb5bc5722fa674b7a2e21 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Oct 2017 23:15:02 -0500 Subject: [PATCH 09/16] Removed XOnlines v1 Database --- build/win32/Cxbx.vcxproj | 8 ------ build/win32/Cxbx.vcxproj.filters | 24 ---------------- src/CxbxKrnl/HLEDataBase.cpp | 11 -------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl | 25 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl | 26 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.inl | 26 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl | 26 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl | 25 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl | 28 ------------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl | 26 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl | 26 ----------------- 11 files changed, 251 deletions(-) diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index c5dbb70f8..07c8431e2 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -231,14 +231,6 @@ $(SOLUTIONDIR)Export.bat - - - - - - - - diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index c97391612..a8969c44c 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -399,30 +399,6 @@ Shared - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index 704bd2c2b..5e9a1b97d 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -89,17 +89,6 @@ const HLEData HLEDataBase[] = { HLE_ENTRY(Lib_XONLINE, XOnline, 4361), // TODO : Typo for XONLINES? - -#if ENABLE_LEGACY_XONLINES_DB - // TODO: Verify differences between XONLINE and XONLINES (if any) - HLE_ENTRY(Lib_XONLINES, XOnline, 4627), - HLE_ENTRY(Lib_XONLINES, XOnline, 5028), - HLE_ENTRY(Lib_XONLINES, XOnline, 5233), - HLE_ENTRY(Lib_XONLINES, XOnline, 5344), - HLE_ENTRY(Lib_XONLINES, XOnline, 5558), - HLE_ENTRY(Lib_XONLINES, XOnline, 5788), - HLE_ENTRY(Lib_XONLINES, XOnline, 5849), -#endif }; const HLEDataV2 HLEDataBaseV2[] = { diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl index 3ba8ac52b..6e6be42b4 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl @@ -273,28 +273,3 @@ OOVPA_NO_XREF(XNetGetEthernetLinkStatus, 4361, 13) { 0x2C, 0x15 }, OOVPA_END; #endif - -// ****************************************************************** -// * XOnline_4361 -// ****************************************************************** -OOVPATable XOnline_4361[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(CXo_XOnlineLogon, 4361, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 3911, PATCH), - REGISTER_OOVPA(socket, 3911, PATCH), - REGISTER_OOVPA(bind, 3911, PATCH), - REGISTER_OOVPA(listen, 3911, PATCH), - REGISTER_OOVPA(ioctlsocket, 3911, PATCH), - REGISTER_OOVPA(connect, 3911, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), -}; - -// ****************************************************************** -// * XOnline_4361_SIZE -// ****************************************************************** -uint32 XOnline_4361_SIZE = sizeof(XOnline_4361); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl index fe2ace301..89543d713 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl @@ -144,29 +144,3 @@ OOVPA_XREF(CXo_XOnlineLogon, 4627, 13, { 0x43, 0x68 }, { 0x44, 0x68 }, OOVPA_END; - -// ****************************************************************** -// * XOnline_4627 -// ****************************************************************** -OOVPATable XOnline_4627[] ={ - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 4627, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 3911, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 4627, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 4627, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_4627_SIZE -// ****************************************************************** -uint32 XOnline_4627_SIZE = sizeof(XOnline_4627); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.inl index 56fef6b74..5ecfa42f6 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.inl @@ -58,29 +58,3 @@ OOVPA_XREF(CXo_XOnlineLogon, 5028, 15, { 0x2B, 0x80 }, { 0x2C, 0xE9 }, OOVPA_END; - -// ****************************************************************** -// * XOnline_5028 -// ****************************************************************** -OOVPATable XOnline_5028[] ={ - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 4627, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 3911, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 4627, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 4831, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5028_SIZE -// ****************************************************************** -uint32 XOnline_5028_SIZE = sizeof(XOnline_5028); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl index 68b465b03..6680463fd 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl @@ -109,29 +109,3 @@ OOVPA_NO_XREF(connect, 5233, 12) // Up to 5849 { 0x61, 0xE8 }, OOVPA_END; #endif - -// ****************************************************************** -// * XOnline_5233 -// ****************************************************************** -OOVPATable XOnline_5233[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 4627, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 5120, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 4627, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 5233, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5233_SIZE -// ****************************************************************** -uint32 XOnline_5233_SIZE = sizeof(XOnline_5233); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl index dd8357d9a..224aae36a 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl @@ -32,28 +32,3 @@ // * // ****************************************************************** -// ****************************************************************** -// * XOnline_5344 -// ****************************************************************** -OOVPATable XOnline_5344[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 4627, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 5120, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 4627, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 5233, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5344_SIZE -// ****************************************************************** -uint32 XOnline_5344_SIZE = sizeof(XOnline_5344); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl index 7e41decfc..dac28b8de 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl @@ -113,31 +113,3 @@ OOVPA_XREF(XOnlineLogon, 5558, 8, { 0x0A, 0xE9 }, OOVPA_END; #endif - -// ****************************************************************** -// * XOnline_5558 -// ****************************************************************** -// * TODO: Verify all of these -// ****************************************************************** -OOVPATable XOnline_5558[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 5455, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 5120, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 4627, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 5455, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5558_SIZE -// ****************************************************************** -uint32 XOnline_5558_SIZE = sizeof(XOnline_5558); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl index af43a697c..07e72c236 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl @@ -78,29 +78,3 @@ OOVPA_XREF(XoUpdateLaunchNewImageInternal, 5788, 16, { 0x6E, 0xEB }, { 0x88, 0x3D }, OOVPA_END; - -// ****************************************************************** -// * XOnline_5788 -// ****************************************************************** -OOVPATable XOnline_5788[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(socket, 5455, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 5120, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 5788, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 5455, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5788_SIZE -// ****************************************************************** -uint32 XOnline_5788_SIZE = sizeof(XOnline_5788); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl index e979acf4e..f9d1fb604 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl @@ -58,29 +58,3 @@ OOVPA_XREF(CXo_XOnlineLogon, 5849, 15, { 0x41, 0x80 }, { 0x42, 0xE9 }, OOVPA_END; - -// ****************************************************************** -// * XOnline_5849 -// ****************************************************************** -OOVPATable XOnline_5849[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 5788, XREF), - REGISTER_OOVPA(socket, 5455, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 5120, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(CXo_XOnlineLogon, 5849, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5849_SIZE -// ****************************************************************** -uint32 XOnline_5849_SIZE = sizeof(XOnline_5849); From 65162b7fe5310f8f18ecabef225f305b30e402f7 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Tue, 24 Oct 2017 00:00:40 -0500 Subject: [PATCH 10/16] Add XOnline and XNet v2 Database --- src/CxbxKrnl/HLEDataBase.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index 5e9a1b97d..c4d9f2388 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -58,6 +58,7 @@ const char *Sec_XPP = "XPP"; const char *Sec_text = ".text"; const char *Lib_XGRAPHC = "XGRAPHC"; const char *Sec_XGRPH = "XGRPH"; +const char *Lib_XNET = "XNET"; const char *Lib_XNETN = "XNETN"; const char *Lib_XNETS = "XNETS"; const char *Lib_XONLINE = "XONLINE"; // TODO : Typo for XONLINES? @@ -122,12 +123,17 @@ const HLEDataV2 HLEDataBaseV2[] = { // Cannot support LTCG in HLE //{ Lib_XGRAPHCL,{ Sec_XGRPH }, XGRAPHC_OOVPAV2, XGRAPHC_OOVPA_SIZEV2 }, - // - //{ Lib_XONLINE,{ Sec_XONLINE }, XONLINES_OOVPAV2, XONLINES_OOVPA_SIZEV2 }, + // Added Sec_text and Sec_XNET just in case. + // TODO: Need to find out which function is only part of XOnlines. + { Lib_XONLINE,{ Sec_text, Sec_XONLINE, Sec_XNET }, XONLINES_OOVPAV2, XONLINES_OOVPA_SIZEV2 }, // Fun fact, XONLINES are split into 2 header sections. { Lib_XONLINES,{ Sec_text, Sec_XONLINE, Sec_XNET }, XONLINES_OOVPAV2, XONLINES_OOVPA_SIZEV2 }, + // Added Sec_text just in case. + // TODO: Need to find out which function is only part of XNets. + { Lib_XNET,{ Sec_text, Sec_XNET }, XNET_OOVPAV2, XNET_OOVPA_SIZEV2 }, + // XNETS only has XNET, might be true. { Lib_XNETS,{ Sec_text, Sec_XNET }, XNET_OOVPAV2, XNET_OOVPA_SIZEV2 }, From c8d12a78ec95cc3822df11cc8c89b88aa9a5a6c3 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Tue, 24 Oct 2017 00:03:34 -0500 Subject: [PATCH 11/16] Removed All HLE v1 Database Header Files --- src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.h | 45 -------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.h | 47 --------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.h | 45 -------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.h | 46 -------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4242.h | 44 ------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.h | 46 -------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.h | 44 ------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.h | 46 -------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.3911.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.4034.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.4361.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.4432.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.4627.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.5028.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.5233.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.5344.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.5558.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.5788.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XG.1.0.5849.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XactEng.1.0.5558.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XactEng.1.0.5788.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/XactEng.1.0.5849.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.h | 42 ------------------ src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.h | 42 ------------------ 66 files changed, 2799 deletions(-) delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4242.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.h delete mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.h delete mode 100644 src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.3911.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.4034.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.4361.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.4432.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.4627.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.5028.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.5233.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.5344.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.5558.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.5788.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XG.1.0.5849.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XactEng.1.0.5558.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XactEng.1.0.5788.h delete mode 100644 src/CxbxKrnl/HLEDataBase/XactEng.1.0.5849.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.h delete mode 100644 src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.h diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.h deleted file mode 100644 index 9abaf81a7..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.h +++ /dev/null @@ -1,45 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.3911.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2017 jarupxx -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_3911_H -#define D3D8_3911_H - -#include "OOVPA.h" - -extern LOOVPA<1+11> D3DDevice_SetTextureState_TexCoordIndex_3911; -extern LOOVPA<2+15> D3DDevice_SetRenderState_CullMode_3911; - -extern OOVPATable D3D8_3911[]; -extern uint32 D3D8_3911_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.h deleted file mode 100644 index f472c11bb..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.h +++ /dev/null @@ -1,47 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.3925.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_3925_H -#define D3D8_3925_H - -#include "OOVPA.h" - -#if 0 // Moved to 3911 -extern LOOVPA<1+11> D3DDevice_SetTextureState_TexCoordIndex_3925; -extern LOOVPA<2+15> D3DDevice_SetRenderState_CullMode_3925; -#endif - -extern OOVPATable D3D8_3925[]; -extern uint32 D3D8_3925_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.h deleted file mode 100644 index bb742ccbe..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.h +++ /dev/null @@ -1,45 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.4034.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_4034_H -#define D3D8_4034_H - -#include "OOVPA.h" - -extern LOOVPA<1+10> D3DDevice_SetTextureState_TexCoordIndex_4034; -extern LOOVPA<2+14> D3DDevice_SetRenderState_CullMode_4034; - -extern OOVPATable D3D8_4034[]; -extern uint32 D3D8_4034_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.h deleted file mode 100644 index 56e5a313b..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.h +++ /dev/null @@ -1,46 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.4134.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_4134_H -#define D3D8_4134_H - -#include "OOVPA.h" - -#if 0 // Moved to 4034 -extern LOOVPA<1+10> D3DDevice_SetTextureState_TexCoordIndex_4134; -#endif - -extern OOVPATable D3D8_4134[]; -extern uint32 D3D8_4134_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4242.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4242.h deleted file mode 100644 index 521703f3a..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4242.h +++ /dev/null @@ -1,44 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.4242.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2017 jarupxx -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_4242_H -#define D3D8_4242_H - -#include "OOVPA.h" - -extern LOOVPA<1+10> D3DDevice_SetTextureState_TexCoordIndex_4242; - -extern OOVPATable D3D8_4242[]; -extern uint32 D3D8_4242_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.h deleted file mode 100644 index 7a0019805..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.h +++ /dev/null @@ -1,46 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.4361.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_4361_H -#define D3D8_4361_H - -#include "OOVPA.h" - -#if 0 // Moved to 4242 -extern LOOVPA<1+10> D3DDevice_SetTextureState_TexCoordIndex_4242; -#endif - -extern OOVPATable D3D8_4361[]; -extern uint32 D3D8_4361_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.h deleted file mode 100644 index dcbc6d703..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.4432.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_4432_H -#define D3D8_4432_H - -#include "OOVPA.h" - -extern OOVPATable D3D8_4432[]; -extern uint32 D3D8_4432_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.h deleted file mode 100644 index c399b5634..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.h +++ /dev/null @@ -1,44 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.4627.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_4627_H -#define D3D8_4627_H - -#include "OOVPA.h" - -extern LOOVPA<1+10> D3DDevice_SetTextureState_TexCoordIndex_4627; - -extern OOVPATable D3D8_4627[]; -extern uint32 D3D8_4627_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.h deleted file mode 100644 index be60626ec..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.5028.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_5028_H -#define D3D8_5028_H - -#include "OOVPA.h" - -extern OOVPATable D3D8_5028[]; -extern uint32 D3D8_5028_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.h deleted file mode 100644 index 5642fa50a..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.h +++ /dev/null @@ -1,46 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.5233.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_5233_H -#define D3D8_5233_H - -#include "OOVPA.h" - -#if 0 // No longer used, replaced by generic 4034 version -extern LOOVPA<2+13> D3DDevice_SetRenderState_CullMode_5233; -#endif - -extern OOVPATable D3D8_5233[]; -extern uint32 D3D8_5233_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.h deleted file mode 100644 index 7ed2ba3ac..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.5344.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_5344_H -#define D3D8_5344_H - -#include "OOVPA.h" - -extern OOVPATable D3D8_5344[]; -extern uint32 D3D8_5344_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.h deleted file mode 100644 index 2cb03fc63..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.5558.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_5558_H -#define D3D8_5558_H - -#include "OOVPA.h" - -extern OOVPATable D3D8_5558[]; -extern uint32 D3D8_5558_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.h deleted file mode 100644 index 32001ddd2..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.5788.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_5788_H -#define D3D8_5788_H - -#include "OOVPA.h" - -extern OOVPATable D3D8_5788[]; -extern uint32 D3D8_5788_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.h deleted file mode 100644 index be4bfbd8a..000000000 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.5849.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef D3D8_5849_H -#define D3D8_5849_H - -#include "OOVPA.h" - -extern OOVPATable D3D8_5849[]; -extern uint32 D3D8_5849_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.h deleted file mode 100644 index fcc4ccf2c..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.3936.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * u -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSOUND_3936_H -#define DSOUND_3936_H - -#include "OOVPA.h" - -extern OOVPATable DSOUND_3936[]; -extern uint32 DSOUND_3936_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.h deleted file mode 100644 index 8818dc03f..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.4134.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSOUND_4134_H -#define DSOUND_4134_H - -#include "OOVPA.h" - -extern OOVPATable DSOUND_4134[]; -extern uint32 DSOUND_4134_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.h deleted file mode 100644 index 859d8df5f..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.4361.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSOUND_4361_H -#define DSOUND_4361_H - -#include "OOVPA.h" - -extern OOVPATable DSOUND_4361[]; -extern uint32 DSOUND_4361_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.h deleted file mode 100644 index 90d842e42..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.4432.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSOUND_4432_H -#define DSOUND_4432_H - -#include "OOVPA.h" - -extern OOVPATable DSOUND_4432[]; -extern uint32 DSOUND_4432_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.h deleted file mode 100644 index 15da6cb24..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.4627.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSOUND_4627_H -#define DSOUND_4627_H - -#include "OOVPA.h" - -extern OOVPATable DSOUND_4627[]; -extern uint32 DSOUND_4627_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.h deleted file mode 100644 index 92b7e9499..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.5028.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSOUND_5028_H -#define DSOUND_5028_H - -#include "OOVPA.h" - -extern OOVPATable DSOUND_5028[]; -extern uint32 DSOUND_5028_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.h deleted file mode 100644 index 207d89f18..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.5233.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSOUND_5233_H -#define DSOUND_5233_H - -#include "OOVPA.h" - -extern OOVPATable DSOUND_5233[]; -extern uint32 DSOUND_5233_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.h deleted file mode 100644 index fad83a909..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.5344.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSound_5344_H -#define DSound_5344_H - -#include "OOVPA.h" - -extern OOVPATable DSound_5344[]; -extern uint32 DSound_5344_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.h deleted file mode 100644 index e1821b79a..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.5558.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSOUND_5558_H -#define DSOUND_5558_H - -#include "OOVPA.h" - -extern OOVPATable DSOUND_5558[]; -extern uint32 DSOUND_5558_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.h deleted file mode 100644 index b24f4c7ad..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.5788.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSOUND_5788_H -#define DSOUND_5788_H - -#include "OOVPA.h" - -extern OOVPATable DSOUND_5788[]; -extern uint32 DSOUND_5788_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.h b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.h deleted file mode 100644 index e4fdaa815..000000000 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->DSound.1.0.5849.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef DSOUND_5849_H -#define DSOUND_5849_H - -#include "OOVPA.h" - -extern OOVPATable DSOUND_5849[]; -extern uint32 DSOUND_5849_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.h deleted file mode 100644 index 13d43eafc..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.3911.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_3911_H -#define XG_3911_H - -#include "OOVPA.h" - -extern OOVPATable XG_3911[]; -extern uint32 XG_3911_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.h deleted file mode 100644 index eea908f68..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.4034.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_4034_H -#define XG_4034_H - -#include "OOVPA.h" - -extern OOVPATable XG_4034[]; -extern uint32 XG_4034_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.h deleted file mode 100644 index 7a56b01c3..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.4361.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_4361_H -#define XG_4361_H - -#include "OOVPA.h" - -extern OOVPATable XG_4361[]; -extern uint32 XG_4361_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.h deleted file mode 100644 index 67bdb468a..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.4432.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_4432_H -#define XG_4432_H - -#include "OOVPA.h" - -extern OOVPATable XG_4432[]; -extern uint32 XG_4432_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.h deleted file mode 100644 index ae23e33bc..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.4627.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_4627_H -#define XG_4627_H - -#include "OOVPA.h" - -extern OOVPATable XG_4627[]; -extern uint32 XG_4627_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.h deleted file mode 100644 index 8f3347aff..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5028.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.5028.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_5028_H -#define XG_5028_H - -#include "OOVPA.h" - -extern OOVPATable XG_5028[]; -extern uint32 XG_5028_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.h deleted file mode 100644 index 1a2e01f9d..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.5233.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_5233_H -#define XG_5233_H - -#include "OOVPA.h" - -extern OOVPATable XG_5233[]; -extern uint32 XG_5233_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5344.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.5344.h deleted file mode 100644 index 2a614cba1..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5344.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.5344.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_5344_H -#define XG_5344_H - -#include "OOVPA.h" - -extern OOVPATable XG_5344[]; -extern uint32 XG_5344_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.h deleted file mode 100644 index e049c76e6..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.5558.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_5558_H -#define XG_5558_H - -#include "OOVPA.h" - -extern OOVPATable XG_5558[]; -extern uint32 XG_5558_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.h deleted file mode 100644 index 796c6e362..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.5788.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_5788_H -#define XG_5788_H - -#include "OOVPA.h" - -extern OOVPATable XG_5788[]; -extern uint32 XG_5788_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.h b/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.h deleted file mode 100644 index e8442ff0a..000000000 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XG.1.0.5849.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XG_5849_H -#define XG_5849_H - -#include "OOVPA.h" - -extern OOVPATable XG_5849[]; -extern uint32 XG_5849_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.h b/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.h deleted file mode 100644 index fbb9586ac..000000000 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XNet.1.0.3911.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XNET_4627_H -#define XNET_4627_H - -#include "OOVPA.h" - -extern OOVPATable XNet_3911[]; -extern uint32 XNet_3911_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.h b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.h deleted file mode 100644 index f53ae332a..000000000 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XNet.1.0.4627.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XNET_4627_H -#define XNET_4627_H - -#include "OOVPA.h" - -extern OOVPATable XNet_4627[]; -extern uint32 XNet_4627_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.h b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.h deleted file mode 100644 index 18b5f4237..000000000 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XOnline.1.0.4361.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XONLINE_4361_H -#define XONLINE_4361_H - -#include "OOVPA.h" - -extern OOVPATable XOnline_4361[]; -extern uint32 XOnline_4361_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.h b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.h deleted file mode 100644 index 70822dd02..000000000 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XOnline.1.0.4627.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XONLINE_4627_H -#define XONLINE_4627_H - -#include "OOVPA.h" - -extern OOVPATable XOnline_4627[]; -extern uint32 XOnline_4627_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.h b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.h deleted file mode 100644 index 76976640e..000000000 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XOnline.1.0.5028.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XONLINE_5028_H -#define XONLINE_5028_H - -#include "OOVPA.h" - -extern OOVPATable XOnline_5028[]; -extern uint32 XOnline_5028_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.h b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.h deleted file mode 100644 index b8f123d89..000000000 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XOnline.1.0.5233.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XONLINE_5233_H -#define XONLINE_5233_H - -#include "OOVPA.h" - -extern OOVPATable XOnline_5233[]; -extern uint32 XOnline_5233_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.h b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.h deleted file mode 100644 index b96941ad2..000000000 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XOnline.1.0.5344.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XONLINE_5344_H -#define XONLINE_5344_H - -#include "OOVPA.h" - -extern OOVPATable XOnline_5344[]; -extern uint32 XOnline_5344_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.h b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.h deleted file mode 100644 index 71c24bfdc..000000000 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XOnline.1.0.5558.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XONLINE_5558_H -#define XONLINE_5558_H - -#include "OOVPA.h" - -extern OOVPATable XOnline_5558[]; -extern uint32 XOnline_5558_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.h b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.h deleted file mode 100644 index 2263990b4..000000000 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XOnline.1.0.5788.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XONLINE_5788_H -#define XONLINE_5788_H - -#include "OOVPA.h" - -extern OOVPATable XOnline_5788[]; -extern uint32 XOnline_5788_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.h b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.h deleted file mode 100644 index 6a9c8046d..000000000 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XOnline.1.0.5849.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XONLINE_5849_H -#define XONLINE_5849_H - -#include "OOVPA.h" - -extern OOVPATable XOnline_5849[]; -extern uint32 XOnline_5849_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.h b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.h deleted file mode 100644 index 9ed745963..000000000 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XactEng.1.0.4627.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XACTENG_4627_H -#define XACTENG_4627_H - -#include "OOVPA.h" - -extern OOVPATable XactEng_4627[]; -extern uint32 XactEng_4627_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.h b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.h deleted file mode 100644 index 53ccca85f..000000000 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XactEng.1.0.4928.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XACTENG_4928_H -#define XACTENG_4928_H - -#include "OOVPA.h" - -extern OOVPATable XactEng_4928[]; -extern uint32 XactEng_4928_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.h b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.h deleted file mode 100644 index 79c23d1ea..000000000 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XactEng.1.0.5233.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XACTENG_5233_H -#define XACTENG_5233_H - -#include "OOVPA.h" - -extern OOVPATable XactEng_5233[]; -extern uint32 XactEng_5233_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.h b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.h deleted file mode 100644 index ab1a3c121..000000000 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XactEng.1.0.5344.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XACTENG_5344_H -#define XACTENG_5344_H - -#include "OOVPA.h" - -extern OOVPATable XactEng_5344[]; -extern uint32 XactEng_5344_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5558.h b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5558.h deleted file mode 100644 index 3dfdd636f..000000000 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5558.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XactEng.1.0.5558.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XACTENG_5558_H -#define XACTENG_5558_H - -#include "OOVPA.h" - -extern OOVPATable XactEng_5558[]; -extern uint32 XactEng_5558_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5788.h b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5788.h deleted file mode 100644 index 8097dc116..000000000 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5788.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XactEng.1.0.5788.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XACTENG_5788_H -#define XACTENG_5788_H - -#include "OOVPA.h" - -extern OOVPATable XactEng_5788[]; -extern uint32 XactEng_5788_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5849.h b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5849.h deleted file mode 100644 index 80ab48251..000000000 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5849.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->XactEng.1.0.5849.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XACTENG_5849_H -#define XACTENG_5849_H - -#include "OOVPA.h" - -extern OOVPATable XactEng_5849[]; -extern uint32 XactEng_5849_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.h deleted file mode 100644 index 93f9cf9b7..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.3911.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_3911_H -#define XAPI_3911_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_3911[]; -extern uint32 XAPI_3911_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.h deleted file mode 100644 index 40da67fb9..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.4034.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_4034_H -#define XAPI_4034_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_4034[]; -extern uint32 XAPI_4034_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.h deleted file mode 100644 index 3447adde3..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.4134.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_4134_H -#define XAPI_4134_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_4134[]; -extern uint32 XAPI_4134_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.h deleted file mode 100644 index ef477970d..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.4361.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_4361_H -#define XAPI_4361_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_4361[]; -extern uint32 XAPI_4361_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.h deleted file mode 100644 index ef9787837..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.4432.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_4432_H -#define XAPI_4432_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_4432[]; -extern uint32 XAPI_4432_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.h deleted file mode 100644 index 5c6d075f0..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.4627.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_4627_H -#define XAPI_4627_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_4627[]; -extern uint32 XAPI_4627_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.h deleted file mode 100644 index a7486b2ca..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.4721.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_4721_H -#define XAPI_4721_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_4721[]; -extern uint32 XAPI_4721_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.h deleted file mode 100644 index 13a687bd0..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.5028.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_5028_H -#define XAPI_5028_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_5028[]; -extern uint32 XAPI_5028_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.h deleted file mode 100644 index 7f7585318..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.5233.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_5233_H -#define XAPI_5233_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_5233[]; -extern uint32 XAPI_5233_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.h deleted file mode 100644 index 890a9f34f..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5344.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.5233.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_5344_H -#define XAPI_5344_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_5344[]; -extern uint32 XAPI_5344_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.h deleted file mode 100644 index 5a56bbeff..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.5558.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_5558_H -#define XAPI_5558_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_5558[]; -extern uint32 XAPI_5558_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.h deleted file mode 100644 index e6606b39e..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.5788.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_5788_H -#define XAPI_5788_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_5788[]; -extern uint32 XAPI_5788_SIZE; - -#endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.h b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.h deleted file mode 100644 index dbfc2fa94..000000000 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.h +++ /dev/null @@ -1,42 +0,0 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.5849.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef XAPI_5849_H -#define XAPI_5849_H - -#include "OOVPA.h" - -extern OOVPATable XAPI_5849[]; -extern uint32 XAPI_5849_SIZE; - -#endif From 71aabebe27a82dae85bc7343b17040a6e0b2327b Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Tue, 24 Oct 2017 00:09:50 -0500 Subject: [PATCH 12/16] Append to Previous Commit --- src/CxbxKrnl/HLEDataBase.h | 54 -------------------------------------- 1 file changed, 54 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h index 40572a103..61cd461ec 100644 --- a/src/CxbxKrnl/HLEDataBase.h +++ b/src/CxbxKrnl/HLEDataBase.h @@ -34,60 +34,6 @@ #ifndef HLEDATABASE_H #define HLEDATABASE_H -#include "HLEDataBase/Xapi.1.0.3911.h" -#include "HLEDataBase/Xapi.1.0.4034.h" -#include "HLEDataBase/Xapi.1.0.4134.h" -#include "HLEDataBase/Xapi.1.0.4361.h" -#include "HLEDataBase/Xapi.1.0.4432.h" -#include "HLEDataBase/Xapi.1.0.4627.h" -#include "HLEDataBase/Xapi.1.0.5028.h" -#include "HLEDataBase/Xapi.1.0.5233.h" -#include "HLEDataBase/Xapi.1.0.5344.h" -#include "HLEDataBase/Xapi.1.0.5558.h" -#include "HLEDataBase/Xapi.1.0.5788.h" -#include "HLEDataBase/Xapi.1.0.5849.h" -#include "HLEDataBase/D3D8.1.0.3911.h" -#include "HLEDataBase/D3D8.1.0.3925.h" -#include "HLEDataBase/D3D8.1.0.4034.h" -#include "HLEDataBase/D3D8.1.0.4134.h" -#include "HLEDataBase/D3D8.1.0.4242.h" -#include "HLEDataBase/D3D8.1.0.4361.h" -#include "HLEDataBase/D3D8.1.0.4432.h" -#include "HLEDataBase/D3D8.1.0.4627.h" -#include "HLEDataBase/D3D8.1.0.5028.h" -#include "HLEDataBase/D3D8.1.0.5233.h" -#include "HLEDataBase/D3D8.1.0.5344.h" -#include "HLEDataBase/D3D8.1.0.5558.h" -#include "HLEDataBase/D3D8.1.0.5788.h" -#include "HLEDataBase/D3D8.1.0.5849.h" -#include "HLEDataBase/XG.1.0.3911.h" -#include "HLEDataBase/XG.1.0.4034.h" -#include "HLEDataBase/XG.1.0.4361.h" -#include "HLEDataBase/XG.1.0.4432.h" -#include "HLEDataBase/XG.1.0.4627.h" -#include "HLEDataBase/XG.1.0.5028.h" -#include "HLEDataBase/XG.1.0.5233.h" -#include "HLEDataBase/XG.1.0.5344.h" -#include "HLEDataBase/XG.1.0.5558.h" -#include "HLEDataBase/XG.1.0.5788.h" -#include "HLEDataBase/XG.1.0.5849.h" -#include "HLEDataBase/XNet.1.0.3911.h" -#include "HLEDataBase/XOnline.1.0.4361.h" -#include "HLEDataBase/XOnline.1.0.4627.h" -#include "HLEDataBase/XOnline.1.0.5028.h" -#include "HLEDataBase/XOnline.1.0.5233.h" -#include "HLEDataBase/XOnline.1.0.5344.h" -#include "HLEDataBase/XOnline.1.0.5558.h" -#include "HLEDataBase/XOnline.1.0.5788.h" -#include "HLEDataBase/XOnline.1.0.5849.h" -#include "HLEDataBase/XactEng.1.0.4627.h" -#include "HLEDataBase/XactEng.1.0.4928.h" -#include "HLEDataBase/XactEng.1.0.5233.h" -#include "HLEDataBase/XactEng.1.0.5344.h" -#include "HLEDataBase/XactEng.1.0.5558.h" -#include "HLEDataBase/XactEng.1.0.5788.h" -#include "HLEDataBase/XactEng.1.0.5849.h" - // ****************************************************************** // * szHLELastCompileTime // ****************************************************************** From d33ffe0c15bb6dcbfd558af4299daa5d3642f9e6 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Tue, 24 Oct 2017 03:23:32 -0500 Subject: [PATCH 13/16] Remove HLE v1 Method From Cxbx - Removed v1 database method - Migrate v2 into v1 functions - Format some coding standard - Fix compile issue - Say goodbye to HLE v1 method. --- build/win32/Cxbx.vcxproj | 1 + build/win32/Cxbx.vcxproj.filters | 3 + src/CxbxKrnl/HLEDataBase.cpp | 14 +- src/CxbxKrnl/HLEDataBase.h | 19 +- src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.h | 51 ++++ src/CxbxKrnl/HLEIntercept.cpp | 326 ++++---------------------- 6 files changed, 105 insertions(+), 309 deletions(-) create mode 100644 src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.h diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index 07c8431e2..522982f22 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -231,6 +231,7 @@ $(SOLUTIONDIR)Export.bat + diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index a8969c44c..55175ec20 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -399,6 +399,9 @@ Shared + + HLEDatabase\D3D8 + diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index c4d9f2388..589222407 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -81,18 +81,8 @@ const char *Sec_XNET = "XNET"; // ****************************************************************** // * HLEDataBase // ****************************************************************** -#define HLE_ENTRY(Lib, DB, Version) \ - {Lib, Version, DB##_##Version, DB##_##Version##_SIZE } -// For example, HLE_ENTRY(Lib_XAPILIB, XAPI, 3911) results in: -// {Lib_XAPILIB, 3911, XAPI_3911, XAPI_3911_SIZE } -const HLEData HLEDataBase[] = -{ - - HLE_ENTRY(Lib_XONLINE, XOnline, 4361), // TODO : Typo for XONLINES? -}; - -const HLEDataV2 HLEDataBaseV2[] = { +const HLEData HLEDataBase[] = { // Support inline functions in .text section { Lib_D3D8,{ Sec_text, Sec_D3D }, D3D8_OOVPAV2, D3D8_OOVPA_SIZEV2 }, @@ -146,8 +136,6 @@ const HLEDataV2 HLEDataBaseV2[] = { // ****************************************************************** const uint32 HLEDataBaseCount = sizeof(HLEDataBase) / sizeof(HLEData); -const uint32 HLEDataBaseCountV2 = sizeof(HLEDataBaseV2) / sizeof(HLEDataV2); - // ****************************************************************** // * XRefDataBase // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h index 61cd461ec..18680de82 100644 --- a/src/CxbxKrnl/HLEDataBase.h +++ b/src/CxbxKrnl/HLEDataBase.h @@ -34,6 +34,8 @@ #ifndef HLEDATABASE_H #define HLEDATABASE_H +#include "HLEDataBase\D3D8.OOVPA.h" + // ****************************************************************** // * szHLELastCompileTime // ****************************************************************** @@ -54,15 +56,6 @@ extern const char *Lib_XONLINES; // ****************************************************************** // * HLEDataBase // ****************************************************************** -extern const struct HLEData -{ - const char *Library; - - uint16 BuildVersion; - OOVPATable *OovpaTable; - uint32 OovpaTableSize; -} -HLEDataBase[]; #define PAIRSCANSEC_MAX 3 @@ -71,22 +64,20 @@ const struct PairScanLibSec { const char *section[PAIRSCANSEC_MAX]; }; -extern const struct HLEDataV2 +extern const struct HLEData { const PairScanLibSec LibSec; - OOVPATable *OovpaTable; + OOVPATable *OovpaTable; uint32 OovpaTableSize; } -HLEDataBaseV2[]; +HLEDataBase[]; // ****************************************************************** // * HLEDataBaseCount // ****************************************************************** extern const uint32 HLEDataBaseCount; -extern const uint32 HLEDataBaseCountV2; - // ****************************************************************** // * XRefDataBaseOffset // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.h b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.h new file mode 100644 index 000000000..9c4491929 --- /dev/null +++ b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.h @@ -0,0 +1,51 @@ +// ****************************************************************** +// * +// * .,-::::: .,:: .::::::::. .,:: .: +// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; +// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' +// * $$$ Y$$$P $$""""Y$$ Y$$$P +// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, +// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, +// * +// * Cxbx->Win32->CxbxKrnl->HLEDataBase->D3D8.OOVPA.h +// * +// * This file is part of the Cxbx project. +// * +// * Cxbx and Cxbe are free software; you can redistribute them +// * and/or modify them under the terms of the GNU General Public +// * License as published by the Free Software Foundation; either +// * version 2 of the license, or (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have recieved a copy of the GNU General Public License +// * along with this program; see the file COPYING. +// * If not, write to the Free Software Foundation, Inc., +// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. +// * +// * (c) 2002-2003 Aaron Robinson +// * (c) 2017 jarupxx +// * (c) 2017 RadWolfie +// * +// * All rights reserved +// * +// ****************************************************************** +#ifndef D3D8_OOVPA_H +#define D3D8_OOVPA_H + +#include "../OOVPA.h" + +extern LOOVPA<1 + 11> D3DDevice_SetTextureState_TexCoordIndex_3911; +extern LOOVPA<2 + 15> D3DDevice_SetRenderState_CullMode_3911; + +extern LOOVPA<1 + 10> D3DDevice_SetTextureState_TexCoordIndex_4034; +extern LOOVPA<2 + 14> D3DDevice_SetRenderState_CullMode_4034; + +extern LOOVPA<1 + 10> D3DDevice_SetTextureState_TexCoordIndex_4242; + +extern LOOVPA<1 + 10> D3DDevice_SetTextureState_TexCoordIndex_4627; + +#endif \ No newline at end of file diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp index 33da58e41..5641a85fd 100644 --- a/src/CxbxKrnl/HLEIntercept.cpp +++ b/src/CxbxKrnl/HLEIntercept.cpp @@ -48,10 +48,9 @@ #include #include -static xbaddr EmuLocateFunction(OOVPA *Oovpa, xbaddr lower, xbaddr upper); -static void EmuInstallPatches(OOVPATable *OovpaTable, uint32 OovpaTableSize, Xbe::Header *pXbeHeader); -static inline void EmuInstallPatch(std::string FunctionName, xbaddr FunctionAddr, void *Patch); -void EmuInstallPatchesV2(OOVPATable *OovpaTable, uint32 OovpaTableSize, Xbe::SectionHeader *pSectionHeader, uint16_t buildVersion); +xbaddr EmuLocateFunction(OOVPA *Oovpa, xbaddr lower, xbaddr upper); +void EmuInstallPatches(OOVPATable *OovpaTable, uint32 OovpaTableSize, Xbe::SectionHeader *pSectionHeader, uint16_t buildVersion); +inline void EmuInstallPatch(std::string FunctionName, xbaddr FunctionAddr, void *Patch); #include #include @@ -294,7 +293,6 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) for(uint32 v=0;v(pXbeHeader->dwSectionHeadersAddr); Xbe::SectionHeader* pSectionScan = nullptr; std::string SectionName; @@ -362,23 +345,15 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) if(bXRefFirstPass) { - if (strcmp(LibraryName.c_str(), Lib_XAPILIB) == 0 && - (BuildVersion == 3911 || BuildVersion == 4034 || BuildVersion == 4134 || BuildVersion == 4361 - || BuildVersion == 4432 || BuildVersion == 4627 || BuildVersion == 5028 || BuildVersion == 5233 - || BuildVersion == 5344 || BuildVersion == 5558 || BuildVersion == 5788 || BuildVersion == 5849)) - { - xbaddr lower = pXbeHeader->dwBaseAddr; - xbaddr upper = pXbeHeader->dwBaseAddr + pXbeHeader->dwSizeofImage; - } - else if (strcmp(LibraryName.c_str(), Lib_D3D8) == 0) { + if (strcmp(LibraryName.c_str(), Lib_D3D8) == 0) { // Save D3D8 build version - g_BuildVersion = OrigBuildVersion; + g_BuildVersion = BuildVersion; xbaddr lower = pXbeHeader->dwBaseAddr; xbaddr upper = pXbeHeader->dwBaseAddr + pXbeHeader->dwSizeofImage; xbaddr pFunc = (xbaddr)nullptr; - if (OrigBuildVersion >= 3911 && OrigBuildVersion < 4034) { + if (BuildVersion >= 3911 && BuildVersion < 4034) { pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetRenderState_CullMode_3911, lower, upper); } else { pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetRenderState_CullMode_4034, lower, upper); @@ -395,7 +370,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) // Read address of D3DRS_CULLMODE from D3DDevice_SetRenderState_CullMode // TODO : Simplify this when XREF_D3DRS_CULLMODE derivation is deemed stable { - if (OrigBuildVersion >= 3911 && OrigBuildVersion < 4034) { + if (BuildVersion >= 3911 && BuildVersion < 4034) { DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x25); Decrement = 0x1FC; // TODO: Clean up (?) Increment = 82 * 4; @@ -404,17 +379,17 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) //Decrement = 0x19F; // TODO: Clean up (?) //Increment = 72 * 4; //patchOffset = 142*4; // TODO: Verify - } else if (OrigBuildVersion >= 4034 && OrigBuildVersion <= 4361) { + } else if (BuildVersion >= 4034 && BuildVersion <= 4361) { DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x2B); Decrement = 0x200; Increment = 82 * 4; patchOffset = 142 * 4; - } else if (OrigBuildVersion >= 4432 && OrigBuildVersion < 4627) { + } else if (BuildVersion >= 4432 && BuildVersion < 4627) { DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x2B); Decrement = 0x204; Increment = 83 * 4; patchOffset = 143 * 4; - } else if (OrigBuildVersion >= 4627 && OrigBuildVersion <= 5933) { + } else if (BuildVersion >= 4627 && BuildVersion <= 5933) { DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x2B); Decrement = 0x24C; Increment = 92 * 4; @@ -469,13 +444,13 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) { pFunc = (xbaddr)nullptr; - if(OrigBuildVersion >= 3911 && OrigBuildVersion < 4034) + if(BuildVersion >= 3911 && BuildVersion < 4034) pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_3911, lower, upper); - else if(OrigBuildVersion >= 4034 && OrigBuildVersion < 4242) + else if(BuildVersion >= 4034 && BuildVersion < 4242) pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_4034, lower, upper); - else if(OrigBuildVersion >= 4242 && OrigBuildVersion < 4627) + else if(BuildVersion >= 4242 && BuildVersion < 4627) pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_4242, lower, upper); - else if(OrigBuildVersion >= 4627) + else if(BuildVersion >= 4627) pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_4627, lower, upper); if (pFunc != (xbaddr)nullptr) { @@ -484,9 +459,9 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) // TODO : Remove this when XREF_D3DTSS_TEXCOORDINDEX derivation is deemed stable { - if (OrigBuildVersion >= 3911 && OrigBuildVersion < 4034) // 0x18F180 + if (BuildVersion >= 3911 && BuildVersion < 4034) // 0x18F180 DerivedAddr_D3DTSS_TEXCOORDINDEX = *(xbaddr*)(pFunc + 0x11); - else if (OrigBuildVersion >= 4034 && OrigBuildVersion < 4242) + else if (BuildVersion >= 4034 && BuildVersion < 4242) DerivedAddr_D3DTSS_TEXCOORDINDEX = *(xbaddr*)(pFunc + 0x18); else DerivedAddr_D3DTSS_TEXCOORDINDEX = *(xbaddr*)(pFunc + 0x19); @@ -521,52 +496,36 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) printf("HLE: * Searching HLE database for %s version 1.0.%d... ", LibraryName.c_str(), BuildVersion); - bool notFoundHLEDB = true; - //HLE Database v1 - for(uint32 d = 0; d < HLEDataBaseCount; d++) { - if (BuildVersion == HLEDataBase[d].BuildVersion && strcmp(LibraryName.c_str(), HLEDataBase[d].Library) == 0) { - if (g_bPrintfOn) printf("Found\n"); - EmuInstallPatches(HLEDataBase[d].OovpaTable, HLEDataBase[d].OovpaTableSize, pXbeHeader); - notFoundHLEDB = false; - break; - } - } + //Initialize library scan against HLE database we want to search for address of patches and xreferences. + for (uint32 d2 = 0; d2 < HLEDataBaseCount; d2++) { + if (strcmp(LibraryName.c_str(), HLEDataBase[d2].LibSec.library) == 0) { + bool bPrintOn = g_bPrintfOn; + for (uint32 v = 0; v < pXbeHeader->dwSections; v++) { + SectionName.assign((char*)pSectionHeaders[v].dwSectionNameAddr, (char*)pSectionHeaders[v].dwSectionNameAddr + 8); - //HLE Database v2 - if (notFoundHLEDB) { - //Initialize library scan against HLE database we want to search for address of patches and xreferences. - for (uint32 d2 = 0; d2 < HLEDataBaseCountV2; d2++) { - if (strcmp(LibraryName.c_str(), HLEDataBaseV2[d2].LibSec.library) == 0) { - bool bPrintOn = g_bPrintfOn; - for (uint32 v = 0; v < pXbeHeader->dwSections; v++) { - SectionName.assign((char*)pSectionHeaders[v].dwSectionNameAddr, (char*)pSectionHeaders[v].dwSectionNameAddr + 8); + //Initialize a matching specific section is currently pair with library in order to scan specific section only. + //By doing this method will reduce false detection dramatically. If it had happened before. + for (uint32 d3 = 0; d3 < PAIRSCANSEC_MAX; d3++) { + if (HLEDataBase[d2].LibSec.section[d3] != NULL && strcmp(SectionName.c_str(), HLEDataBase[d2].LibSec.section[d3]) == 0) { + pSectionScan = pSectionHeaders + v; - //Initialize a matching specific section is currently pair with library in order to scan specific section only. - //By doing this method will reduce false detection dramatically. If it had happened before. - for (uint32 d3 = 0; d3 < PAIRSCANSEC_MAX; d3++) { - if (HLEDataBaseV2[d2].LibSec.section[d3] != NULL && strcmp(SectionName.c_str(), HLEDataBaseV2[d2].LibSec.section[d3]) == 0) { - pSectionScan = pSectionHeaders + v; + if (g_bPrintfOn) printf("Found\n"); + g_bPrintfOn = false; - if (g_bPrintfOn) printf("Found\n"); - g_bPrintfOn = false; - - EmuInstallPatchesV2(HLEDataBaseV2[d2].OovpaTable, HLEDataBaseV2[d2].OovpaTableSize, pSectionScan, OrigBuildVersion); - notFoundHLEDB = false; - break; - } + EmuInstallPatches(HLEDataBase[d2].OovpaTable, HLEDataBase[d2].OovpaTableSize, pSectionScan, BuildVersion); + break; } } - g_bPrintfOn = bPrintOn; - break; } + g_bPrintfOn = bPrintOn; + break; } - } - if (g_bPrintfOn && notFoundHLEDB) printf("Skipped\n"); + if (g_bPrintfOn) printf("Skipped\n"); if (v == dwLibraryVersions - 1 && bDSoundLibSection == false) { LibraryName = Lib_DSOUND; - OrigBuildVersion = BuildVersion = preserveVersion; + BuildVersion = preserveVersion; goto reProcessScan; } } @@ -617,25 +576,25 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) return; } -static inline void EmuInstallPatch(std::string FunctionName, xbaddr FunctionAddr, void *Patch) +inline void EmuInstallPatch(std::string FunctionName, xbaddr FunctionAddr, void *Patch) { g_FunctionHooks[FunctionName].Install((void*)(FunctionAddr), Patch); } -static inline void GetXRefEntry(OOVPA *oovpa, int index, OUT uint32 &xref, OUT uint08 &offset) +inline void GetXRefEntry(OOVPA *oovpa, int index, OUT uint32 &xref, OUT uint08 &offset) { // Note : These are stored swapped by the XREF_ENTRY macro, hence this difference from GetOovpaEntry : xref = (uint32)((LOOVPA<1>*)oovpa)->Lovp[index].Offset; offset = ((LOOVPA<1>*)oovpa)->Lovp[index].Value; } -static inline void GetOovpaEntry(OOVPA *oovpa, int index, OUT uint32 &offset, OUT uint08 &value) +inline void GetOovpaEntry(OOVPA *oovpa, int index, OUT uint32 &offset, OUT uint08 &value) { offset = (uint32)((LOOVPA<1>*)oovpa)->Lovp[index].Offset; value = ((LOOVPA<1>*)oovpa)->Lovp[index].Value; } -static boolean CompareOOVPAToAddress(OOVPA *Oovpa, xbaddr cur) +boolean CompareOOVPAToAddress(OOVPA *Oovpa, xbaddr cur) { uint32 v = 0; // verification counter @@ -681,202 +640,6 @@ static boolean CompareOOVPAToAddress(OOVPA *Oovpa, xbaddr cur) return true; } -// locate the given function, searching within lower and upper bounds -static xbaddr EmuLocateFunction(OOVPA *Oovpa, xbaddr lower, xbaddr upper) -{ - // skip out if this is an unnecessary search - if (!bXRefFirstPass && Oovpa->XRefCount == XRefZero && Oovpa->XRefSaveIndex == XRefNoSaveIndex) - return (xbaddr)nullptr; - - uint32_t derive_indices = 0; - // Check all XRefs are known (if not, don't do a useless scan) : - for (uint32 v = 0; v < Oovpa->XRefCount; v++) - { - uint32 XRef; - uint08 Offset; - - // get currently registered (un)known address - GetXRefEntry(Oovpa, v, XRef, Offset); - xbaddr XRefAddr = XRefDataBase[XRef]; - // Undetermined XRef cannot be checked yet - if (XRefAddr == XREF_ADDR_UNDETERMINED) - // Skip this scan over the address range - return (xbaddr)nullptr; - - // Don't verify an xref that has to be (but isn't yet) derived - if (XRefAddr == XREF_ADDR_DERIVE) - { - // Mark (up to index 32) which xref needs to be derived - derive_indices |= (1 << v); - continue; - } - } - - // correct upper bound with highest Oovpa offset - uint32 count = Oovpa->Count; - { - uint32 Offset; - uint08 Value; // ignored - - GetOovpaEntry(Oovpa, count - 1, Offset, Value); - upper -= Offset; - } - - // search all of the image memory - for (xbaddr cur = lower; cur < upper; cur++) - if (CompareOOVPAToAddress(Oovpa, cur)) - { - // do we need to save the found address? - if (Oovpa->XRefSaveIndex != XRefNoSaveIndex) - { - // is the XRef not saved yet? - switch (XRefDataBase[Oovpa->XRefSaveIndex]) { - case XREF_ADDR_NOT_FOUND: - { - EmuWarning("Found OOVPA after first finding nothing?"); - // fallthrough to XREF_ADDR_UNDETERMINED - } - case XREF_ADDR_UNDETERMINED: - { - // save and count the found address - UnResolvedXRefs--; - XRefDataBase[Oovpa->XRefSaveIndex] = cur; - break; - } - case XREF_ADDR_DERIVE: - { - EmuWarning("Cannot derive a save index!"); - break; - } - default: - { - if (XRefDataBase[Oovpa->XRefSaveIndex] != cur) { - EmuWarning("Found OOVPA on other address than in XRefDataBase!"); - } - break; - } - } - } - - while (derive_indices > 0) - { - uint32 XRef; - uint08 Offset; - DWORD derive_index; - - // Extract an index from the indices mask : - _BitScanReverse(&derive_index, derive_indices); // MSVC intrinsic; GCC has __builtin_clz - derive_indices ^= (1 << derive_index); - - // get currently registered (un)known address - GetXRefEntry(Oovpa, derive_index, XRef, Offset); - - // Calculate the address where the XRef resides - xbaddr XRefAddr = cur + Offset; - // Read the address it points to - XRefAddr = *((xbaddr*)XRefAddr); - - /* For now assume it's a direct reference; - // TODO : Check if it's PC-relative reference? - if (XRefAddr + cur + Offset + 4 < XBE_MAX_VA) - XRefAddr = XRefAddr + cur + Offset + 4; - */ - - // Does the address seem valid? - if (XRefAddr < XBE_MAX_VA) - { - // save and count the derived address - UnResolvedXRefs--; - XRefDataBase[XRef] = XRefAddr; - printf("Derived OOVPA!\n"); - } - } - - return cur; - } - - // found nothing - return (xbaddr)nullptr; -} - -// install function interception wrappers -static void EmuInstallPatches(OOVPATable *OovpaTable, uint32 OovpaTableSize, Xbe::Header *pXbeHeader) -{ - xbaddr lower = pXbeHeader->dwBaseAddr; - - // Find the highest address contained within an executable segment - xbaddr upper = pXbeHeader->dwBaseAddr; - Xbe::SectionHeader* headers = reinterpret_cast(pXbeHeader->dwSectionHeadersAddr); - - for (uint32_t i = 0; i < pXbeHeader->dwSections; i++) { - xbaddr end_addr = headers[i].dwVirtualAddr + headers[i].dwVirtualSize; - if (headers[i].dwFlags.bExecutable && end_addr > upper) { - upper = end_addr; - } - } - - // traverse the full OOVPA table - for(size_t a=0;a 0; - if (DontScan) - continue; - - // Skip already found & handled symbols - xbaddr pFunc = g_SymbolAddresses[OovpaTable[a].szFuncName]; - if (pFunc != (xbaddr)nullptr) - continue; - - // Search for each function's location using the OOVPA - OOVPA *Oovpa = OovpaTable[a].Oovpa; - pFunc = (xbaddr)EmuLocateFunction(Oovpa, lower, upper); - if (pFunc == (xbaddr)nullptr) - continue; - - // Now that we found the address, store it (regardless if we patch it or not) - g_SymbolAddresses[OovpaTable[a].szFuncName] = (uint32_t)pFunc; - - // Output some details - std::stringstream output; - output << "HLE: 0x" << std::setfill('0') << std::setw(8) << std::hex << pFunc - << " -> " << OovpaTable[a].szFuncName << " " << std::dec << OovpaTable[a].Version; - - bool IsXRef = (OovpaTable[a].Flags & Flag_XRef) > 0; - if (IsXRef) - output << "\t(XREF)"; - - // Retrieve the associated patch, if any is available - void* addr = GetEmuPatchAddr(std::string(OovpaTable[a].szFuncName)); - bool DontPatch = (OovpaTable[a].Flags & Flag_DontPatch) > 0; - if (DontPatch) - { - // Mention if there's an unused patch - if (addr != nullptr) - output << "\t*PATCH UNUSED!*"; - else - output << "\t*DISABLED*"; - } - else - { - if (addr != nullptr) - { - EmuInstallPatch(OovpaTable[a].szFuncName, pFunc, addr); - output << "\t*PATCHED*"; - } - else - { - // Mention there's no patch available, if it was to be applied - if (!IsXRef) // TODO : Remove this restriction once we patch xrefs regularly - output << "\t*NO PATCH AVAILABLE!*"; - } - } - - output << "\n"; - printf(output.str().c_str()); - } -} - void EmuRegisterSymbol(OOVPATable *OovpaTable, xbaddr pFunc) { // Ignore registered symbol in current database. @@ -947,7 +710,7 @@ void EmuRegisterSymbol(OOVPATable *OovpaTable, xbaddr pFunc) if (checkDisableStr != nullptr && strcmp(checkDisableStr, "_UNPATCHED") == 0) { output << "\t*UNPATCHED*"; - // Mention there's no patch available, if it was to be applied + // Mention there's no patch available, if it was to be applied } else if (!IsXRef) { output << "\t*NO PATCH AVAILABLE!*"; } @@ -957,9 +720,8 @@ void EmuRegisterSymbol(OOVPATable *OovpaTable, xbaddr pFunc) printf(output.str().c_str()); } - // locate the given function, searching within lower and upper bounds -xbaddr EmuLocateFunctionV2(OOVPA *Oovpa, xbaddr lower, xbaddr upper) +xbaddr EmuLocateFunction(OOVPA *Oovpa, xbaddr lower, xbaddr upper) { // skip out if this is an unnecessary search if (!bXRefFirstPass && Oovpa->XRefCount == XRefZero && Oovpa->XRefSaveIndex == XRefNoSaveIndex) @@ -1041,7 +803,7 @@ xbaddr EmuLocateFunctionV2(OOVPA *Oovpa, xbaddr lower, xbaddr upper) } // install function interception wrappers -static void EmuInstallPatchesV2(OOVPATable *OovpaTable, uint32 OovpaTableSize, Xbe::SectionHeader *pSectionHeader, uint16_t buildVersion) +void EmuInstallPatches(OOVPATable *OovpaTable, uint32 OovpaTableSize, Xbe::SectionHeader *pSectionHeader, uint16_t buildVersion) { xbaddr lower = pSectionHeader->dwVirtualAddr; @@ -1073,11 +835,11 @@ static void EmuInstallPatchesV2(OOVPATable *OovpaTable, uint32 OovpaTableSize, X continue; // Search for each function's location using the OOVPA - xbaddr pFunc = (xbaddr)EmuLocateFunctionV2(pLoop->Oovpa, lower, upper); + xbaddr pFunc = (xbaddr)EmuLocateFunction(pLoop->Oovpa, lower, upper); if (pFunc == (xbaddr)nullptr) continue; - if (pFunc == pLastKnownFunc && pLastKnownSymbol == pLoop-1) { + if (pFunc == pLastKnownFunc && pLastKnownSymbol == pLoop - 1) { if (g_SymbolAddresses[pLastKnownSymbol->szFuncName] == 0) { printf("HLE: Duplicate OOVPA signature found for %s, %d vs %d!\n", pLastKnownSymbol->szFuncName, pLastKnownSymbol->Version, pLoop->Version); } From 20cd6148cde8148721fe9991168801f376d122a1 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Tue, 24 Oct 2017 03:24:18 -0500 Subject: [PATCH 14/16] Fix HLE v2 Database includes --- src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl | 42 +++++++++++----------- src/CxbxKrnl/HLEDataBase/XG.OOVPA.inl | 24 ++++++------- src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl | 10 +++--- src/CxbxKrnl/HLEDataBase/XOnline.OOVPA.inl | 22 ++++++------ src/CxbxKrnl/HLEDataBase/XactEng.OOVPA.inl | 16 ++++----- 5 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl index d17caacac..dac8b1ff0 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl @@ -123,27 +123,27 @@ #include "../OOVPA.h" -#include "HLEDataBase/D3D8.1.0.3911.inl" -#include "HLEDataBase/D3D8.1.0.3925.inl" -#include "HLEDataBase/D3D8.1.0.3948.inl" -#include "HLEDataBase/D3D8.1.0.4034.inl" -#include "HLEDataBase/D3D8.1.0.4134.inl" -#include "HLEDataBase/D3D8.1.0.4242.inl" -#include "HLEDataBase/D3D8.1.0.4361.inl" -#include "HLEDataBase/D3D8.1.0.4432.inl" -#include "HLEDataBase/D3D8.1.0.4531.inl" -#include "HLEDataBase/D3D8.1.0.4627.inl" -#include "HLEDataBase/D3D8.1.0.4831.inl" -#include "HLEDataBase/D3D8.1.0.4928.inl" -#include "HLEDataBase/D3D8.1.0.5028.inl" -#include "HLEDataBase/D3D8.1.0.5120.inl" -#include "HLEDataBase/D3D8.1.0.5233.inl" -#include "HLEDataBase/D3D8.1.0.5344.inl" -#include "HLEDataBase/D3D8.1.0.5455.inl" -#include "HLEDataBase/D3D8.1.0.5558.inl" -#include "HLEDataBase/D3D8.1.0.5659.inl" -#include "HLEDataBase/D3D8.1.0.5788.inl" -#include "HLEDataBase/D3D8.1.0.5849.inl" +#include "D3D8.1.0.3911.inl" +#include "D3D8.1.0.3925.inl" +#include "D3D8.1.0.3948.inl" +#include "D3D8.1.0.4034.inl" +#include "D3D8.1.0.4134.inl" +#include "D3D8.1.0.4242.inl" +#include "D3D8.1.0.4361.inl" +#include "D3D8.1.0.4432.inl" +#include "D3D8.1.0.4531.inl" +#include "D3D8.1.0.4627.inl" +#include "D3D8.1.0.4831.inl" +#include "D3D8.1.0.4928.inl" +#include "D3D8.1.0.5028.inl" +#include "D3D8.1.0.5120.inl" +#include "D3D8.1.0.5233.inl" +#include "D3D8.1.0.5344.inl" +#include "D3D8.1.0.5455.inl" +#include "D3D8.1.0.5558.inl" +#include "D3D8.1.0.5659.inl" +#include "D3D8.1.0.5788.inl" +#include "D3D8.1.0.5849.inl" // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XG.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/XG.OOVPA.inl index 53d8123c2..cea128d30 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.OOVPA.inl @@ -50,18 +50,18 @@ #include "../OOVPA.h" -#include "HLEDataBase/XG.1.0.3911.inl" -#include "HLEDataBase/XG.1.0.4034.inl" -#include "HLEDataBase/XG.1.0.4134.inl" -#include "HLEDataBase/XG.1.0.4361.inl" -#include "HLEDataBase/XG.1.0.4432.inl" -#include "HLEDataBase/XG.1.0.4627.inl" -#include "HLEDataBase/XG.1.0.5028.inl" -#include "HLEDataBase/XG.1.0.5233.inl" -#include "HLEDataBase/XG.1.0.5344.inl" -#include "HLEDataBase/XG.1.0.5558.inl" -#include "HLEDataBase/XG.1.0.5788.inl" -#include "HLEDataBase/XG.1.0.5849.inl" +#include "XG.1.0.3911.inl" +#include "XG.1.0.4034.inl" +#include "XG.1.0.4134.inl" +#include "XG.1.0.4361.inl" +#include "XG.1.0.4432.inl" +#include "XG.1.0.4627.inl" +#include "XG.1.0.5028.inl" +#include "XG.1.0.5233.inl" +#include "XG.1.0.5344.inl" +#include "XG.1.0.5558.inl" +#include "XG.1.0.5788.inl" +#include "XG.1.0.5849.inl" // ****************************************************************** // * XGRAPHC_OOVPA diff --git a/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl index 63f906104..62a4002ab 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl @@ -54,11 +54,11 @@ #include "../OOVPA.h" -#include "HLEDataBase/XNet.1.0.3911.inl" -#include "HLEDataBase/XNet.1.0.4361.inl" -#include "HLEDataBase/XNet.1.0.4627.inl" -#include "HLEDataBase/XNet.1.0.5120.inl" -#include "HLEDataBase/XNet.1.0.5455.inl" +#include "XNet.1.0.3911.inl" +#include "XNet.1.0.4361.inl" +#include "XNet.1.0.4627.inl" +#include "XNet.1.0.5120.inl" +#include "XNet.1.0.5455.inl" // ****************************************************************** // * XNET_OOVPA diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/XOnline.OOVPA.inl index bbebf1c69..48fca6f54 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.OOVPA.inl @@ -58,17 +58,17 @@ #include "../OOVPA.h" -#include "HLEDataBase/XOnline.1.0.4361.inl" -#include "HLEDataBase/XOnline.1.0.4627.inl" -#include "HLEDataBase/XOnline.1.0.4831.inl" -#include "HLEDataBase/XOnline.1.0.5028.inl" -#include "HLEDataBase/XOnline.1.0.5233.inl" -#include "HLEDataBase/XOnline.1.0.5344.inl" -#include "HLEDataBase/XOnline.1.0.5455.inl" -#include "HLEDataBase/XOnline.1.0.5558.inl" -#include "HLEDataBase/XOnline.1.0.5659.inl" -#include "HLEDataBase/XOnline.1.0.5788.inl" -#include "HLEDataBase/XOnline.1.0.5849.inl" +#include "XOnline.1.0.4361.inl" +#include "XOnline.1.0.4627.inl" +#include "XOnline.1.0.4831.inl" +#include "XOnline.1.0.5028.inl" +#include "XOnline.1.0.5233.inl" +#include "XOnline.1.0.5344.inl" +#include "XOnline.1.0.5455.inl" +#include "XOnline.1.0.5558.inl" +#include "XOnline.1.0.5659.inl" +#include "XOnline.1.0.5788.inl" +#include "XOnline.1.0.5849.inl" // ****************************************************************** // * XONLINES_OOVPA diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/XactEng.OOVPA.inl index c742a0653..0ff16c2c2 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.OOVPA.inl @@ -50,14 +50,14 @@ #include "../OOVPA.h" -#include "HLEDataBase/XactEng.1.0.4627.inl" -#include "HLEDataBase/XactEng.1.0.4928.inl" -#include "HLEDataBase/XactEng.1.0.5120.inl" -#include "HLEDataBase/XactEng.1.0.5233.inl" -#include "HLEDataBase/XactEng.1.0.5344.inl" -#include "HLEDataBase/XactEng.1.0.5558.inl" -#include "HLEDataBase/XactEng.1.0.5788.inl" -#include "HLEDataBase/XactEng.1.0.5849.inl" +#include "XactEng.1.0.4627.inl" +#include "XactEng.1.0.4928.inl" +#include "XactEng.1.0.5120.inl" +#include "XactEng.1.0.5233.inl" +#include "XactEng.1.0.5344.inl" +#include "XactEng.1.0.5558.inl" +#include "XactEng.1.0.5788.inl" +#include "XactEng.1.0.5849.inl" // ****************************************************************** From 25cd86fc30e1e903fd11feddc3aff0c0f57bbf3d Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Tue, 24 Oct 2017 13:12:18 -0500 Subject: [PATCH 15/16] Remove Leftover v1 database --- src/CxbxKrnl/HLEDataBase/XactEng.1.0.5788.inl | 41 --------- src/CxbxKrnl/OOVPA.h | 91 ++++++------------- 2 files changed, 30 insertions(+), 102 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5788.inl index d52a3b976..bf7eb1b83 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5788.inl @@ -31,44 +31,3 @@ // * All rights reserved // * // ****************************************************************** - -// ****************************************************************** -// * XactEng_5788 -// ****************************************************************** -OOVPATable XactEng_5788[] = { - - REGISTER_OOVPA(XACTEngineCreate, 5120, PATCH), - REGISTER_OOVPA(XACTEngineDoWork, 4627, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterStreamedWaveBank, 5233, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterStreamedWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundBank, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_UnRegisterWaveBank, 5120, XREF), - REGISTER_OOVPA(IXACTEngine_UnRegisterWaveBank, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_GetNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_GetNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CSoundBank_GetSoundCueIndexFromFriendlyName, 4928, XREF), - REGISTER_OOVPA(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterWaveBank, 5233, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterWaveBank, 5120, PATCH), - REGISTER_OOVPA(XACT_CEngine_RegisterNotification, 4627, XREF), - REGISTER_OOVPA(IXACTEngine_RegisterNotification, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_CreateSoundSource, 4928, XREF), - REGISTER_OOVPA(IXACTEngine_CreateSoundSource, 4928, PATCH), - REGISTER_OOVPA(XACT_CEngine_DownloadEffectsImage, 5344, XREF), - REGISTER_OOVPA(IXACTEngine_DownloadEffectsImage, 5344, PATCH), - REGISTER_OOVPA(XACT_CSoundBank_Play, 5558, XREF), - REGISTER_OOVPA(IXACTSoundBank_PlayEx, 5344, XREF), // Not Implemented yet. - - // ****************************************************************** - // Provisional registration functions in XDK 5788 - // TODO: Need test cases - // ****************************************************************** - REGISTER_OOVPA(IXACTSoundBank_Play, 4627, PATCH), - // ****************************************************************** -}; - -// ****************************************************************** -// * XACTENG_5788_SIZE -// ****************************************************************** -uint32 XactEng_5788_SIZE = sizeof(XactEng_5788); diff --git a/src/CxbxKrnl/OOVPA.h b/src/CxbxKrnl/OOVPA.h index a281126f6..5bac3ca57 100644 --- a/src/CxbxKrnl/OOVPA.h +++ b/src/CxbxKrnl/OOVPA.h @@ -141,41 +141,19 @@ struct OOVPATable { OOVPA *Oovpa; char *szFuncName; - uint16_t Version : 13; // 2^13 = 8192, enough to store lowest and higest possible Library Version number in - uint16_t Flags : 3; + uint16_t Version;// : 13; // 2^13 = 8192, enough to store lowest and higest possible Library Version number in }; -const uint16_t Flag_DontScan = 1; // Indicates an entry that's currently disabled and thus shouldn't be searched for -const uint16_t Flag_XRef = 2; // Indicates that an entry is an X-Ref -const uint16_t Flag_DontPatch = 4;// Indicates an entry that's shouldn't be patched (even when it's found) - -#define OOVPA_TABLE_ENTRY_FULL(Oovpa, DebugName, Version, Flags) \ - { & Oovpa ## _ ## Version.Header, DebugName, Version, Flags } - -// REGISTER_OOVPA is the ONLY allowed macro for registrations. -// Registrations MUST stay sorted to prevent duplicates and maintain overview. -// The TYPE argument MUST be PATCH, XREF, ALIAS, EMUTHIS, LTCG or DISABLED (see below). -// ONLY use ALIAS when absolutely required (when OOVPA identifier cannot follow Patch) -// ONLY use LTCG for LTCG OOVPA's (HLE support for these is flacky at best) -// DO NOT comment out registrations, but use TYPE DISABLED instead. -#define REGISTER_OOVPA(Symbol, Version, TYPE, ...) \ - REGISTER_OOVPA_##TYPE(Symbol, Version, __VA_ARGS__) +#define OOVPA_TABLE_ENTRY_FULL(Oovpa, DebugName, Version) \ + { & Oovpa ## _ ## Version.Header, DebugName, Version } #define PATCH PATCH/* most common registration, Symbol indicates both an OOVPA and Patch */ -#define REGISTER_OOVPA_PATCH(Symbol, Version, ...) \ - OOVPA_TABLE_ENTRY_FULL(Symbol, #Symbol ##, Version, 0) #define XREF XREF/* registration of an XRef-only OOVPA, for which no Patch is present */ -#define REGISTER_OOVPA_XREF(Symbol, Version, ...) \ - OOVPA_TABLE_ENTRY_FULL(Symbol, #Symbol ##, Version, Flag_XRef) #define ALIAS ALIAS/* registration of a Patch using an alternatively named OOVPA */ -#define REGISTER_OOVPA_ALIAS(Symbol, Version, AliasOovpa) \ - OOVPA_TABLE_ENTRY_FULL(AliasOovpa, #Symbol ##, Version, 0) #define DISABLED DISABLED/* registration is (temporarily) disabled by a flag */ -#define REGISTER_OOVPA_DISABLED(Symbol, Version, ...) \ - OOVPA_TABLE_ENTRY_FULL(Symbol, #Symbol ##, Version, Flag_DontPatch) //Below this is a revise version 2 to improve OOPVA scan as possible. @@ -183,55 +161,46 @@ const uint16_t Flag_DontPatch = 4;// Indicates an entry that's shouldn't be patc can be activate via HLE Cache file by removing _UNPATCHED at the end. */ /* Use XREF define to knowledge it is reference purpose only.*/ -#define REGISTER_OOVPA_V2_XREF(Symbol, TYPE, Version) \ - OOVPA_TABLE_ENTRY_FULL(Symbol, #Symbol, Version, 0) +#define REGISTER_OOVPA_XREF(Symbol, TYPE, Version) \ + OOVPA_TABLE_ENTRY_FULL(Symbol, #Symbol, Version) /* Use PATCH define only for functions with FUNC_EXPORTS included.*/ -#define REGISTER_OOVPA_V2_PATCH(Symbol, TYPE, Version) \ - OOVPA_TABLE_ENTRY_FULL(Symbol, #Symbol, Version, 0) +#define REGISTER_OOVPA_PATCH(Symbol, TYPE, Version) \ + OOVPA_TABLE_ENTRY_FULL(Symbol, #Symbol, Version) /* DISABLED define will perform scan and append "_DISABLED" only. * This is only effective for functions with "FUNC_EXPORTS" bypass purpose. * XREF remain unaffected and will perform task normally. * NOTICE: Do not use DISABLED on XREF OOVPA! Or developers will be confused. */ -#define REGISTER_OOVPA_V2_UNPATCHED(Symbol, TYPE, Version) \ - OOVPA_TABLE_ENTRY_FULL(Symbol, STRINGIZEX(Symbol## _ ##TYPE), Version, 0) +#define REGISTER_OOVPA_UNPATCHED(Symbol, TYPE, Version) \ + OOVPA_TABLE_ENTRY_FULL(Symbol, STRINGIZEX(Symbol## _ ##TYPE), Version) -#define REGISTER_OOVPA_V2(Symbol, TYPE, Version) \ - MSVC_EXPAND(REGISTER_OOVPA_V2_##TYPE(Symbol, TYPE, Version)) +#define REGISTER_OOVPA(Symbol, TYPE, Version) \ + MSVC_EXPAND(REGISTER_OOVPA_##TYPE(Symbol, TYPE, Version)) // { &(Symbol ## _ ## Version).Header, #Symbol, Version, Flags } -// ****************************************************************** -// * OOVPATable -// ****************************************************************** -struct OOVPATableV2 { - char *szSymbolName; - uint16_t Version; - OOVPA *pOovpa; -}; - // Based on https://codecraft.co/2014/11/25/variadic-macros-tricks/ // and https://groups.google.com/d/msg/comp.std.c/d-6Mj5Lko_s/jqonQLK20HcJ #define REGISTER_OOVPA_0(...) - #define REGISTER_OOVPA_1(Symbol, TYPE, Version) REGISTER_OOVPA_V2(Symbol, TYPE, Version) - #define REGISTER_OOVPA_2(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_1(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_3(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_2(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_4(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_3(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_5(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_4(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_6(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_5(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_7(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_6(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_8(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_7(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_9(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_8(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_10(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_9(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_11(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_10(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_12(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_11(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_13(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_12(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_14(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_13(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_15(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_14(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_16(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_15(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_17(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_16(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_18(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_17(Symbol, TYPE, __VA_ARGS__)) - #define REGISTER_OOVPA_19(Symbol, TYPE, Version, ...) REGISTER_OOVPA_V2(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_18(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_1(Symbol, TYPE, Version) REGISTER_OOVPA(Symbol, TYPE, Version) + #define REGISTER_OOVPA_2(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_1(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_3(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_2(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_4(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_3(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_5(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_4(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_6(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_5(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_7(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_6(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_8(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_7(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_9(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_8(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_10(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_9(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_11(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_10(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_12(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_11(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_13(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_12(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_14(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_13(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_15(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_14(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_16(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_15(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_17(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_16(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_18(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_17(Symbol, TYPE, __VA_ARGS__)) + #define REGISTER_OOVPA_19(Symbol, TYPE, Version, ...) REGISTER_OOVPA(Symbol, TYPE, Version), MSVC_EXPAND(REGISTER_OOVPA_18(Symbol, TYPE, __VA_ARGS__)) // Accept any number of args >= N, but expand to just the Nth one. In this case, // we have settled on 20 as N. We could pick a different number by adjusting From af17f5cc243f32b9c8f82e020bef111009432ad3 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Tue, 24 Oct 2017 13:12:29 -0500 Subject: [PATCH 16/16] Fix Debug Build --- src/CxbxKrnl/HLEIntercept.cpp | 323 +++++++++++++++++----------------- 1 file changed, 166 insertions(+), 157 deletions(-) diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp index 5641a85fd..6022e600e 100644 --- a/src/CxbxKrnl/HLEIntercept.cpp +++ b/src/CxbxKrnl/HLEIntercept.cpp @@ -856,208 +856,217 @@ void EmuInstallPatches(OOVPATable *OovpaTable, uint32 OovpaTableSize, Xbe::Secti #ifdef _DEBUG_TRACE struct HLEVerifyContext { - const HLEData *main_data; - OOVPA *oovpa, *against; - const HLEData *against_data; - uint32 main_index, against_index; + const HLEData *main_data; + OOVPA *oovpa, *against; + const HLEData *against_data; + uint32 main_index, against_index; }; -std::string HLEErrorString(const HLEData *data, uint32 index) +std::string HLEErrorString(const HLEData *data, uint16_t buildVersion, uint32 index) { - std::string result = - "OOVPATable " + (std::string)(data->Library) + "_" + std::to_string(data->BuildVersion) - + "[" + std::to_string(index) + "] " - + (std::string)(data->OovpaTable[index].szFuncName); + std::string result = + "OOVPATable " + (std::string)(data->LibSec.library) + "_" + std::to_string(buildVersion) + + "[" + std::to_string(index) + "] " + + (std::string)(data->OovpaTable[index].szFuncName); - return result; + return result; } -void HLEError(HLEVerifyContext *context, char *format, ...) +void HLEError(HLEVerifyContext *context, uint16_t buildVersion, char *format, ...) { - std::string output = "HLE Error "; - if (context->main_data != nullptr) - output += "in " + HLEErrorString(context->main_data, context->main_index); + std::string output = "HLE Error "; + if (context->main_data != nullptr) { + output += "in " + HLEErrorString(context->main_data, buildVersion, context->main_index); + } - if (context->against != nullptr && context->against_data != nullptr) - output += ", comparing against " + HLEErrorString(context->against_data, context->against_index); + if (context->against != nullptr && context->against_data != nullptr) { + output += ", comparing against " + HLEErrorString(context->against_data, buildVersion, context->against_index); + } - // format specific error message - char buffer[200]; - va_list args; - va_start(args, format); - vsprintf(buffer, format, args); - va_end(args); + // format specific error message + char buffer[200]; + va_list args; + va_start(args, format); + vsprintf(buffer, format, args); + va_end(args); - output += " : " + (std::string)buffer + (std::string)"\n"; - printf(output.c_str()); + output += " : " + (std::string)buffer + (std::string)"\n"; + printf(output.c_str()); } void VerifyHLEDataBaseAgainst(HLEVerifyContext *context); // forward -void VerifyHLEOOVPA(HLEVerifyContext *context, OOVPA *oovpa) +void VerifyHLEOOVPA(HLEVerifyContext *context, uint16_t buildVersion, OOVPA *oovpa) { - if (context->against == nullptr) { - // TODO : verify XRefSaveIndex and XRef's (how?) + if (context->against == nullptr) { + // TODO : verify XRefSaveIndex and XRef's (how?) - // verify offsets are in increasing order - uint32 prev_offset; - uint08 dummy_value; - GetOovpaEntry(oovpa, oovpa->XRefCount, prev_offset, dummy_value); - for (int p = oovpa->XRefCount + 1; p < oovpa->Count; p++) { - uint32 curr_offset; - GetOovpaEntry(oovpa, p, curr_offset, dummy_value); - if (!(curr_offset > prev_offset)) { - HLEError(context, "Lovp[%d] : Offset (0x%x) must be larger then previous offset (0x%x)", - p, curr_offset, prev_offset); - } - } + // verify offsets are in increasing order + uint32 prev_offset; + uint08 dummy_value; + GetOovpaEntry(oovpa, oovpa->XRefCount, prev_offset, dummy_value); + for (int p = oovpa->XRefCount + 1; p < oovpa->Count; p++) { + uint32 curr_offset; + GetOovpaEntry(oovpa, p, curr_offset, dummy_value); + if (!(curr_offset > prev_offset)) { + HLEError(context, buildVersion, "Lovp[%d] : Offset (0x%x) must be larger then previous offset (0x%x)", + p, curr_offset, prev_offset); + } + } - // find duplicate OOVPA's across all other data-table-oovpa's - context->oovpa = oovpa; - context->against = oovpa; - VerifyHLEDataBaseAgainst(context); - context->against = nullptr; // reset scanning state - return; - } + // find duplicate OOVPA's across all other data-table-oovpa's + context->oovpa = oovpa; + context->against = oovpa; + VerifyHLEDataBaseAgainst(context); + context->against = nullptr; // reset scanning state + return; + } - // prevent checking an oovpa against itself - if (context->against == oovpa) - return; + // prevent checking an oovpa against itself + if (context->against == oovpa) { + return; + } - // compare {Offset, Value}-pairs between two OOVPA's - OOVPA *left = context->against, *right = oovpa; - int l = 0, r = 0; - uint32 left_offset, right_offset; - uint08 left_value, right_value; - GetOovpaEntry(left, l, left_offset, left_value); - GetOovpaEntry(right, r, right_offset, right_value); - int unique_offset_left = 0; - int unique_offset_right = 0; - int equal_offset_value = 0; - int equal_offset_different_value = 0; - while (true) { - bool left_next = true; - bool right_next = true; + // compare {Offset, Value}-pairs between two OOVPA's + OOVPA *left = context->against, *right = oovpa; + int l = 0, r = 0; + uint32 left_offset, right_offset; + uint08 left_value, right_value; + GetOovpaEntry(left, l, left_offset, left_value); + GetOovpaEntry(right, r, right_offset, right_value); + int unique_offset_left = 0; + int unique_offset_right = 0; + int equal_offset_value = 0; + int equal_offset_different_value = 0; + while (true) { + bool left_next = true; + bool right_next = true; - if (left_offset < right_offset) { - unique_offset_left++; - right_next = false; - } - else if (left_offset > right_offset) { - unique_offset_right++; - left_next = false; - } - else if (left_value == right_value) { - equal_offset_value++; - } - else { - equal_offset_different_value++; - } + if (left_offset < right_offset) { + unique_offset_left++; + right_next = false; + } else if (left_offset > right_offset) { + unique_offset_right++; + left_next = false; + } else if (left_value == right_value) { + equal_offset_value++; + } else { + equal_offset_different_value++; + } - // increment r before use (in left_next) - if (right_next) - r++; + // increment r before use (in left_next) + if (right_next) { + r++; + } - if (left_next) { - l++; - if (l >= left->Count) { - unique_offset_right += right->Count - r; - break; - } + if (left_next) { + l++; + if (l >= left->Count) { + unique_offset_right += right->Count - r; + break; + } - GetOovpaEntry(left, l, left_offset, left_value); - } + GetOovpaEntry(left, l, left_offset, left_value); + } - if (right_next) { - if (r >= right->Count) { - unique_offset_left += left->Count - l; - break; - } + if (right_next) { + if (r >= right->Count) { + unique_offset_left += left->Count - l; + break; + } - GetOovpaEntry(right, r, right_offset, right_value); - } - } + GetOovpaEntry(right, r, right_offset, right_value); + } + } - // no mismatching values on identical offsets? - if (equal_offset_different_value == 0) - // enough matching OV-pairs? - if (equal_offset_value > 4) - { - // no unique OV-pairs on either side? - if (unique_offset_left + unique_offset_right == 0) - HLEError(context, "OOVPA's are identical", - unique_offset_left, - unique_offset_right); - else - // not too many new OV-pairs on the left side? - if (unique_offset_left < 6) - // not too many new OV-parirs on the right side? - if (unique_offset_right < 6) - HLEError(context, "OOVPA's are expanded (left +%d, right +%d)", - unique_offset_left, - unique_offset_right); - } + // no mismatching values on identical offsets? + if (equal_offset_different_value == 0) { + // enough matching OV-pairs? + if (equal_offset_value > 4) { + // no unique OV-pairs on either side? + if (unique_offset_left + unique_offset_right == 0) { + HLEError(context, buildVersion, "OOVPA's are identical", + unique_offset_left, + unique_offset_right); + } else { + // not too many new OV-pairs on the left side? + if (unique_offset_left < 6) { + // not too many new OV-parirs on the right side? + if (unique_offset_right < 6) { + HLEError(context, buildVersion, "OOVPA's are expanded (left +%d, right +%d)", + unique_offset_left, + unique_offset_right); + } + } + } + } + } } void VerifyHLEDataEntry(HLEVerifyContext *context, const OOVPATable *table, uint32 index, uint32 count) { - if (context->against == nullptr) { - context->main_index = index; - } else { - context->against_index = index; - } + if (context->against == nullptr) { + context->main_index = index; + } else { + context->against_index = index; + } - if (context->against == nullptr) { - if (table[index].Flags & Flag_DontPatch) - { - if (GetEmuPatchAddr((std::string)table[index].szFuncName)) - { - HLEError(context, "OOVPA registration DISABLED while a patch exists!"); - } - } - else - if (table[index].Flags & Flag_XRef) - { - if (GetEmuPatchAddr((std::string)table[index].szFuncName)) - { - HLEError(context, "OOVPA registration XREF while a patch exists!"); - } - } - } + if (context->against == nullptr) { + const char* checkDisableStr = nullptr; + size_t getFuncStrLength = strlen(table[index].szFuncName); - // verify the OOVPA of this entry - if (table[index].Oovpa != nullptr) - VerifyHLEOOVPA(context, table[index].Oovpa); + if (getFuncStrLength > 10) { + checkDisableStr = &table[index].szFuncName[getFuncStrLength - 10]; + } + + if (checkDisableStr != nullptr && strcmp(checkDisableStr, "_UNPATCHED") == 0) { + if (GetEmuPatchAddr((std::string)table[index].szFuncName)) { + HLEError(context, table[index].Version, "OOVPA registration UNPATCHED while a patch exists!"); + } + } else if (table[index].Oovpa->XRefSaveIndex != XRefNoSaveIndex) { + if (GetEmuPatchAddr((std::string)table[index].szFuncName)) { + HLEError(context, table[index].Version, "OOVPA registration XREF while a patch exists!"); + } + } + } + + // verify the OOVPA of this entry + if (table[index].Oovpa != nullptr) { + VerifyHLEOOVPA(context, table[index].Version, table[index].Oovpa); + } } void VerifyHLEData(HLEVerifyContext *context, const HLEData *data) { - if (context->against == nullptr) { - context->main_data = data; - } else { - context->against_data = data; - } + if (context->against == nullptr) { + context->main_data = data; + } else { + context->against_data = data; + } - // Don't check a database against itself : - if (context->main_data == context->against_data) - return; + // Don't check a database against itself : + if (context->main_data == context->against_data) { + return; + } - // verify each entry in this HLEData - uint32 count = data->OovpaTableSize / sizeof(OOVPATable); - for (uint32 e = 0; e < count; e++) - VerifyHLEDataEntry(context, data->OovpaTable, e, count); + // verify each entry in this HLEData + uint32 count = data->OovpaTableSize / sizeof(OOVPATable); + for (uint32 e = 0; e < count; e++) { + VerifyHLEDataEntry(context, data->OovpaTable, e, count); + } } void VerifyHLEDataBaseAgainst(HLEVerifyContext *context) { - // verify all HLEData's - for (uint32 d = 0; d < HLEDataBaseCount; d++) - VerifyHLEData(context, &HLEDataBase[d]); + // verify all HLEData's + for (uint32 d = 0; d < HLEDataBaseCount; d++) { + VerifyHLEData(context, &HLEDataBase[d]); + } } void VerifyHLEDataBase() { - HLEVerifyContext context = { 0 }; - VerifyHLEDataBaseAgainst(&context); + HLEVerifyContext context = { 0 }; + VerifyHLEDataBaseAgainst(&context); } #endif // _DEBUG_TRACE