diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h index 18680de82..a9f0a5d54 100644 --- a/src/CxbxKrnl/HLEDataBase.h +++ b/src/CxbxKrnl/HLEDataBase.h @@ -85,14 +85,15 @@ enum XRefDataBaseOffset { XREF_D3DDEVICE=0, XREF_D3DDevice_SetRenderState_CullMode, - XREF_D3DRS_CULLMODE, - XREF_D3DTSS_TEXCOORDINDEX, - XREF_D3DRS_MULTISAMPLEMODE, - XREF_D3DRS_MULTISAMPLERENDERTARGETMODE, - XREF_D3DRS_ROPZCMPALWAYSREAD, - XREF_D3DRS_ROPZREAD, - XREF_D3DRS_DONOTCULLUNCOMPRESSED, - XREF_D3DRS_STENCILCULLENABLE, + XREF_D3D_RenderState_CullMode, + XREF_D3D_TextureState_TexCoordIndex, + XREF_D3D_RenderState_MultiSampleMode, + XREF_D3D_RenderState_MultiSampleRenderTargetMode, + XREF_D3D_RenderState_RopZCmpAlwaysRead, + XREF_D3D_RenderState_RopZRead, + XREF_D3D_RenderState_DoNotCullUncompressed, + XREF_D3D_RenderState_StencilCullEnable, + XREF_D3DDevice_SetLight, XREF_D3DDevice_LazySetStateVB, XREF_D3D_BlockOnResource, XREF_D3D_BlockOnTime, @@ -123,7 +124,6 @@ enum XRefDataBaseOffset XREF_CDirectSound_SetRolloffFactor, XREF_CMcpxAPU_Set3dRolloffFactor, XREF_CDirectSound_SetDopplerFactor, - XREF_SETBUFFERDATA, XREF_CMcpxBuffer_SetCurrentPosition, XREF_CDirectSoundBuffer_SetCurrentPosition, XREF_CMcpxBuffer_GetCurrentPosition, @@ -131,8 +131,7 @@ enum XRefDataBaseOffset XREF_CDirectSoundBuffer_Play, XREF_CMcpxBuffer_Stop, XREF_CDirectSoundBuffer_Stop, - XREF_DSFLUSHEX2, - XREF_DSSETBUFFERDATA, + XREF_CDirectSoundStream_FlushEx, XREF_CMcpxBuffer_SetBufferData, XREF_CDirectSoundBuffer_SetBufferData, XREF_CDirectSound_CreateSoundBuffer, @@ -156,18 +155,14 @@ enum XRefDataBaseOffset XREF_CMcpxAPU_ServiceDeferredCommandsLow, XREF_CDirectSound_SetAllParameters, XREF_CMcpxAPU_Set3dParameters, - XREF_DSSETHEADROOMA, XREF_CDirectSound_EnableHeadphones, - XREF_DSSYNCHPLAYBACKA, - XREF_DSSYNCHPLAYBACKB, - XREF_DSSETI3DL2SOURCE1A, - XREF_DSSETI3DL2SOURCE2A, + XREF_CDirectSound_SynchPlayback, + XREF_CMcpxAPU_SynchPlayback, XREF_CMcpxVoiceClient_SetPitch, XREF_CDirectSoundVoice_SetPitch, XREF_CDirectSoundBuffer_SetPitch, XREF_CDirectSoundStream_SetPitch, XREF_CMcpxVoiceClient_SetVolume, - XREF_DSBUFFERSETLOOPREGIONA, XREF_CDirectSoundBuffer_SetPlayRegion, XREF_CDirectSoundBuffer_Lock, XREF_CDirectSoundVoice_SetHeadroom, @@ -185,7 +180,6 @@ enum XRefDataBaseOffset XREF_CMcpxVoiceClient_Set3dConeOutsideVolume, XREF_CDirectSoundVoice_SetAllParameters, XREF_CMcpxVoiceClient_Set3dParameters, - XREF_DSSTREAMSETALLPARAMETERS1C, XREF_CDirectSoundStream_SetVelocity, XREF_CDirectSoundVoice_SetVelocity, XREF_CMcpxVoiceClient_Set3dVelocity, @@ -198,9 +192,6 @@ enum XRefDataBaseOffset XREF_CMcpxStream_Flush, XREF_CMcpxStream_Discontinuity, XREF_XAudioCalculatePitch, - XREF_DSSTREAMSETROLLOFFFACTOR1A, - XREF_DSSTREAMSETROLLOFFFACTOR1B, - XREF_GET2DSURFACEDESCB, XREF_D3D_CommonSetRenderTarget, XREF_CDirectSound_CommitDeferredSettings, XREF_CMcpxAPU_Commit3dSettings, @@ -211,10 +202,9 @@ enum XRefDataBaseOffset // DSOUND XREF_DS_CRefCount_AddRef, XREF_DS_CRefCount_Release, - XREF_DSVOICESETMAXDISTANCE, - XREF_DSVOICESETROLLOFFCURVE, - XREF_DSVOICESETROLLOFFFACTOR, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetRolloffCurve, + XREF_CDirectSoundVoice_SetRolloffFactor, + XREF_CDirectSoundVoice_SetDistanceFactor, XREF_CDirectSoundVoice_SetConeAngles, XREF_CDirectSoundVoice_SetDopplerFactor, XREF_CMcpxVoiceClient_Set3dMode, @@ -222,15 +212,15 @@ enum XRefDataBaseOffset XREF_CDirectSoundBuffer_SetMode, XREF_CDirectSoundBuffer_SetMaxDistance, XREF_CDirectSoundBuffer_SetMinDistance, - XREF_DSBUFFERSETROLLOFFCURVE, - XREF_DSBUFFERSETROLLOFFFACTOR, - XREF_DSBUFFERSETDISTANCEFACTOR, + XREF_CDirectSoundBuffer_SetRolloffCurve, + XREF_CDirectSoundBuffer_SetRolloffFactor, + XREF_CDirectSoundBuffer_SetDistanceFactor, XREF_CDirectSoundBuffer_SetConeAngles, XREF_CDirectSoundBuffer_SetConeOrientation, XREF_CDirectSoundBuffer_SetConeOutsideVolume, XREF_CDirectSoundBuffer_SetPosition, XREF_CDirectSoundBuffer_SetVelocity, - XREF_DSBUFFERSETDOPPLERFACTOR, + XREF_CDirectSoundBuffer_SetDopplerFactor, XREF_CDirectSoundBuffer_SetI3DL2Source, XREF_CDirectSoundVoice_SetFormat, XREF_CDirectSoundBuffer_SetFormat, @@ -317,12 +307,6 @@ enum XRefDataBaseOffset // XAPI XREF_XAPI_GetTypeInformation, - /* not necessary? - XREF_XAPIXCALCULATESIGNATUREBEGINEX - //*/ - // +s -// XREF_XLoadSectionByHandle, -// XREF_XFreeSectionByHandle, XREF_COUNT // XREF_COUNT must always be last. // Also, if XREF_COUNT > sizeof(uint16), enlarge struct OOVPA.XRefSaveIndex (and Value somehow) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl index 3997a959a..7908f1c4d 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl @@ -64,7 +64,7 @@ OOVPA_END; // * D3DDevice_GetTexture, named with 2 suffix to match EMUPATCH(D3DDevice_GetTexture2) // ****************************************************************** #if 0 // Derived XREF_OFFSET_D3DDEVICE_M_TEXTURES is not Implemented yet. -OOVPA_XREF(D3DDevice_GetTexture2, 3911, 1 + 21, // Also for 4361 +OOVPA_XREF(D3DDevice_GetTexture2, 3911, 1+21, // Also for 4361 XRefNoSaveIndex, XRefOne) @@ -397,13 +397,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_LightEnable // ****************************************************************** -OOVPA_XREF(D3DDevice_LightEnable, 3911, 1 + 24,// valid upto at least 4627, next known difference is from 5344 onwards +OOVPA_XREF(D3DDevice_LightEnable, 3911, 2+24,// valid upto at least 4627, next known difference is from 5344 onwards XRefNoSaveIndex, - XRefOne) + XRefTwo) XREF_ENTRY(0x0B, XREF_D3DDEVICE), - //XREF_ENTRY(0x67, XREF_D3DDEVICE_SETLIGHT), + XREF_ENTRY(0x67, XREF_D3DDevice_SetLight), { 0x00, 0x83 }, { 0x01, 0xEC }, @@ -521,7 +521,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BeginStateBlock // ****************************************************************** -OOVPA_XREF(D3DDevice_BeginStateBlock, 3911, 7, +OOVPA_XREF(D3DDevice_BeginStateBlock, 3911, 1+6, XRefNoSaveIndex, XRefOne) @@ -574,7 +574,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_EndStateBlock // ****************************************************************** -OOVPA_XREF(D3DDevice_EndStateBlock, 3911, 6, +OOVPA_XREF(D3DDevice_EndStateBlock, 3911, 1+5, XRefNoSaveIndex, XRefOne) @@ -998,7 +998,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 3911, 1+11, XRefNoSaveIndex, XRefOne) - XREF_ENTRY(0x11, XREF_D3DTSS_TEXCOORDINDEX), // Derived + XREF_ENTRY(0x11, XREF_D3D_TextureState_TexCoordIndex), // Derived // D3DDevice_SetTextureState_TexCoordIndex+0x0B : shl eax, 0x07 { 0x0B, 0xC1 }, @@ -1029,7 +1029,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 3911, 2+15, XRefTwo) XREF_ENTRY(0x03, XREF_D3DDEVICE), // Derived - XREF_ENTRY(0x25, XREF_D3DRS_CULLMODE), // Derived + XREF_ENTRY(0x25, XREF_D3D_RenderState_CullMode), // Derived // D3DDevice_SetRenderState_CullMode+0x42 : mov dword ptr [eax+8], 0x4039C { 0x42, 0xC7 }, @@ -2708,7 +2708,7 @@ OOVPA_END; // ****************************************************************** // * D3DVolumeTexture_LockBox // ****************************************************************** -OOVPA_XREF(D3DVolumeTexture_LockBox, 3911, 2, +OOVPA_XREF(D3DVolumeTexture_LockBox, 3911, 1+1, XRefNoSaveIndex, XRefOne) @@ -2748,7 +2748,7 @@ OOVPA_END; // ****************************************************************** // * D3DCubeTexture_LockRect // ****************************************************************** -OOVPA_XREF(D3DCubeTexture_LockRect, 3911, 2, +OOVPA_XREF(D3DCubeTexture_LockRect, 3911, 1+1, XRefNoSaveIndex, XRefOne) @@ -3433,12 +3433,12 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_StencilCullEnable // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 3911, 8, +OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 3911, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x0D, XREF_D3DRS_STENCILCULLENABLE ), + XREF_ENTRY( 0x0D, XREF_D3D_RenderState_StencilCullEnable ), { 0x0B, 0x56 }, { 0x16, 0x8B }, @@ -3677,7 +3677,10 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetLight // ****************************************************************** -OOVPA_NO_XREF(D3DDevice_SetLight, 3911, 15) +OOVPA_XREF(D3DDevice_SetLight, 3911, 15, + + XREF_D3DDevice_SetLight, + XRefZero) { 0x15, 0x00 }, { 0x16, 0x00 }, @@ -4116,13 +4119,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_RopZCmpAlwaysRead // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, 9, +OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, 1+8, XRefNoSaveIndex, XRefOne) // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] - XREF_ENTRY( 0x05, XREF_D3DRS_ROPZCMPALWAYSREAD ), + XREF_ENTRY( 0x05, XREF_D3D_RenderState_RopZCmpAlwaysRead ), // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, @@ -4142,13 +4145,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_RopZRead // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_RopZRead, 3911, 9, +OOVPA_XREF(D3DDevice_SetRenderState_RopZRead, 3911, 1+8, XRefNoSaveIndex, XRefOne) // D3DDevice_SetRenderState_RopZRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] - XREF_ENTRY( 0x05, XREF_D3DRS_ROPZREAD ), + XREF_ENTRY( 0x05, XREF_D3D_RenderState_RopZRead ), // D3DDevice_SetRenderState_RopZRead+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, @@ -4168,13 +4171,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_DoNotCullUncompressed // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, 9, +OOVPA_XREF(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, 1+8, XRefNoSaveIndex, XRefOne) // D3DDevice_SetRenderState_DoNotCullUncompressed+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] - XREF_ENTRY( 0x05, XREF_D3DRS_DONOTCULLUNCOMPRESSED ), + XREF_ENTRY( 0x05, XREF_D3D_RenderState_DoNotCullUncompressed ), // D3DDevice_SetRenderState_DoNotCullUncompressed+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, @@ -4247,7 +4250,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_InsertFence // ****************************************************************** -OOVPA_XREF(D3DDevice_InsertFence, 3911, 5, +OOVPA_XREF(D3DDevice_InsertFence, 3911, 1+4, XRefNoSaveIndex, XRefOne) @@ -4318,7 +4321,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BlockOnFence // ****************************************************************** -OOVPA_XREF(D3DDevice_BlockOnFence, 3911, 8, +OOVPA_XREF(D3DDevice_BlockOnFence, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -4482,7 +4485,7 @@ OOVPA_END; // ****************************************************************** // * D3DResource_BlockUntilNotBusy // ****************************************************************** -OOVPA_XREF(D3DResource_BlockUntilNotBusy, 3911, 2, +OOVPA_XREF(D3DResource_BlockUntilNotBusy, 3911, 1+1, XRefNoSaveIndex, XRefOne) @@ -4976,7 +4979,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_KickPushBuffer // ****************************************************************** -OOVPA_XREF(D3DDevice_KickPushBuffer, 3911, 4, +OOVPA_XREF(D3DDevice_KickPushBuffer, 3911, 1+3, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl index 92749a842..9a7b429bf 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl @@ -646,7 +646,7 @@ OOVPA_END; // * D3DDevice_GetTexture, named with 2 suffix to match EMUPATCH(D3DDevice_GetTexture2) // ****************************************************************** #if 0 // Derived XREF_OFFSET_D3DDEVICE_M_TEXTURES is not Implemented yet. -OOVPA_XREF(D3DDevice_GetTexture2, 3911, 1 + 21, // Also for 4361 +OOVPA_XREF(D3DDevice_GetTexture2, 3911, 1+21, // Also for 4361 XRefNoSaveIndex, XRefOne) @@ -1349,7 +1349,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 3925, 1+11, XRefNoSaveIndex, XRefOne) - XREF_ENTRY(0x11, XREF_D3DTSS_TEXCOORDINDEX), // Derived + XREF_ENTRY(0x11, XREF_D3D_TextureState_TexCoordIndex), // Derived // D3DDevice_SetTextureState_TexCoordIndex+0x0B : shl eax, 0x07 { 0x0B, 0xC1 }, @@ -1455,7 +1455,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 3925, 2+15, XRefTwo) XREF_ENTRY(0x03, XREF_D3DDEVICE), // Derived - XREF_ENTRY(0x25, XREF_D3DRS_CULLMODE), // Derived + XREF_ENTRY(0x25, XREF_D3D_RenderState_CullMode), // Derived // D3DDevice_SetRenderState_CullMode+0x42 : mov dword ptr [eax+8], 0x4039C { 0x42, 0xC7 }, @@ -2877,12 +2877,12 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_StencilCullEnable // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 3925, 8, +OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 3925, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x0D, XREF_D3DRS_STENCILCULLENABLE ), + XREF_ENTRY( 0x0D, XREF_D3D_RenderState_StencilCullEnable ), { 0x0B, 0x56 }, { 0x16, 0x8B }, @@ -3133,13 +3133,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_LightEnable // ****************************************************************** -OOVPA_XREF(D3DDevice_LightEnable, 3911, 1 + 24,// valid upto at least 4627, next known difference is from 5028 onwards +OOVPA_XREF(D3DDevice_LightEnable, 3911, 2+24,// valid upto at least 4627, next known difference is from 5028 onwards XRefNoSaveIndex, XRefOne) XREF_ENTRY(0x0B, XREF_D3DDEVICE), - //XREF_ENTRY(0x67, XREF_D3DDEVICE_SETLIGHT), + XREF_ENTRY(0x67, XREF_D3DDevice_SetLight), { 0x00, 0x83 }, { 0x01, 0xEC }, @@ -3544,13 +3544,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_RopZCmpAlwaysRead // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, 9, +OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, 1+8, XRefNoSaveIndex, XRefOne) // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] - XREF_ENTRY( 0x05, XREF_D3DRS_ROPZCMPALWAYSREAD ), + XREF_ENTRY( 0x05, XREF_D3D_RenderState_RopZCmpAlwaysRead ), // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, @@ -3571,13 +3571,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_RopZRead // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_RopZRead, 3925, 9, +OOVPA_XREF(D3DDevice_SetRenderState_RopZRead, 3925, 1+8, XRefNoSaveIndex, XRefOne) // D3DDevice_SetRenderState_RopZRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] - XREF_ENTRY( 0x05, XREF_D3DRS_ROPZREAD ), + XREF_ENTRY( 0x05, XREF_D3D_RenderState_RopZRead ), // D3DDevice_SetRenderState_RopZRead+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, @@ -3598,13 +3598,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_DoNotCullUncompressed // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 9, +OOVPA_XREF(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 1+8, XRefNoSaveIndex, XRefOne) // D3DDevice_SetRenderState_DoNotCullUncompressed+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] - XREF_ENTRY( 0x05, XREF_D3DRS_DONOTCULLUNCOMPRESSED ), + XREF_ENTRY( 0x05, XREF_D3D_RenderState_DoNotCullUncompressed ), // D3DDevice_SetRenderState_DoNotCullUncompressed+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, @@ -3680,7 +3680,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_InsertFence // ****************************************************************** -OOVPA_XREF(D3DDevice_InsertFence, 3925, 5, +OOVPA_XREF(D3DDevice_InsertFence, 3925, 1+4, XRefNoSaveIndex, XRefOne) @@ -3756,7 +3756,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BlockOnFence // ****************************************************************** -OOVPA_XREF(D3DDevice_BlockOnFence, 3925, 8, +OOVPA_XREF(D3DDevice_BlockOnFence, 3925, 1+7, XRefNoSaveIndex, XRefOne) @@ -3934,7 +3934,7 @@ OOVPA_END; // ****************************************************************** // * D3DResource_BlockUntilNotBusy // ****************************************************************** -OOVPA_XREF(D3DResource_BlockUntilNotBusy, 3925, 2, +OOVPA_XREF(D3DResource_BlockUntilNotBusy, 3925, 1+1, XRefNoSaveIndex, XRefOne) @@ -3974,7 +3974,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BeginStateBlock // ****************************************************************** -OOVPA_XREF(D3DDevice_BeginStateBlock, 3911, 7, +OOVPA_XREF(D3DDevice_BeginStateBlock, 3911, 1+6, XRefNoSaveIndex, XRefOne) @@ -4043,7 +4043,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_EndStateBlock // ****************************************************************** -OOVPA_XREF(D3DDevice_EndStateBlock, 3911, 6, +OOVPA_XREF(D3DDevice_EndStateBlock, 3911, 1+5, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl index 1ae49b9b2..9b58f6ed6 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl @@ -218,7 +218,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 4034, 2+14, XRefTwo) XREF_ENTRY(0x03, XREF_D3DDEVICE), // Derived - XREF_ENTRY(0x2B, XREF_D3DRS_CULLMODE), // Derived + XREF_ENTRY(0x2B, XREF_D3D_RenderState_CullMode), // Derived // D3DDevice_SetRenderState_CullMode+0x00 : push esi { 0x00, 0x56 }, @@ -1144,7 +1144,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4034, 1+10, XRefNoSaveIndex, XRefOne) - XREF_ENTRY(0x18, XREF_D3DTSS_TEXCOORDINDEX), // Derived + XREF_ENTRY(0x18, XREF_D3D_TextureState_TexCoordIndex), // Derived // D3DDevice_SetTextureState_TexCoordIndex+0x13 : shl eax, 0x07 { 0x13, 0xC1 }, @@ -1329,7 +1329,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_CreateImageSurface // ****************************************************************** -OOVPA_XREF(D3DDevice_CreateImageSurface, 4034, 2, +OOVPA_XREF(D3DDevice_CreateImageSurface, 4034, 1+1, XRefNoSaveIndex, XRefOne) @@ -2049,13 +2049,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_StencilCullEnable // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 4034, 13, +OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 4034, 1+12, XRefNoSaveIndex, XRefOne) // D3DDevice_SetRenderState_StencilCullEnable+0x0C : D3D__RenderState[D3DRS_STENCILCULLENABLE] - XREF_ENTRY( 0x0C, XREF_D3DRS_STENCILCULLENABLE ), + XREF_ENTRY( 0x0C, XREF_D3D_RenderState_StencilCullEnable ), // D3DDevice_SetRenderState_StencilCullEnable+0x15 : jb +0x05 { 0x15, 0x72 }, @@ -2400,7 +2400,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BlockOnFence // ****************************************************************** -OOVPA_XREF(D3DDevice_BlockOnFence, 4039, 8, +OOVPA_XREF(D3DDevice_BlockOnFence, 4039, 1+7, XRefNoSaveIndex, XRefOne) @@ -2526,7 +2526,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_IsFencePending // ****************************************************************** -OOVPA_XREF(D3DDevice_IsFencePending, 4039, 6, +OOVPA_XREF(D3DDevice_IsFencePending, 4039, 1+5, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl index a24e39194..97731e0a1 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl @@ -41,7 +41,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4134, 1+10, XRefNoSaveIndex, XRefOne) - XREF_ENTRY(0x18, XREF_D3DTSS_TEXCOORDINDEX), // Derived + XREF_ENTRY(0x18, XREF_D3D_TextureState_TexCoordIndex), // Derived // D3DDevice_SetTextureState_TexCoordIndex+0x13 : shl eax, 0x07 { 0x13, 0xC1 }, @@ -423,7 +423,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_CreateImageSurface // ****************************************************************** -OOVPA_XREF(D3DDevice_CreateImageSurface, 4134, 2, +OOVPA_XREF(D3DDevice_CreateImageSurface, 4134, 1+1, XRefNoSaveIndex, XRefOne) @@ -1063,7 +1063,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_FrontFace // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_FrontFace, 4134, 11, +OOVPA_XREF(D3DDevice_SetRenderState_FrontFace, 4134, 1+10, XRefNoSaveIndex, XRefOne) @@ -1168,13 +1168,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_StencilCullEnable // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 4134, 13, +OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 4134, 1+12, XRefNoSaveIndex, XRefOne) // D3DDevice_SetRenderState_StencilCullEnable+0x0C : D3D__RenderState[D3DRS_STENCILCULLENABLE] - XREF_ENTRY( 0x0C, XREF_D3DRS_STENCILCULLENABLE ), + XREF_ENTRY( 0x0C, XREF_D3D_RenderState_StencilCullEnable ), // D3DDevice_SetRenderState_StencilCullEnable+0x15 : jb +0x05 { 0x15, 0x72 }, @@ -2585,7 +2585,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BeginStateBlock // ****************************************************************** -OOVPA_XREF(D3DDevice_BeginStateBlock, 4134, 6, +OOVPA_XREF(D3DDevice_BeginStateBlock, 4134, 1+5, XRefNoSaveIndex, XRefOne) @@ -2632,7 +2632,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_EndStateBlock // ****************************************************************** -OOVPA_XREF(D3DDevice_EndStateBlock, 4134, 6, +OOVPA_XREF(D3DDevice_EndStateBlock, 4134, 1+5, XRefNoSaveIndex, XRefOne) @@ -2807,7 +2807,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_MakeSpace // ****************************************************************** -OOVPA_XREF(D3DDevice_MakeSpace, 4134, 8, +OOVPA_XREF(D3DDevice_MakeSpace, 4134, 1+7, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4242.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4242.inl index 44dbd7a73..29d65502a 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4242.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4242.inl @@ -116,7 +116,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4242, 1+10, XRefNoSaveIndex, XRefOne) - XREF_ENTRY(0x19, XREF_D3DTSS_TEXCOORDINDEX), // Derived + XREF_ENTRY(0x19, XREF_D3D_TextureState_TexCoordIndex), // Derived // D3DDevice_SetTextureState_TexCoordIndex+0x0D : shl eax, 0x07 { 0x0D, 0xC1 }, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl index 66b042944..60e846e2e 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl @@ -328,7 +328,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BeginStateBlock // ****************************************************************** -OOVPA_XREF(D3DDevice_BeginStateBlock, 4361, 6, +OOVPA_XREF(D3DDevice_BeginStateBlock, 4361, 1+5, XRefNoSaveIndex, XRefOne) @@ -410,7 +410,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_EndStateBlock // ****************************************************************** -OOVPA_XREF(D3DDevice_EndStateBlock, 4361, 6, +OOVPA_XREF(D3DDevice_EndStateBlock, 4361, 1+5, XRefNoSaveIndex, XRefOne) @@ -619,7 +619,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4242, 1+10, XRefNoSaveIndex, XRefOne) - XREF_ENTRY(0x19, XREF_D3DTSS_TEXCOORDINDEX), // Derived + XREF_ENTRY(0x19, XREF_D3D_TextureState_TexCoordIndex), // Derived // D3DDevice_SetTextureState_TexCoordIndex+0x0D : shl eax, 0x07 { 0x0D, 0xC1 }, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl index ee3014cbc..ce4300e54 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl @@ -338,7 +338,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderTarget // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderTarget, 4627, 13, +OOVPA_XREF(D3DDevice_SetRenderTarget, 4627, 1+12, XRefNoSaveIndex, XRefOne) @@ -462,7 +462,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_GetBackBuffer // ****************************************************************** -OOVPA_XREF(D3DDevice_GetBackBuffer, 4627, 11, +OOVPA_XREF(D3DDevice_GetBackBuffer, 4627, 1+10, XRefNoSaveIndex, XRefOne) @@ -516,7 +516,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_GetRenderTarget // ****************************************************************** -OOVPA_XREF(D3DDevice_GetRenderTarget, 4627, 13, +OOVPA_XREF(D3DDevice_GetRenderTarget, 4627, 1+12, XRefNoSaveIndex, XRefOne) @@ -541,7 +541,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_GetRenderTarget2 // ****************************************************************** -OOVPA_XREF(D3DDevice_GetRenderTarget2, 4627, 9, +OOVPA_XREF(D3DDevice_GetRenderTarget2, 4627, 1+8, XREF_D3DDevice_GetRenderTarget2, XRefOne) @@ -574,7 +574,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_GetDepthStencilSurface // ****************************************************************** -OOVPA_XREF(D3DDevice_GetDepthStencilSurface, 4627, 11, +OOVPA_XREF(D3DDevice_GetDepthStencilSurface, 4627, 1+10, XRefNoSaveIndex, XRefOne) @@ -715,7 +715,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetTile // ****************************************************************** -OOVPA_XREF(D3DDevice_SetTile, 4627, 3, +OOVPA_XREF(D3DDevice_SetTile, 4627, 1+2, XRefNoSaveIndex, XRefOne) @@ -746,7 +746,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_CreateIndexBuffer // ****************************************************************** -OOVPA_XREF(D3DDevice_CreateIndexBuffer, 4627, 11, +OOVPA_XREF(D3DDevice_CreateIndexBuffer, 4627, 1+10, XRefNoSaveIndex, XRefOne) @@ -1476,7 +1476,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_CreateVertexBuffer // ****************************************************************** -OOVPA_XREF(D3DDevice_CreateVertexBuffer, 4627, 13, +OOVPA_XREF(D3DDevice_CreateVertexBuffer, 4627, 1+12, XRefNoSaveIndex, XRefOne) @@ -1686,7 +1686,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4627, 1+10, XRefNoSaveIndex, XRefOne) - XREF_ENTRY(0x19, XREF_D3DTSS_TEXCOORDINDEX), // Derived + XREF_ENTRY(0x19, XREF_D3D_TextureState_TexCoordIndex), // Derived // D3DDevice_SetTextureState_TexCoordIndex+0x14 : shl eax, 0x07 { 0x14, 0xC1 }, @@ -2007,7 +2007,7 @@ OOVPA_END; // ****************************************************************** // * D3DVertexBuffer_Lock // ****************************************************************** -OOVPA_XREF(D3DVertexBuffer_Lock, 4627, 26, +OOVPA_XREF(D3DVertexBuffer_Lock, 4627, 1+25, XRefNoSaveIndex, XRefOne) @@ -2208,7 +2208,7 @@ OOVPA_END; // ****************************************************************** // * D3DTexture_GetSurfaceLevel // ****************************************************************** -OOVPA_XREF(D3DTexture_GetSurfaceLevel, 4627, 13, +OOVPA_XREF(D3DTexture_GetSurfaceLevel, 4627, 1+12, XRefNoSaveIndex, XRefOne) @@ -2351,7 +2351,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_EndPush // ****************************************************************** -OOVPA_XREF(D3DDevice_EndPush, 4627, 12, +OOVPA_XREF(D3DDevice_EndPush, 4627, 1+11, XRefNoSaveIndex, XRefOne) @@ -2777,7 +2777,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_KickPushBuffer // ****************************************************************** -OOVPA_XREF(D3DDevice_KickPushBuffer, 4627, 4, +OOVPA_XREF(D3DDevice_KickPushBuffer, 4627, 1+3, XRefNoSaveIndex, XRefOne) @@ -2794,7 +2794,7 @@ OOVPA_END; // * D3DDevice_GetTexture2 // ****************************************************************** #if 0 // Derived XREF_OFFSET_D3DDEVICE_M_TEXTURES is not Implemented yet. -OOVPA_XREF(D3DDevice_GetTexture2, 4627, 1 + 21, // Also for 5344, 5558, 5659, 5788, 5849, 5933 +OOVPA_XREF(D3DDevice_GetTexture2, 4627, 1+21, // Also for 5344, 5558, 5659, 5788, 5849, 5933 XRefNoSaveIndex, XRefOne) @@ -3048,12 +3048,12 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4627, 11, +OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4627, 1+10, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x0B, XREF_D3DRS_MULTISAMPLERENDERTARGETMODE ), + XREF_ENTRY( 0x0B, XREF_D3D_RenderState_MultiSampleRenderTargetMode ), { 0x03, 0x04 }, @@ -3166,7 +3166,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BlockOnFence // ****************************************************************** -OOVPA_XREF(D3DDevice_BlockOnFence, 4627, 8, +OOVPA_XREF(D3DDevice_BlockOnFence, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -3315,7 +3315,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_CreatePalette // ****************************************************************** -OOVPA_XREF(D3DDevice_CreatePalette, 4627, 11, +OOVPA_XREF(D3DDevice_CreatePalette, 4627, 1+10, XRefNoSaveIndex, XRefOne) @@ -3355,7 +3355,7 @@ OOVPA_END; // ****************************************************************** // * D3DPalette_Lock // ****************************************************************** -OOVPA_XREF(D3DPalette_Lock, 4627, 8, +OOVPA_XREF(D3DPalette_Lock, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -3721,7 +3721,7 @@ OOVPA_END; // ****************************************************************** // * IDirect3DVertexBuffer8_Lock // ****************************************************************** -OOVPA_XREF(IDirect3DVertexBuffer8_Lock, 4627, 11, +OOVPA_XREF(IDirect3DVertexBuffer8_Lock, 4627, 1+10, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl index d03700511..2c43ca52d 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl @@ -835,7 +835,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BeginPush // ****************************************************************** -OOVPA_XREF(D3DDevice_BeginPush, 5028, 10, +OOVPA_XREF(D3DDevice_BeginPush, 5028, 1+9, XRefNoSaveIndex, XRefOne) @@ -904,7 +904,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_IsFencePending // ****************************************************************** -OOVPA_XREF(D3DDevice_IsFencePending, 5028, 6, +OOVPA_XREF(D3DDevice_IsFencePending, 5028, 1+5, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index 3037cf4bd..79cefde05 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -135,7 +135,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 5233, 2+13, XRefTwo) XREF_ENTRY(0x03, XREF_D3DDEVICE), // Derived - XREF_ENTRY(0x2B, XREF_D3DRS_CULLMODE), // Derived + XREF_ENTRY(0x2B, XREF_D3D_RenderState_CullMode), // Derived // D3DDevice_SetRenderState_CullMode+0x19 : mov dword ptr [eax], 0x40308 { 0x19, 0xC7 }, @@ -397,12 +397,12 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5233, 8, +OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5233, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x0B, XREF_D3DRS_MULTISAMPLERENDERTARGETMODE ), + XREF_ENTRY( 0x0B, XREF_D3D_RenderState_MultiSampleRenderTargetMode ), { 0x03, 0x04 }, { 0x0F, 0x8B }, @@ -436,7 +436,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BlockOnFence // ****************************************************************** -OOVPA_XREF(D3DDevice_BlockOnFence, 5233, 6, +OOVPA_XREF(D3DDevice_BlockOnFence, 5233, 1+5, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl index 9ea9d40c9..0d9bcad11 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl @@ -131,7 +131,10 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetLight // ****************************************************************** -OOVPA_NO_XREF(D3DDevice_SetLight, 5344, 15) +OOVPA_XREF(D3DDevice_SetLight, 5344, 15, + + XREF_D3DDevice_SetLight, + XRefZero) // D3DDevice_SetLight+0x1f : add REG, 0x10 { 0x1F, 0x83 }, @@ -181,12 +184,12 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, 8, +OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x0B, XREF_D3DRS_MULTISAMPLERENDERTARGETMODE ), + XREF_ENTRY( 0x0B, XREF_D3D_RenderState_MultiSampleRenderTargetMode ), { 0x03, 0x04 }, { 0x0F, 0x8B }, @@ -274,13 +277,13 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_LightEnable // ****************************************************************** -OOVPA_XREF(D3DDevice_LightEnable, 5344, 1+24, +OOVPA_XREF(D3DDevice_LightEnable, 5344, 2+24, XRefNoSaveIndex, - XRefOne) + XRefTwo) XREF_ENTRY(0x0B, XREF_D3DDEVICE), - //XREF_ENTRY(0x67, XREF_D3DDEVICE_SETLIGHT), + XREF_ENTRY(0x67, XREF_D3DDevice_SetLight), { 0x00, 0x83 }, { 0x01, 0xEC }, @@ -1250,7 +1253,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BeginPush // ****************************************************************** -OOVPA_XREF(D3DDevice_BeginPush, 5344, 10, +OOVPA_XREF(D3DDevice_BeginPush, 5344, 1+9, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl index 265af1ce9..bf90b287c 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl @@ -61,7 +61,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_BeginPush // ****************************************************************** -OOVPA_XREF(D3DDevice_BeginPush, 5558, 10, +OOVPA_XREF(D3DDevice_BeginPush, 5558, 1+9, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl index 74eed9d94..3cb2eeabf 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl @@ -435,7 +435,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetVerticalBlankCallback // ****************************************************************** -OOVPA_XREF(D3DDevice_SetVerticalBlankCallback, 5788, 7, +OOVPA_XREF(D3DDevice_SetVerticalBlankCallback, 5788, 1+6, XRefNoSaveIndex, XRefOne) @@ -729,7 +729,7 @@ OOVPA_END; // ****************************************************************** // * FOR DEBUGGING ONLY! // ****************************************************************** -OOVPA_XREF(D3D_Unknown, 5788, 6, +OOVPA_XREF(D3D_Unknown, 5788, 1+5, XRefNoSaveIndex, XRefOne) @@ -988,12 +988,12 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_SetRenderState_RopZCmpAlwaysRead // ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 5788, 7, +OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 5788, 1+6, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x05, XREF_D3DRS_ROPZCMPALWAYSREAD ), + XREF_ENTRY( 0x05, XREF_D3D_RenderState_RopZCmpAlwaysRead ), { 0x01, 0x44 }, { 0x04, 0xA3 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl index d109bb6b8..62ed9e044 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl @@ -103,7 +103,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_DoWork // ****************************************************************** -OOVPA_XREF(CDirectSound_DoWork, 3911, 9, +OOVPA_XREF(CDirectSound_DoWork, 3911, 1+8, XREF_CDirectSound_DoWork, XRefOne) @@ -129,7 +129,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundDoWork // ****************************************************************** -OOVPA_XREF(DirectSoundDoWork, 3911, 9, +OOVPA_XREF(DirectSoundDoWork, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -192,7 +192,7 @@ OOVPA_END; // * IDirectSound_CreateSoundBuffer // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_CreateSoundBuffer, 3911, 12, +OOVPA_XREF(IDirectSound_CreateSoundBuffer, 3911, 1+11, XREF_IDirectSound_CreateSoundBuffer, XRefOne) @@ -223,7 +223,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundCreateBuffer // ****************************************************************** -OOVPA_XREF(DirectSoundCreateBuffer, 3911, 12, +OOVPA_XREF(DirectSoundCreateBuffer, 3911, 1+11, XRefNoSaveIndex, XRefOne) @@ -287,7 +287,7 @@ OOVPA_END; // * IDirectSound_CreateSoundStream // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_CreateSoundStream, 3911, 10, +OOVPA_XREF(IDirectSound_CreateSoundStream, 3911, 1+9, XREF_IDirectSound_CreateSoundStream, XRefOne) @@ -314,7 +314,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundCreateStream // ****************************************************************** -OOVPA_XREF(DirectSoundCreateStream, 3911, 12, +OOVPA_XREF(DirectSoundCreateStream, 3911, 1+11, XRefNoSaveIndex, XRefOne) @@ -454,7 +454,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVolume, 3911, 11, +OOVPA_XREF(CDirectSoundVoice_SetVolume, 3911, 1+10, XREF_CDirectSoundVoice_SetVolume, XRefOne) @@ -485,7 +485,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetVolume // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVolume, 3911, 10, +OOVPA_XREF(IDirectSoundBuffer_SetVolume, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -539,7 +539,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_StopEx // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_StopEx, 3911, 11, +OOVPA_XREF(CDirectSoundBuffer_StopEx, 3911, 1+10, XREF_CDirectSoundBuffer_StopEx, XRefOne) @@ -570,7 +570,7 @@ OOVPA_END; // * IDirectSoundBuffer_StopEx // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundBuffer_StopEx, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_StopEx, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -591,7 +591,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_Stop // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Stop, 3911, 13, +OOVPA_XREF(CDirectSoundBuffer_Stop, 3911, 1+12, XREF_CDirectSoundBuffer_Stop, XRefOne) @@ -621,7 +621,7 @@ OOVPA_END; // * IDirectSoundBuffer_Stop // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundBuffer_Stop, 3911, 12, +OOVPA_XREF(IDirectSoundBuffer_Stop, 3911, 1+11, XRefNoSaveIndex, XRefOne) @@ -678,7 +678,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetLoopRegion // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 3911, 10, +OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -724,7 +724,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_PlayEx // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_PlayEx, 3911, 9, +OOVPA_XREF(CDirectSoundBuffer_PlayEx, 3911, 1+8, XREF_CDirectSoundBuffer_PlayEx, XRefOne) @@ -748,7 +748,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_Play // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 3911, 8, +OOVPA_XREF(CDirectSoundBuffer_Play, 3911, 1+7, XREF_CDirectSoundBuffer_Play, XRefOne) @@ -768,7 +768,7 @@ OOVPA_END; // * IDirectSoundBuffer_Play // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundBuffer_Play, 3911, 16, +OOVPA_XREF(IDirectSoundBuffer_Play, 3911, 1+15, XRefNoSaveIndex, XRefOne) @@ -806,7 +806,7 @@ OOVPA_END; // * IDirectSoundBuffer_PlayEx // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundBuffer_PlayEx, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_PlayEx, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -862,7 +862,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_GetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 3911, 9, +OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 3911, 1+8, XREF_CDirectSoundBuffer_GetCurrentPosition, XRefOne) @@ -889,7 +889,7 @@ OOVPA_END; // * IDirectSoundBuffer_GetCurrentPosition // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundBuffer_GetCurrentPosition, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_GetCurrentPosition, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -946,7 +946,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_GetStatus // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetStatus, 3911, 10, +OOVPA_XREF(CDirectSoundBuffer_GetStatus, 3911, 1+9, XREF_CDirectSoundBuffer_GetStatus, XRefOne) @@ -974,7 +974,7 @@ OOVPA_END; // * IDirectSoundBuffer_GetStatus // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundBuffer_GetStatus, 3911, 10, +OOVPA_XREF(IDirectSoundBuffer_GetStatus, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -1025,7 +1025,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetFilter // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetFilter, 3911, 10, +OOVPA_XREF(CDirectSoundVoice_SetFilter, 3911, 1+9, XREF_CDirectSoundVoice_SetFilter, XRefOne) @@ -1046,7 +1046,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetFilter // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFilter, 3911, 10, +OOVPA_XREF(IDirectSoundBuffer_SetFilter, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -1097,7 +1097,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetLFO, 3911, 10, +OOVPA_XREF(CDirectSoundVoice_SetLFO, 3911, 1+9, XREF_CDirectSoundVoice_SetLFO, XRefOne) @@ -1118,7 +1118,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetLFO // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLFO, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_SetLFO, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -1161,7 +1161,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetEG // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetEG, 3911, 10, +OOVPA_XREF(CDirectSoundVoice_SetEG, 3911, 1+9, XREF_CDirectSoundVoice_SetEG, XRefOne) @@ -1182,7 +1182,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetEG // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetEG, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_SetEG, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -1201,7 +1201,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetEG & CDirectSoundStream_SetEG // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetEG, 3911, 9, +OOVPA_XREF(IDirectSoundStream_SetEG, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -1222,7 +1222,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetOutputBuffer // ****************************************************************** //Generic OOVPA as of 3911 and newer -OOVPA_XREF(IDirectSoundBuffer_SetOutputBuffer, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_SetOutputBuffer, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -1241,7 +1241,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 3911, 8, +OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 3911, 1+7, XREF_CDirectSoundVoice_SetMixBinVolumes, XRefOne) @@ -1260,7 +1260,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMixBinVolumes_12 // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBinVolumes_12, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_SetMixBinVolumes_12, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -1280,7 +1280,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_12, 3911, 9, +OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_12, 3911, 1+8, XREF_CDirectSoundStream_SetMixBinVolumes_12, XRefOne) @@ -1326,7 +1326,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_CommitDeferredSettings // ****************************************************************** -OOVPA_XREF(CDirectSound_CommitDeferredSettings, 3911, 10, +OOVPA_XREF(CDirectSound_CommitDeferredSettings, 3911, 1+9, XREF_CDirectSound_CommitDeferredSettings, XRefOne) @@ -1356,7 +1356,7 @@ OOVPA_END; // * IDirectSound_CommitDeferredSettings // ****************************************************************** //Generic OOVPA as of 3911 and newer -OOVPA_XREF(IDirectSound_CommitDeferredSettings, 3911, 8, +OOVPA_XREF(IDirectSound_CommitDeferredSettings, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -1407,7 +1407,7 @@ OOVPA_END; // * IDirectSound_SetOrientation // ****************************************************************** //Generic OOVPA as of 3911 and newer -OOVPA_XREF(IDirectSound_SetOrientation, 3911, 15, +OOVPA_XREF(IDirectSound_SetOrientation, 3911, 1+14, XRefNoSaveIndex, XRefOne) @@ -1523,7 +1523,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetPitch // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetPitch, 3911, 12, +OOVPA_XREF(CDirectSoundVoice_SetPitch, 3911, 1+11, XREF_CDirectSoundVoice_SetPitch, XRefOne) @@ -1554,7 +1554,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetPitch // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPitch, 3911, 10, +OOVPA_XREF(IDirectSoundBuffer_SetPitch, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -1639,7 +1639,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundUseFullHRTF // ****************************************************************** -OOVPA_XREF(DirectSoundUseFullHRTF, 3911, 8, +OOVPA_XREF(DirectSoundUseFullHRTF, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -1687,7 +1687,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundUseLightHRTF // ****************************************************************** -OOVPA_XREF(DirectSoundUseLightHRTF, 3911, 8, +OOVPA_XREF(DirectSoundUseLightHRTF, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -1706,7 +1706,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetFrequency // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetFrequency, 3911, 9, +OOVPA_XREF(CDirectSoundVoice_SetFrequency, 3911, 1+8, XREF_CDirectSoundVoice_SetFrequency, XRefOne) @@ -1732,7 +1732,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetFrequency // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFrequency, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_SetFrequency, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -1793,7 +1793,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 3911, 9, +OOVPA_XREF(CDirectSoundVoice_SetMixBins, 3911, 1+8, XREF_CDirectSoundVoice_SetMixBins, XRefOne) @@ -1819,7 +1819,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMixBins // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -1861,7 +1861,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetOutputBuffer // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 3911, 13, +OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 3911, 1+12, XREF_CDirectSoundBuffer_SetOutputBuffer, XRefOne) @@ -1897,7 +1897,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 3911, 9, - XREF_DSSETBUFFERDATA, + XREF_CDirectSoundBuffer_SetBufferData, XRefZero) // CDirectSoundBuffer_SetBufferData+0x22 : cmp ecx, [eax+0x4C] @@ -1919,13 +1919,13 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetBufferData // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 3911, 10, +OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 3911, 1+9, XRefNoSaveIndex, XRefOne) // IDirectSoundBuffer_SetBufferData+0x18 : call [CDirectSoundBuffer_SetBufferData] - XREF_ENTRY( 0x19, XREF_DSSETBUFFERDATA ), + XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetBufferData ), // IDirectSoundBuffer_SetBufferData+0x04 : push [esp+0x0C] { 0x04, 0xFF }, @@ -1964,7 +1964,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetNotificationPositions // ****************************************************************** //Generic OOVPA as of 3911 and newer -OOVPA_XREF(IDirectSoundBuffer_SetNotificationPositions, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_SetNotificationPositions, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -1984,7 +1984,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 3911, 12, +OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 3911, 1+11, XREF_CDirectSoundVoice_SetHeadroom, XRefOne) @@ -2017,7 +2017,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetHeadroom // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 3911, 10, +OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -2044,7 +2044,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Pause // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Pause, 3911, 7, +OOVPA_XREF(CDirectSoundStream_Pause, 3911, 1+6, XREF_CDirectSoundStream_Pause, XRefOne) @@ -2152,7 +2152,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Flush // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Flush, 3911, 9, +OOVPA_XREF(CDirectSoundStream_Flush, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -2177,7 +2177,7 @@ OOVPA_END; // ****************************************************************** // * CMcpxStream_Discontinuity // ****************************************************************** -OOVPA_XREF(CMcpxStream_Discontinuity, 3911, 12, +OOVPA_XREF(CMcpxStream_Discontinuity, 3911, 1+11, XREF_CMcpxStream_Discontinuity, XRefOne) @@ -2206,7 +2206,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Discontinuity // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Discontinuity, 3911, 9, +OOVPA_XREF(CDirectSoundStream_Discontinuity, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -2293,7 +2293,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 3911, 15, +OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 3911, 1+14, XREF_CDirectSoundVoice_SetMaxDistance, XRefOne) @@ -2328,7 +2328,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 3911, 9, +OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 3911, 1+8, XREF_CDirectSoundBuffer_SetMaxDistance, XRefOne) @@ -2349,7 +2349,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetMaxDistance // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -2367,7 +2367,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMaxDistance, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetMaxDistance, 3911, 1+9, XREF_CDirectSoundStream_SetMaxDistance, XRefOne) @@ -2395,7 +2395,7 @@ OOVPA_END; // * IDirectSoundStream_SetMaxDistance // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundStream_SetMaxDistance, 3911, 11, +OOVPA_XREF(IDirectSoundStream_SetMaxDistance, 3911, 1+10, XRefNoSaveIndex, XRefOne) @@ -2450,7 +2450,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 3911, 15, +OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 3911, 1+14, XREF_CDirectSoundVoice_SetMinDistance, XRefOne) @@ -2486,7 +2486,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 3911, 9, +OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 3911, 1+8, XREF_CDirectSoundBuffer_SetMinDistance, XRefOne) @@ -2507,7 +2507,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetMinDistance // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -2526,7 +2526,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistance, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetMinDistance, 3911, 1+9, XREF_CDirectSoundStream_SetMinDistance, XRefOne) @@ -2554,7 +2554,7 @@ OOVPA_END; // * IDirectSoundStream_SetMinDistance // ****************************************************************** //Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundStream_SetMinDistance, 3911, 11, +OOVPA_XREF(IDirectSoundStream_SetMinDistance, 3911, 1+10, XRefNoSaveIndex, XRefOne) @@ -2609,7 +2609,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeOutsideVolume, 3911, 12, +OOVPA_XREF(CDirectSoundVoice_SetConeOutsideVolume, 3911, 1+11, XREF_CDirectSoundVoice_SetConeOutsideVolume, XRefOne) @@ -2638,7 +2638,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeOutsideVolume, 3911, 2, +OOVPA_XREF(CDirectSoundBuffer_SetConeOutsideVolume, 3911, 1+1, XREF_CDirectSoundBuffer_SetConeOutsideVolume, XRefOne) @@ -2653,7 +2653,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetConeOutsideVolume, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_SetConeOutsideVolume, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -2679,7 +2679,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolume, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolume, 3911, 1+9, XREF_CDirectSoundStream_SetConeOutsideVolume, XRefOne) @@ -2729,7 +2729,7 @@ OOVPA_END; // ****************************************************************** // * CMcpxVoiceClient_Set3dParameters // ****************************************************************** -OOVPA_XREF(CMcpxVoiceClient_Set3dParameters, 3911, 12, +OOVPA_XREF(CMcpxVoiceClient_Set3dParameters, 3911, 1+11, XREF_CMcpxVoiceClient_Set3dParameters, XRefOne) @@ -2752,7 +2752,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 3911, 12, +OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 3911, 1+11, XREF_CDirectSoundVoice_SetAllParameters, XRefOne) @@ -2783,7 +2783,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetAllParameters, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetAllParameters, 3911, 1+9, XREF_CDirectSoundStream_SetAllParameters, XRefOne) @@ -2810,7 +2810,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetAllParameters // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetAllParameters, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_SetAllParameters, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -2848,7 +2848,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetConeAngles // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -2867,7 +2867,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeAngles, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetConeAngles, 3911, 1+9, XREF_CDirectSoundStream_SetConeAngles, XRefOne) @@ -2920,7 +2920,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 3911, 14, +OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 3911, 1+13, XREF_CDirectSoundVoice_SetConeOrientation, XRefOne) @@ -2955,7 +2955,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeOrientation, 3911, 11, +OOVPA_XREF(CDirectSoundBuffer_SetConeOrientation, 3911, 1+10, XREF_CDirectSoundBuffer_SetConeOrientation, XRefOne) @@ -2983,7 +2983,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetConeOrientation // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundBuffer_SetConeOrientation, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_SetConeOrientation, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -3009,7 +3009,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOrientation, 3911, 9, +OOVPA_XREF(CDirectSoundStream_SetConeOrientation, 3911, 1+8, XREF_CDirectSoundStream_SetConeOrientation, XRefOne) @@ -3037,7 +3037,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetConeOrientation // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetConeOrientation, 3911, 9, +OOVPA_XREF(IDirectSoundStream_SetConeOrientation, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -3090,7 +3090,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMode, 3911, 10, +OOVPA_XREF(CDirectSoundVoice_SetMode, 3911, 1+9, XREF_CDirectSoundVoice_SetMode, XRefOne) @@ -3117,7 +3117,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMode // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMode, 3911, 10, +OOVPA_XREF(IDirectSoundBuffer_SetMode, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -3144,7 +3144,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMode, 3911, 7, +OOVPA_XREF(CDirectSoundStream_SetMode, 3911, 1+6, XREF_CDirectSoundStream_SetMode, XRefOne) @@ -3193,7 +3193,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetPosition, 3911, 14, +OOVPA_XREF(CDirectSoundVoice_SetPosition, 3911, 1+13, XREF_CDirectSoundVoice_SetPosition, XRefOne) @@ -3228,7 +3228,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPosition, 3911, 9, +OOVPA_XREF(CDirectSoundStream_SetPosition, 3911, 1+8, XREF_CDirectSoundStream_SetPosition, XRefOne) @@ -3254,7 +3254,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetPosition // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetPosition, 3911, 9, +OOVPA_XREF(IDirectSoundStream_SetPosition, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -3280,7 +3280,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPosition, 3911, 9, +OOVPA_XREF(CDirectSoundBuffer_SetPosition, 3911, 1+8, XREF_CDirectSoundBuffer_SetPosition, XRefOne) @@ -3306,7 +3306,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetPosition // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPosition, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_SetPosition, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -3359,7 +3359,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSound_SetPosition, 3911, 10, +OOVPA_XREF(CDirectSound_SetPosition, 3911, 1+9, XREF_CDirectSound_SetPosition, XRefOne) @@ -3387,7 +3387,7 @@ OOVPA_END; // * IDirectSound_SetPosition // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_SetPosition, 3911, 11, +OOVPA_XREF(IDirectSound_SetPosition, 3911, 1+10, XRefNoSaveIndex, XRefOne) @@ -3444,7 +3444,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVelocity, 3911, 14, +OOVPA_XREF(CDirectSoundVoice_SetVelocity, 3911, 1+13, XREF_CDirectSoundVoice_SetVelocity, XRefOne) @@ -3479,7 +3479,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVelocity, 3911, 9, +OOVPA_XREF(CDirectSoundStream_SetVelocity, 3911, 1+8, XREF_CDirectSoundStream_SetVelocity, XRefOne) @@ -3505,7 +3505,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetVelocity // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetVelocity, 3911, 9, +OOVPA_XREF(IDirectSoundStream_SetVelocity, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -3531,7 +3531,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 3911, 9, +OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 3911, 1+8, XREF_CDirectSoundBuffer_SetVelocity, XRefOne) @@ -3558,7 +3558,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetVelocity // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSoundBuffer_SetVelocity, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_SetVelocity, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -3584,7 +3584,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetOutputBuffer // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetOutputBuffer, 3911, 12, +OOVPA_XREF(CDirectSoundStream_SetOutputBuffer, 3911, 1+11, XREF_CDirectSoundStream_SetOutputBuffer, XRefOne) @@ -3632,7 +3632,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetI3DL2Source, 3911, 9, +OOVPA_XREF(CDirectSoundVoice_SetI3DL2Source, 3911, 1+8, XREF_CDirectSoundVoice_SetI3DL2Source, XRefOne) @@ -3652,7 +3652,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetI3DL2Source // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -3672,7 +3672,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetI3DL2Source, 3911, 9, +OOVPA_XREF(CDirectSoundStream_SetI3DL2Source, 3911, 1+8, XREF_CDirectSoundStream_SetI3DL2Source, XRefOne) @@ -3717,7 +3717,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_Lock // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Lock, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_Lock, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -3769,7 +3769,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 3911, 12, +OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 3911, 1+11, XREF_CDirectSoundBuffer_SetCurrentPosition, XRefOne) @@ -3801,7 +3801,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetCurrentPosition // ****************************************************************** // Generic OOVPA as of 3911 and newer -OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 3911, 10, +OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -3858,7 +3858,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_AddRef // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_AddRef, 3911, 8, +OOVPA_XREF(CDirectSoundStream_AddRef, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -3915,7 +3915,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Release // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Release, 3911, 8, +OOVPA_XREF(CDirectSoundStream_Release, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -3961,7 +3961,7 @@ OOVPA_END; // * IDirectSound_GetCaps // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_GetCaps, 3911, 8, +OOVPA_XREF(IDirectSound_GetCaps, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -4013,7 +4013,7 @@ OOVPA_END; // * IDirectSound_GetSpeakerConfig // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_GetSpeakerConfig, 3911, 8, +OOVPA_XREF(IDirectSound_GetSpeakerConfig, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -4079,7 +4079,7 @@ OOVPA_END; // * IDirectSound_DownloadEffectsImage // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_DownloadEffectsImage, 3911, 12, +OOVPA_XREF(IDirectSound_DownloadEffectsImage, 3911, 1+11, XRefNoSaveIndex, XRefOne) @@ -4155,7 +4155,7 @@ OOVPA_END; // * IDirectSound_GetEffectData // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_GetEffectData, 3911, 12, +OOVPA_XREF(IDirectSound_GetEffectData, 3911, 1+11, XRefNoSaveIndex, XRefOne) @@ -4236,7 +4236,7 @@ OOVPA_END; // * IDirectSound_SetEffectData // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_SetEffectData, 3911, 12, +OOVPA_XREF(IDirectSound_SetEffectData, 3911, 1+11, XRefNoSaveIndex, XRefOne) @@ -4298,7 +4298,7 @@ OOVPA_END; // * IDirectSound_CommitEffectData // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_CommitEffectData, 3911, 8, +OOVPA_XREF(IDirectSound_CommitEffectData, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -4370,7 +4370,7 @@ OOVPA_END; // * IDirectSound_EnableHeadphones // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_EnableHeadphones, 3911, 10, +OOVPA_XREF(IDirectSound_EnableHeadphones, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -4422,7 +4422,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetMixBinHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSound_SetMixBinHeadroom, 3911, 9, +OOVPA_XREF(CDirectSound_SetMixBinHeadroom, 3911, 1+8, XREF_CDirectSound_SetMixBinHeadroom, XRefOne) @@ -4449,7 +4449,7 @@ OOVPA_END; // * IDirectSound_SetMixBinHeadroom // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 3911, 12, +OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 3911, 1+11, XRefNoSaveIndex, XRefOne) @@ -4497,7 +4497,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound::SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParameters, 3911, 9, +OOVPA_XREF(CDirectSound_SetAllParameters, 3911, 1+8, XREF_CDirectSound_SetAllParameters, XRefOne) @@ -4518,7 +4518,7 @@ OOVPA_END; // * IDirectSound_SetAllParameters // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_SetAllParameters, 3911, 12, +OOVPA_XREF(IDirectSound_SetAllParameters, 3911, 1+11, XRefNoSaveIndex, XRefOne) @@ -4578,7 +4578,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDistanceFactor, 3911, 12, +OOVPA_XREF(CDirectSound_SetDistanceFactor, 3911, 1+11, XREF_CDirectSound_SetDistanceFactor, XRefOne) @@ -4608,7 +4608,7 @@ OOVPA_END; // * IDirectSound_SetDistanceFactor // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_SetDistanceFactor, 3911, 11, +OOVPA_XREF(IDirectSound_SetDistanceFactor, 3911, 1+10, XRefNoSaveIndex, XRefOne) @@ -4667,7 +4667,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDopplerFactor, 3911, 9, +OOVPA_XREF(CDirectSound_SetDopplerFactor, 3911, 1+8, XREF_CDirectSound_SetDopplerFactor, XRefOne) @@ -4688,7 +4688,7 @@ OOVPA_END; // * IDirectSound_SetDopplerFactor // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_SetDopplerFactor, 3911, 11, +OOVPA_XREF(IDirectSound_SetDopplerFactor, 3911, 1+10, XRefNoSaveIndex, XRefOne) @@ -4744,7 +4744,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSound_SetVelocity, 3911, 10, +OOVPA_XREF(CDirectSound_SetVelocity, 3911, 1+9, XREF_CDirectSound_SetVelocity, XRefOne) @@ -4772,7 +4772,7 @@ OOVPA_END; // * IDirectSound_SetVelocity // ****************************************************************** // Generic OOVPA as of 3911 and newer. -OOVPA_XREF(IDirectSound_SetVelocity, 3911, 11, +OOVPA_XREF(IDirectSound_SetVelocity, 3911, 1+10, XRefNoSaveIndex, XRefOne) @@ -4829,7 +4829,7 @@ OOVPA_END; // * IDirectSound_GetTime // ****************************************************************** //Generic OOVPA as of 3911 and newer -OOVPA_XREF(IDirectSound_GetTime, 3911, 8, +OOVPA_XREF(IDirectSound_GetTime, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -4882,7 +4882,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetRolloffFactor, 3911, 12, +OOVPA_XREF(CDirectSound_SetRolloffFactor, 3911, 1+11, XREF_CDirectSound_SetRolloffFactor, XRefOne) @@ -4912,7 +4912,7 @@ OOVPA_END; // * IDirectSound_SetRolloffFactor // ****************************************************************** // Generic OOVPA as of 3911 and newer -OOVPA_XREF(IDirectSound_SetRolloffFactor, 3911, 11, +OOVPA_XREF(IDirectSound_SetRolloffFactor, 3911, 1+10, XRefNoSaveIndex, XRefOne) @@ -4970,7 +4970,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound::SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(CDirectSound_SetI3DL2Listener, 3911, 8, +OOVPA_XREF(CDirectSound_SetI3DL2Listener, 3911, 1+7, XREF_CDirectSound_SetI3DL2Listener, XRefOne) @@ -4989,7 +4989,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(IDirectSound_SetI3DL2Listener, 3911, 9, +OOVPA_XREF(IDirectSound_SetI3DL2Listener, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -5010,7 +5010,7 @@ OOVPA_END; // * CDirectSoundStream_SetVolume // ****************************************************************** // NOTE: IDirectSoundStream_SetVolume has the same asm code as this function. -OOVPA_XREF(CDirectSoundStream_SetVolume, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetVolume, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5038,7 +5038,7 @@ OOVPA_END; // * IDirectSoundStream_SetVolume // ****************************************************************** // NOTE: CDirectSoundStream_SetVolume has the same asm code as this function. -OOVPA_XREF(IDirectSoundStream_SetVolume, 3911, 10, +OOVPA_XREF(IDirectSoundStream_SetVolume, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5066,7 +5066,7 @@ OOVPA_END; // * CDirectSoundStream_SetPitch // ****************************************************************** // NOTE: IDirectSoundStream_SetPitch has the same asm code as this function. -OOVPA_XREF(CDirectSoundStream_SetPitch, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetPitch, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5094,7 +5094,7 @@ OOVPA_END; // * IDirectSoundStream_SetPitch // ****************************************************************** // NOTE: CDirectSoundStream_SetPitch has the same asm code as this function. -OOVPA_XREF(IDirectSoundStream_SetPitch, 3911, 10, +OOVPA_XREF(IDirectSoundStream_SetPitch, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5122,7 +5122,7 @@ OOVPA_END; // * CDirectSoundStream_SetLFO // ****************************************************************** // NOTE: IDirectSoundStream_SetLFO has the same asm code as this function. -OOVPA_XREF(CDirectSoundStream_SetLFO, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetLFO, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5150,7 +5150,7 @@ OOVPA_END; // * IDirectSoundStream_SetLFO // ****************************************************************** // NOTE: CDirectSoundStream_SetLFO has the same asm code as this function. -OOVPA_XREF(IDirectSoundStream_SetLFO, 3911, 10, +OOVPA_XREF(IDirectSoundStream_SetLFO, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5178,7 +5178,7 @@ OOVPA_END; // * CDirectSoundStream_SetEG // ****************************************************************** // NOTE: IDirectSoundStream_SetEG has the same asm code as this function. -OOVPA_XREF(CDirectSoundStream_SetEG, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetEG, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5206,7 +5206,7 @@ OOVPA_END; // * IDirectSoundStream_SetEG // ****************************************************************** // NOTE: CDirectSoundStream_SetEG has the same asm code as this function. -OOVPA_XREF(IDirectSoundStream_SetEG, 3911, 10, +OOVPA_XREF(IDirectSoundStream_SetEG, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5234,7 +5234,7 @@ OOVPA_END; // * CDirectSoundStream_SetFilter // ****************************************************************** // NOTE: IDirectSoundStream_SetFilter has the same asm code as this function. -OOVPA_XREF(CDirectSoundStream_SetFilter, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetFilter, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5261,7 +5261,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetFilter // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetFilter, 3911, 10, +OOVPA_XREF(IDirectSoundStream_SetFilter, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5289,7 +5289,7 @@ OOVPA_END; // * CDirectSoundStream_SetHeadroom // ****************************************************************** // NOTE: IDirectSoundStream_SetHeadroom has the same asm code as this function. -OOVPA_XREF(CDirectSoundStream_SetHeadroom, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetHeadroom, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5317,7 +5317,7 @@ OOVPA_END; // * IDirectSoundStream_SetHeadroom // ****************************************************************** // NOTE: CDirectSoundStream_SetHeadroom has the same asm code as this function. -OOVPA_XREF(IDirectSoundStream_SetHeadroom, 3911, 10, +OOVPA_XREF(IDirectSoundStream_SetHeadroom, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5345,7 +5345,7 @@ OOVPA_END; // * CDirectSoundStream_SetFrequency // ****************************************************************** // NOTE: IDirectSoundStream_SetFrequency has the same asm code as this function. -OOVPA_XREF(CDirectSoundStream_SetFrequency, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetFrequency, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5373,7 +5373,7 @@ OOVPA_END; // * IDirectSoundStream_SetFrequency // ****************************************************************** // NOTE: CDirectSoundStream_SetFrequency has the same asm code as this function. -OOVPA_XREF(IDirectSoundStream_SetFrequency, 3911, 10, +OOVPA_XREF(IDirectSoundStream_SetFrequency, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5401,7 +5401,7 @@ OOVPA_END; // * CDirectSoundStream_SetMixBins // ****************************************************************** // NOTE: IDirectSoundStream_SetMixBins has the same asm code as this function. -OOVPA_XREF(CDirectSoundStream_SetMixBins, 3911, 10, +OOVPA_XREF(CDirectSoundStream_SetMixBins, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5429,7 +5429,7 @@ OOVPA_END; // * IDirectSoundStream_SetMixBins // ****************************************************************** // NOTE: CDirectSoundStream_SetMixBins has the same asm code as this function. -OOVPA_XREF(IDirectSoundStream_SetMixBins, 3911, 10, +OOVPA_XREF(IDirectSoundStream_SetMixBins, 3911, 1+9, XRefNoSaveIndex, XRefOne) @@ -5456,7 +5456,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetOutputBuffer // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetOutputBuffer, 3911, 2, +OOVPA_XREF(IDirectSoundStream_SetOutputBuffer, 3911, 1+1, XRefNoSaveIndex, XRefOne) @@ -5471,7 +5471,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetMixBinVolumes_12, 3911, 2, +OOVPA_XREF(IDirectSoundStream_SetMixBinVolumes_12, 3911, 1+1, XRefNoSaveIndex, XRefOne) @@ -5486,7 +5486,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetAllParameters // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetAllParameters, 3911, 2, +OOVPA_XREF(IDirectSoundStream_SetAllParameters, 3911, 1+1, XRefNoSaveIndex, XRefOne) @@ -5501,7 +5501,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetConeAngles // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetConeAngles, 3911, 2, +OOVPA_XREF(IDirectSoundStream_SetConeAngles, 3911, 1+1, XRefNoSaveIndex, XRefOne) @@ -5516,7 +5516,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetConeOutsideVolume, 3911, 2, +OOVPA_XREF(IDirectSoundStream_SetConeOutsideVolume, 3911, 1+1, XRefNoSaveIndex, XRefOne) @@ -5531,7 +5531,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetMode // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetMode, 3911, 2, +OOVPA_XREF(IDirectSoundStream_SetMode, 3911, 1+1, XRefNoSaveIndex, XRefOne) @@ -5547,7 +5547,7 @@ OOVPA_END; // * IDirectSoundStream_SetI3DL2Source // ****************************************************************** // Generic OOVPA as of 3911 and newer -OOVPA_XREF(IDirectSoundStream_SetI3DL2Source, 3911, 2, +OOVPA_XREF(IDirectSoundStream_SetI3DL2Source, 3911, 1+1, XRefNoSaveIndex, XRefOne) @@ -5563,7 +5563,7 @@ OOVPA_END; // * IDirectSoundStream_Pause // ****************************************************************** // Generic OOVPA as of 3911 and newer -OOVPA_XREF(IDirectSoundStream_Pause, 3911, 2, +OOVPA_XREF(IDirectSoundStream_Pause, 3911, 1+1, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl index 426cd15f3..7b45c0d37 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl @@ -87,7 +87,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_DoWork // ****************************************************************** -OOVPA_XREF(CDirectSound_DoWork, 3936, 9, +OOVPA_XREF(CDirectSound_DoWork, 3936, 1+8, XREF_CDirectSound_DoWork, XRefOne) @@ -114,7 +114,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundDoWork // ****************************************************************** -OOVPA_XREF(DirectSoundDoWork, 3936, 9, +OOVPA_XREF(DirectSoundDoWork, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -175,7 +175,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_CreateSoundStream // ****************************************************************** -OOVPA_XREF(IDirectSound_CreateSoundStream, 3936, 10, +OOVPA_XREF(IDirectSound_CreateSoundStream, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -244,7 +244,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_CreateSoundBuffer // ****************************************************************** -OOVPA_XREF(IDirectSound_CreateSoundBuffer, 3936, 10, +OOVPA_XREF(IDirectSound_CreateSoundBuffer, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -323,7 +323,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetPitch // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetPitch, 3936, 12, +OOVPA_XREF(CDirectSoundVoice_SetPitch, 3936, 1+11, XREF_DSBUFFERSETPITCHA, XRefOne) @@ -355,7 +355,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetPitch // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPitch, 3936, 10, +OOVPA_XREF(IDirectSoundBuffer_SetPitch, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -416,7 +416,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::GetStatus // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetStatus, 3936, 10, +OOVPA_XREF(CDirectSoundBuffer_GetStatus, 3936, 1+9, XREF_CDirectSoundBuffer_GetStatus, XRefOne) @@ -444,7 +444,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_GetStatus // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetStatus, 3936, 10, +OOVPA_XREF(IDirectSoundBuffer_GetStatus, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -499,7 +499,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVolume, 3936, 12, +OOVPA_XREF(CDirectSoundVoice_SetVolume, 3936, 1+11, XREF_CDirectSoundVoice_SetVolume, XRefOne) @@ -531,7 +531,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetVolume // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVolume, 3936, 10, +OOVPA_XREF(IDirectSoundBuffer_SetVolume, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -586,7 +586,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 3936, 12, +OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 3936, 1+11, XREF_CDirectSoundBuffer_SetCurrentPosition, XRefOne) @@ -618,7 +618,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 3936, 10, +OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -675,7 +675,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetLoopRegion // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 3925, 10, +OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 3925, 1+9, XRefNoSaveIndex, XRefOne) @@ -729,7 +729,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_Lock // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Lock, 3936, 9, +OOVPA_XREF(IDirectSoundBuffer_Lock, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -756,7 +756,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 3936, 12, +OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 3936, 1+11, XREF_CDirectSoundVoice_SetHeadroom, XRefOne) @@ -790,7 +790,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetHeadroom // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 3936, 10, +OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -820,7 +820,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 3936, 9, - XREF_DSSETBUFFERDATA, + XREF_CDirectSoundBuffer_SetBufferData, XRefZero) // CDirectSoundBuffer_SetBufferData+0x22 : cmp ecx, [eax+0x4C] @@ -843,13 +843,13 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetBufferData // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 3936, 10, +OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 3936, 1+9, XRefNoSaveIndex, XRefOne) // IDirectSoundBuffer_SetBufferData+0x18 : call [CDirectSoundBuffer_SetBufferData] - XREF_ENTRY( 0x19, XREF_DSSETBUFFERDATA ), + XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetBufferData ), // IDirectSoundBuffer_SetBufferData+0x04 : push [esp+0x0C] { 0x04, 0xFF }, @@ -908,7 +908,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 3936, 9, +OOVPA_XREF(CDirectSoundVoice_SetMixBins, 3936, 1+8, XREF_CDirectSoundVoice_SetMixBins, XRefOne) @@ -935,7 +935,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBins, 3936, 10, +OOVPA_XREF(CDirectSoundStream_SetMixBins, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -963,7 +963,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMixBins // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 3936, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 3936, 1+7, XRefNoSaveIndex, XRefOne) @@ -1018,7 +1018,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_GetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 3936, 9, +OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 3936, 1+8, XREF_CDirectSoundBuffer_GetCurrentPosition, XRefOne) @@ -1045,7 +1045,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_GetCurrentPosition // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetCurrentPosition, 3936, 8, +OOVPA_XREF(IDirectSoundBuffer_GetCurrentPosition, 3936, 1+7, XRefNoSaveIndex, XRefOne) @@ -1089,7 +1089,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_Play // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Play, 3936, 16, +OOVPA_XREF(IDirectSoundBuffer_Play, 3936, 1+15, XRefNoSaveIndex, XRefOne) @@ -1127,7 +1127,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_Play // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Play, 3936, 12, +OOVPA_XREF(IDirectSoundBuffer_Play, 3936, 1+11, XRefNoSaveIndex, XRefOne) @@ -1189,7 +1189,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVolume, 3936, 10, +OOVPA_XREF(CDirectSoundStream_SetVolume, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -1239,7 +1239,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 3936, 12, +OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 3936, 1+11, XREF_CDirectSoundVoice_SetAllParameters, XRefOne) @@ -1269,7 +1269,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetAllParameters, 3936, 10, +OOVPA_XREF(CDirectSoundStream_SetAllParameters, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -1325,7 +1325,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 3936, 12, +OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 3936, 1+11, XREF_CDirectSoundVoice_SetConeAngles, XRefOne) @@ -1355,7 +1355,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeAngles, 3936, 10, +OOVPA_XREF(CDirectSoundStream_SetConeAngles, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -1411,7 +1411,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeOutsideVolume, 3936, 12, +OOVPA_XREF(CDirectSoundVoice_SetConeOutsideVolume, 3936, 1+11, XREF_CDirectSoundVoice_SetConeOutsideVolume, XRefOne) @@ -1441,7 +1441,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolume, 3936, 10, +OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolume, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -1497,7 +1497,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 3936, 15, +OOVPA_XREF(CDirectSoundVoice_SetMaxDistance, 3936, 1+14, XREF_CDirectSoundVoice_SetMaxDistance, XRefOne) @@ -1534,7 +1534,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMaxDistance, 3936, 10, +OOVPA_XREF(CDirectSoundStream_SetMaxDistance, 3936, 1+9, XREF_CDirectSoundStream_SetMaxDistance, XRefOne) @@ -1562,7 +1562,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetMaxDistance // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetMaxDistance, 3936, 11, +OOVPA_XREF(IDirectSoundStream_SetMaxDistance, 3936, 1+10, XRefNoSaveIndex, XRefOne) @@ -1619,7 +1619,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 3936, 15, +OOVPA_XREF(CDirectSoundVoice_SetMinDistance, 3936, 1+14, XREF_CDirectSoundVoice_SetMinDistance, XRefOne) @@ -1656,7 +1656,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistance, 3936, 10, +OOVPA_XREF(CDirectSoundStream_SetMinDistance, 3936, 1+9, XREF_CDirectSoundStream_SetMinDistance, XRefOne) @@ -1684,7 +1684,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMinDistance // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetMinDistance, 3936, 11, +OOVPA_XREF(IDirectSoundStream_SetMinDistance, 3936, 1+10, XRefNoSaveIndex, XRefOne) @@ -1741,7 +1741,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVelocity, 3936, 14, +OOVPA_XREF(CDirectSoundVoice_SetVelocity, 3936, 1+13, XREF_CDirectSoundVoice_SetVelocity, XRefOne) @@ -1776,7 +1776,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVelocity, 3936, 9, +OOVPA_XREF(CDirectSoundStream_SetVelocity, 3936, 1+8, XREF_CDirectSoundStream_SetVelocity, XRefOne) @@ -1803,7 +1803,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetVelocity // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetVelocity, 3936, 9, +OOVPA_XREF(IDirectSoundStream_SetVelocity, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -1830,7 +1830,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 3936, 9, +OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 3936, 1+8, XREF_CDirectSoundBuffer_SetVelocity, XRefOne) @@ -1857,7 +1857,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetVelocity // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVelocity, 3936, 9, +OOVPA_XREF(IDirectSoundBuffer_SetVelocity, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -1911,7 +1911,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 3936, 14, +OOVPA_XREF(CDirectSoundVoice_SetConeOrientation, 3936, 1+13, XREF_CDirectSoundVoice_SetConeOrientation, XRefOne) @@ -1947,7 +1947,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOrientation, 3936, 9, +OOVPA_XREF(CDirectSoundStream_SetConeOrientation, 3936, 1+8, XREF_CDirectSoundStream_SetConeOrientation, XRefOne) @@ -1974,7 +1974,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetConeOrientation // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetConeOrientation, 3936, 9, +OOVPA_XREF(IDirectSoundStream_SetConeOrientation, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -2028,7 +2028,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetPosition, 3936, 14, +OOVPA_XREF(CDirectSoundVoice_SetPosition, 3936, 1+13, XREF_CDirectSoundVoice_SetPosition, XRefOne) @@ -2064,7 +2064,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPosition, 3936, 9, +OOVPA_XREF(CDirectSoundStream_SetPosition, 3936, 1+8, XREF_CDirectSoundStream_SetPosition, XRefOne) @@ -2091,7 +2091,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_SetPosition // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_SetPosition, 3936, 9, +OOVPA_XREF(IDirectSoundStream_SetPosition, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -2118,7 +2118,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPosition, 3936, 9, +OOVPA_XREF(CDirectSoundBuffer_SetPosition, 3936, 1+8, XREF_CDirectSoundBuffer_SetPosition, XRefOne) @@ -2145,7 +2145,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetPosition // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPosition, 3936, 9, +OOVPA_XREF(IDirectSoundBuffer_SetPosition, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -2201,7 +2201,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice_SetFrequency // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetFrequency, 3936, 9, +OOVPA_XREF(CDirectSoundVoice_SetFrequency, 3936, 1+8, XREF_CDirectSoundVoice_SetFrequency, XRefOne) @@ -2228,7 +2228,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetFrequency // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFrequency, 3936, 10, +OOVPA_XREF(CDirectSoundStream_SetFrequency, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -2256,7 +2256,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetFrequency // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFrequency, 3936, 8, +OOVPA_XREF(IDirectSoundBuffer_SetFrequency, 3936, 1+7, XRefNoSaveIndex, XRefOne) @@ -2310,7 +2310,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMode, 3936, 10, +OOVPA_XREF(CDirectSoundVoice_SetMode, 3936, 1+9, XREF_CDirectSoundVoice_SetMode, XRefOne) @@ -2338,7 +2338,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMode // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMode, 3936, 10, +OOVPA_XREF(IDirectSoundBuffer_SetMode, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -2366,7 +2366,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetRolloffFactor, 3936, 10, +OOVPA_XREF(CDirectSoundStream_SetRolloffFactor, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -2396,7 +2396,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 3936, 10, - XREF_DSSETHEADROOMA, + XREF_CDirectSoundVoice_SetHeadroom, XRefZero) { 0x08, 0x54 }, @@ -2415,7 +2415,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetHeadroom, 3936, 10, +OOVPA_XREF(CDirectSoundStream_SetHeadroom, 3936, 1+9, XRefNoSaveIndex, XRefOne) @@ -2500,7 +2500,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_CommitDeferredSettings // ****************************************************************** -OOVPA_XREF(CDirectSound_CommitDeferredSettings, 3936, 10, +OOVPA_XREF(CDirectSound_CommitDeferredSettings, 3936, 1+9, XREF_CDirectSound_CommitDeferredSettings, XRefOne) @@ -2530,7 +2530,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_CommitDeferredSettings // ****************************************************************** -OOVPA_XREF(IDirectSound_CommitDeferredSettings, 3936, 8, +OOVPA_XREF(IDirectSound_CommitDeferredSettings, 3936, 1+7, XRefNoSaveIndex, XRefOne) @@ -2610,7 +2610,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDistanceFactor, 3936, 12, +OOVPA_XREF(CDirectSound_SetDistanceFactor, 3936, 1+11, XREF_CDirectSound_SetDistanceFactor, XRefOne) @@ -2640,7 +2640,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetDistanceFactor // ****************************************************************** -OOVPA_XREF(IDirectSound_SetDistanceFactor, 3936, 11, +OOVPA_XREF(IDirectSound_SetDistanceFactor, 3936, 1+10, XRefNoSaveIndex, XRefOne) @@ -2702,7 +2702,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetRolloffFactor, 3936, 12, +OOVPA_XREF(CDirectSound_SetRolloffFactor, 3936, 1+11, XREF_CDirectSound_SetRolloffFactor, XRefOne) @@ -2732,7 +2732,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(IDirectSound_SetRolloffFactor, 3936, 11, +OOVPA_XREF(IDirectSound_SetRolloffFactor, 3936, 1+10, XRefNoSaveIndex, XRefOne) @@ -2793,7 +2793,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetMixBinHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSound_SetMixBinHeadroom, 3936, 9, +OOVPA_XREF(CDirectSound_SetMixBinHeadroom, 3936, 1+8, XREF_CDirectSound_SetMixBinHeadroom, XRefOne) @@ -2820,7 +2820,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetMixBinHeadroom // ****************************************************************** -OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 3936, 12, +OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 3936, 1+11, XRefNoSaveIndex, XRefOne) @@ -2880,7 +2880,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSound_SetPosition, 3936, 10, +OOVPA_XREF(CDirectSound_SetPosition, 3936, 1+9, XREF_CDirectSound_SetPosition, XRefOne) @@ -2908,7 +2908,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetPosition // ****************************************************************** -OOVPA_XREF(IDirectSound_SetPosition, 3936, 11, +OOVPA_XREF(IDirectSound_SetPosition, 3936, 1+10, XRefNoSaveIndex, XRefOne) @@ -2967,7 +2967,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound_SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSound_SetVelocity, 3936, 10, +OOVPA_XREF(CDirectSound_SetVelocity, 3936, 1+9, XREF_CDirectSound_SetVelocity, XRefOne) @@ -2995,7 +2995,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetVelocity // ****************************************************************** -OOVPA_XREF(IDirectSound_SetVelocity, 3936, 11, +OOVPA_XREF(IDirectSound_SetVelocity, 3936, 1+10, XRefNoSaveIndex, XRefOne) @@ -3055,7 +3055,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound::SetAllParametersA // ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParametersA, 3936, 10, +OOVPA_XREF(CDirectSound_SetAllParametersA, 3936, 1+9, XREF_CDirectSound_SetAllParameters, XRefOne) @@ -3109,7 +3109,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMode, 3936, 7, +OOVPA_XREF(CDirectSoundStream_SetMode, 3936, 1+6, XRefNoSaveIndex, XRefOne) @@ -3172,7 +3172,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSound_SetDopplerFactor, 3936, 9, +OOVPA_XREF(CDirectSound_SetDopplerFactor, 3936, 1+8, XREF_CDirectSound_SetDopplerFactor, XRefOne) @@ -3193,7 +3193,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetDopplerFactor // ****************************************************************** -OOVPA_XREF(IDirectSound_SetDopplerFactor, 3936, 8, +OOVPA_XREF(IDirectSound_SetDopplerFactor, 3936, 1+7, XRefNoSaveIndex, XRefOne) @@ -3249,7 +3249,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundUseFullHRTF // ****************************************************************** -OOVPA_XREF(DirectSoundUseFullHRTF, 3925, 8, +OOVPA_XREF(DirectSoundUseFullHRTF, 3925, 1+7, XRefNoSaveIndex, XRefOne) @@ -3288,7 +3288,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_GetCaps // ****************************************************************** -OOVPA_XREF(IDirectSound_GetCaps, 3936, 8, +OOVPA_XREF(IDirectSound_GetCaps, 3936, 1+7, XRefNoSaveIndex, XRefOne) @@ -3327,7 +3327,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetPitch // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPitch, 3936, 8, +OOVPA_XREF(IDirectSoundBuffer_SetPitch, 3936, 1+7, XRefNoSaveIndex, XRefOne) @@ -3366,7 +3366,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetConeAngles // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 3936, 8, +OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 3936, 1+7, XRefNoSaveIndex, XRefOne) @@ -3404,7 +3404,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::PlayEx // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_PlayEx, 3936, 9, +OOVPA_XREF(CDirectSoundBuffer_PlayEx, 3936, 1+8, XREF_CDirectSoundBuffer_PlayEx, XRefOne) @@ -3425,7 +3425,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_PlayEx // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_PlayEx, 3936, 8, +OOVPA_XREF(IDirectSoundBuffer_PlayEx, 3936, 1+7, XRefNoSaveIndex, XRefOne) @@ -3511,7 +3511,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 3936, 9, +OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 3936, 1+8, XREF_CDirectSoundBuffer_SetMinDistance, XRefOne) @@ -3532,7 +3532,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMinDistance // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -3552,7 +3552,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 3936, 9, +OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 3936, 1+8, XREF_CDirectSoundBuffer_SetMaxDistance, XRefOne) @@ -3573,7 +3573,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMaxDistance // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 3911, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 3911, 1+7, XRefNoSaveIndex, XRefOne) @@ -3635,7 +3635,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetI3DL2Source, 3936, 9, +OOVPA_XREF(CDirectSoundVoice_SetI3DL2Source, 3936, 1+8, XREF_CDirectSoundVoice_SetI3DL2Source, XRefOne) @@ -3656,7 +3656,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetI3DL2Source // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 3936, 9, +OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -3695,7 +3695,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMixBinVolumes_12 // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBinVolumes_12, 3911, 9, +OOVPA_XREF(IDirectSoundBuffer_SetMixBinVolumes_12, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -3734,7 +3734,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSound::SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSound_SetAllParameters, 3936, 9, +OOVPA_XREF(CDirectSound_SetAllParameters, 3936, 1+8, XREF_CDirectSound_SetAllParameters, XRefOne) @@ -3755,7 +3755,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetAllParameters // ****************************************************************** -OOVPA_XREF(IDirectSound_SetAllParameters, 3936, 9, +OOVPA_XREF(IDirectSound_SetAllParameters, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -3794,7 +3794,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(IDirectSound_SetI3DL2Listener, 3936, 9, +OOVPA_XREF(IDirectSound_SetI3DL2Listener, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -3832,7 +3832,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_EnableHeadphones // ****************************************************************** -OOVPA_XREF(IDirectSound_EnableHeadphones, 3936, 8, +OOVPA_XREF(IDirectSound_EnableHeadphones, 3936, 1+7, XRefNoSaveIndex, XRefOne) @@ -3852,7 +3852,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_12, 3936, 9, +OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_12, 3936, 1+8, XREF_CDirectSoundStream_SetMixBinVolumes_12, XRefOne) @@ -3873,7 +3873,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetI3DL2Source, 3936, 9, +OOVPA_XREF(CDirectSoundStream_SetI3DL2Source, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -3912,7 +3912,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetNotificationPositions // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetNotificationPositions, 3936, 9, +OOVPA_XREF(IDirectSoundBuffer_SetNotificationPositions, 3936, 1+8, XRefNoSaveIndex, XRefOne) @@ -3947,7 +3947,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeOrientation, 3936, 11, +OOVPA_XREF(CDirectSoundBuffer_SetConeOrientation, 3936, 1+10, XREF_CDirectSoundBuffer_SetConeOrientation, XRefOne) @@ -3975,7 +3975,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetConeOrientation // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetConeOrientation, 3936, 9, +OOVPA_XREF(IDirectSoundBuffer_SetConeOrientation, 3936, 1+8, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl index 9f096944d..2c01c264a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl @@ -59,7 +59,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundCreateBuffer // ****************************************************************** -OOVPA_XREF(DirectSoundCreateBuffer, 4039, 11, +OOVPA_XREF(DirectSoundCreateBuffer, 4039, 1+10, XRefNoSaveIndex, XRefOne) @@ -324,7 +324,7 @@ OOVPA_END; // * CDirectSoundVoice::SetVolume // ****************************************************************** // Verified with Agent Under Fire. -OOVPA_XREF(CDirectSoundVoice_SetVolume, 4039, 13, +OOVPA_XREF(CDirectSoundVoice_SetVolume, 4039, 1+12, XREF_CDirectSoundVoice_SetVolume, XRefOne) @@ -357,7 +357,7 @@ OOVPA_END; // * CDirectSoundBuffer::SetVolume // ****************************************************************** // Verified with Agent Under Fire. -OOVPA_XREF(CDirectSoundBuffer_SetVolume, 4039, 10, +OOVPA_XREF(CDirectSoundBuffer_SetVolume, 4039, 1+9, XREF_CDirectSoundBuffer_SetVolume, XRefOne) @@ -388,7 +388,7 @@ OOVPA_END; // ****************************************************************** // Verified with Agent Under Fire. // Side note: It is compatible down to XDK 3911. Except 3911 is calling to CDirectSoundVoice_SetVolume directly. -OOVPA_XREF(IDirectSoundBuffer_SetVolume, 4039, 8, +OOVPA_XREF(IDirectSoundBuffer_SetVolume, 4039, 1+7, XRefNoSaveIndex, XRefOne) @@ -407,7 +407,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVolume, 4039, 9, +OOVPA_XREF(CDirectSoundStream_SetVolume, 4039, 1+8, XREF_CDirectSoundStream_SetVolume, XRefOne) @@ -451,7 +451,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 4039, 8, +OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 4039, 1+7, XREF_CDirectSoundBuffer_SetHeadroom, XRefOne) @@ -473,7 +473,7 @@ OOVPA_END; // Verified with Agent Under Fire. OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 4039, 16, - XREF_DSSETBUFFERDATA, + XREF_CDirectSoundBuffer_SetBufferData, XRefZero) // CDirectSoundBuffer_SetBufferData+0x3D : mov eax, 0x80004005 @@ -523,7 +523,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetPitch // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPitch, 4039, 13, +OOVPA_XREF(CDirectSoundBuffer_SetPitch, 4039, 1+12, XREF_CDirectSoundBuffer_SetPitch, XRefOne) @@ -555,7 +555,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetPitch // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPitch, 4039, 10, +OOVPA_XREF(IDirectSoundBuffer_SetPitch, 4039, 1+9, XRefNoSaveIndex, XRefOne) @@ -612,7 +612,7 @@ OOVPA_END; // * CDirectSoundBuffer::SetFrequency // ****************************************************************** // Verified with Agent Under Fire. -OOVPA_XREF(CDirectSoundBuffer_SetFrequency, 4039, 13, +OOVPA_XREF(CDirectSoundBuffer_SetFrequency, 4039, 1+12, XREF_CDirectSoundBuffer_SetFrequency, XRefOne) @@ -645,7 +645,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetFrequency // ****************************************************************** // Verified with Agent Under Fire. -OOVPA_XREF(IDirectSoundBuffer_SetFrequency, 4039, 12, +OOVPA_XREF(IDirectSoundBuffer_SetFrequency, 4039, 1+11, XRefNoSaveIndex, XRefOne) @@ -834,7 +834,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_GetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 4039, 10, +OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 4039, 1+9, XREF_CDirectSoundBuffer_GetCurrentPosition, XRefOne) @@ -895,7 +895,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_GetStatus // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetStatus, 4039, 10, +OOVPA_XREF(CDirectSoundBuffer_GetStatus, 4039, 1+9, XREF_CDirectSoundBuffer_GetStatus, XRefOne) @@ -977,7 +977,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetPlayRegion // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundBuffer_SetPlayRegion, 4039, 10, +OOVPA_XREF(IDirectSoundBuffer_SetPlayRegion, 4039, 1+9, XRefNoSaveIndex, XRefOne) @@ -1028,7 +1028,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 4039, 11, +OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 4039, 1+10, XREF_CDirectSoundBuffer_SetCurrentPosition, XRefOne) @@ -1082,7 +1082,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetFilter // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetFilter, 4039, 7, +OOVPA_XREF(CDirectSoundVoice_SetFilter, 4039, 1+6, XREF_CDirectSoundVoice_SetFilter, XRefOne) @@ -1100,7 +1100,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetFilter // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetFilter, 4039, 8, +OOVPA_XREF(CDirectSoundBuffer_SetFilter, 4039, 1+7, XREF_CDirectSoundBuffer_SetFilter, XRefOne) @@ -1119,7 +1119,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetFilter // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFilter, 4039, 10, +OOVPA_XREF(IDirectSoundBuffer_SetFilter, 4039, 1+9, XRefNoSaveIndex, XRefOne) @@ -1146,7 +1146,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetFilter // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFilter, 4039, 9, +OOVPA_XREF(CDirectSoundStream_SetFilter, 4039, 1+8, XREF_CDirectSoundStream_SetFilter, XRefOne) @@ -1199,7 +1199,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 4039, 17, +OOVPA_XREF(CDirectSoundVoice_SetMixBins, 4039, 1+16, XREF_CDirectSoundVoice_SetMixBins, XRefOne) @@ -1237,7 +1237,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 4039, 18, +OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 4039, 1+17, XREF_CDirectSoundBuffer_SetMixBins, XRefOne) @@ -1277,7 +1277,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetMixBins // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 4039, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 4039, 1+7, XRefNoSaveIndex, XRefOne) @@ -1330,7 +1330,7 @@ OOVPA_END; // * CDirectSoundVoice::SetMixBinVolumes // ****************************************************************** // Generic OOVPA as of 4039 and newer. -OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 4039, 15, +OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 4039, 2+13, XREF_CDirectSoundVoice_SetMixBinVolumes, XRefTwo) @@ -1369,7 +1369,7 @@ OOVPA_END; // * CDirectSoundBuffer::SetMixBinVolumes // ****************************************************************** //Generic OOVPA as of 4039 and newer -OOVPA_XREF(CDirectSoundBuffer_SetMixBinVolumes, 4039, 18, +OOVPA_XREF(CDirectSoundBuffer_SetMixBinVolumes, 4039, 1+17, XREF_CDirectSoundBuffer_SetMixBinVolumes, XRefOne) @@ -1409,7 +1409,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetMixBinVolumes_8 // ****************************************************************** //Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundBuffer_SetMixBinVolumes_8, 4039, 12, +OOVPA_XREF(IDirectSoundBuffer_SetMixBinVolumes_8, 4039, 1+11, XRefNoSaveIndex, XRefOne) @@ -1440,7 +1440,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMixBinVolumes_8 // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_8, 4039, 12, +OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_8, 4039, 1+11, XREF_CDirectSoundStream_SetMixBinVolumes_8, XRefOne) @@ -1551,7 +1551,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetLFO, 4039, 7, +OOVPA_XREF(CDirectSoundVoice_SetLFO, 4039, 1+6, XREF_CDirectSoundVoice_SetLFO, XRefOne) @@ -1569,7 +1569,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetLFO, 4039, 18, +OOVPA_XREF(CDirectSoundBuffer_SetLFO, 4039, 1+17, XREF_CDirectSoundBuffer_SetLFO, XRefOne) @@ -1608,7 +1608,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetLFO // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLFO, 4039, 8, +OOVPA_XREF(IDirectSoundBuffer_SetLFO, 4039, 1+7, XRefNoSaveIndex, XRefOne) @@ -1627,7 +1627,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetLFO, 4039, 11, +OOVPA_XREF(CDirectSoundStream_SetLFO, 4039, 1+10, XREF_CDirectSoundStream_SetLFO, XRefOne) @@ -1675,7 +1675,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetEG // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetEG, 4039, 7, +OOVPA_XREF(CDirectSoundVoice_SetEG, 4039, 1+6, XREF_CDirectSoundVoice_SetEG, XRefOne) @@ -1693,7 +1693,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetEG // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetEG, 4039, 18, +OOVPA_XREF(CDirectSoundBuffer_SetEG, 4039, 1+17, XREF_CDirectSoundBuffer_SetEG, XRefOne) @@ -1732,7 +1732,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetEG // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetEG, 4039, 8, +OOVPA_XREF(IDirectSoundBuffer_SetEG, 4039, 1+7, XRefNoSaveIndex, XRefOne) @@ -1751,7 +1751,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetEG // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetEG, 4039, 9, +OOVPA_XREF(CDirectSoundStream_SetEG, 4039, 1+8, XREF_CDirectSoundStream_SetEG, XRefOne) @@ -1789,7 +1789,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetOutputBuffer // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 4039, 18, +OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 4039, 1+17, XREF_CDirectSoundBuffer_SetOutputBuffer, XRefOne) @@ -1859,7 +1859,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeOutsideVolume, 4039, 12, +OOVPA_XREF(CDirectSoundBuffer_SetConeOutsideVolume, 4039, 1+11, XREF_CDirectSoundBuffer_SetConeOutsideVolume, XRefOne) @@ -1891,7 +1891,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetConeOutsideVolume // ****************************************************************** // Generic OOVPA as of 4039 and newer. -OOVPA_XREF(IDirectSoundBuffer_SetConeOutsideVolume, 4039, 9, +OOVPA_XREF(IDirectSoundBuffer_SetConeOutsideVolume, 4039, 1+8, XRefNoSaveIndex, XRefOne) @@ -1948,7 +1948,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 4039, 11, +OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 4039, 1+10, XREF_CDirectSoundBuffer_SetMaxDistance, XRefOne) @@ -2009,7 +2009,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 4039, 11, +OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 4039, 1+10, XREF_CDirectSoundBuffer_SetMinDistance, XRefOne) @@ -2062,7 +2062,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMode, 4039, 12, +OOVPA_XREF(CDirectSoundBuffer_SetMode, 4039, 1+11, XREF_CDirectSoundBuffer_SetMode, XRefOne) @@ -2117,7 +2117,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPosition, 4039, 10, +OOVPA_XREF(CDirectSoundBuffer_SetPosition, 4039, 1+9, XREF_CDirectSoundBuffer_SetPosition, XRefOne) @@ -2147,7 +2147,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetMode // ****************************************************************** // Generic OOVPA as of 4039 and newer. -OOVPA_XREF(IDirectSoundBuffer_SetMode, 4039, 10, +OOVPA_XREF(IDirectSoundBuffer_SetMode, 4039, 1+9, XRefNoSaveIndex, XRefOne) @@ -2198,7 +2198,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 4039, 10, +OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 4039, 1+9, XREF_CDirectSoundBuffer_SetVelocity, XRefOne) @@ -2251,7 +2251,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeOrientation, 4039, 10, +OOVPA_XREF(CDirectSoundBuffer_SetConeOrientation, 4039, 1+9, XREF_CDirectSoundBuffer_SetConeOrientation, XRefOne) @@ -2380,7 +2380,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetHeadroom // ****************************************************************** //Generic OOVPA as of 4039 and newer. -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 4039, 10, +OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 4039, 1+9, XRefNoSaveIndex, XRefOne) @@ -2542,7 +2542,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetAllParameters, 4039, 8, +OOVPA_XREF(CDirectSoundBuffer_SetAllParameters, 4039, 1+7, XREF_CDirectSoundBuffer_SetAllParameters, XRefOne) @@ -2566,7 +2566,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetAllParameters // ****************************************************************** //Generic OOVPA as of 4039 and newer. -OOVPA_XREF(IDirectSoundBuffer_SetAllParameters, 4039, 9, +OOVPA_XREF(IDirectSoundBuffer_SetAllParameters, 4039, 1+8, XRefNoSaveIndex, XRefOne) @@ -2617,7 +2617,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 4039, 12, +OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 4039, 1+11, XREF_CDirectSoundBuffer_SetConeAngles, XRefOne) @@ -2649,7 +2649,7 @@ OOVPA_END; // * IDirectSoundBuffer_SetConeAngles // ****************************************************************** //Generic OOVPA as of 4039 and newer. -OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 4039, 10, +OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 4039, 1+9, XRefNoSaveIndex, XRefOne) @@ -2676,7 +2676,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVelocity, 4039, 11, +OOVPA_XREF(CDirectSoundStream_SetVelocity, 4039, 1+10, XREF_CDirectSoundStream_SetVelocity, XRefOne) @@ -2699,7 +2699,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPosition, 4039, 11, +OOVPA_XREF(CDirectSoundStream_SetPosition, 4039, 1+10, XREF_CDirectSoundStream_SetPosition, XRefOne) @@ -2722,7 +2722,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMode, 4039, 11, +OOVPA_XREF(CDirectSoundStream_SetMode, 4039, 1+10, XREF_CDirectSoundStream_SetMode, XRefOne) @@ -2745,7 +2745,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMaxDistance, 4039, 11, +OOVPA_XREF(CDirectSoundStream_SetMaxDistance, 4039, 1+10, XREF_CDirectSoundStream_SetMaxDistance, XRefOne) @@ -2768,7 +2768,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistance, 4039, 11, +OOVPA_XREF(CDirectSoundStream_SetMinDistance, 4039, 1+10, XREF_CDirectSoundStream_SetMinDistance, XRefOne) @@ -2791,7 +2791,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolume, 4039, 9, +OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolume, 4039, 1+8, XREF_CDirectSoundStream_SetConeOutsideVolume, XRefOne) @@ -2811,7 +2811,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOrientation, 4039, 9, +OOVPA_XREF(CDirectSoundStream_SetConeOrientation, 4039, 1+8, XREF_CDirectSoundStream_SetConeOrientation, XRefOne) @@ -2831,7 +2831,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeAngles, 4039, 9, +OOVPA_XREF(CDirectSoundStream_SetConeAngles, 4039, 1+8, XREF_CDirectSoundStream_SetConeAngles, XRefOne) @@ -2853,7 +2853,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetAllParameters, 4039, 9, +OOVPA_XREF(CDirectSoundStream_SetAllParameters, 4039, 1+8, XREF_CDirectSoundStream_SetAllParameters, XRefOne) @@ -2873,7 +2873,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetOutputBuffer // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetOutputBuffer, 4039, 9, +OOVPA_XREF(CDirectSoundStream_SetOutputBuffer, 4039, 1+8, XREF_CDirectSoundStream_SetOutputBuffer, XRefOne) @@ -2894,7 +2894,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetFrequency // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFrequency, 4039, 12, +OOVPA_XREF(CDirectSoundStream_SetFrequency, 4039, 1+11, XREF_CDirectSoundStream_SetFrequency, XRefOne) @@ -2925,7 +2925,7 @@ OOVPA_END; // * IDirectSoundStream_SetFrequency // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundStream_SetFrequency, 4039, 2, +OOVPA_XREF(IDirectSoundStream_SetFrequency, 4039, 1+1, XRefNoSaveIndex, XRefOne) @@ -2941,7 +2941,7 @@ OOVPA_END; // * IDirectSoundStream_SetVolume // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundStream_SetVolume, 4039, 2, +OOVPA_XREF(IDirectSoundStream_SetVolume, 4039, 1+1, XRefNoSaveIndex, XRefOne) @@ -2956,7 +2956,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetPitch // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPitch, 4039, 12, +OOVPA_XREF(CDirectSoundStream_SetPitch, 4039, 1+11, XREF_CDirectSoundStream_SetPitch, XRefOne) @@ -2980,7 +2980,7 @@ OOVPA_END; // * IDirectSoundStream_SetPitch // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundStream_SetPitch, 4039, 2, +OOVPA_XREF(IDirectSoundStream_SetPitch, 4039, 1+1, XRefNoSaveIndex, XRefOne) @@ -2996,7 +2996,7 @@ OOVPA_END; // * IDirectSoundStream_SetLFO // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundStream_SetLFO, 4039, 2, +OOVPA_XREF(IDirectSoundStream_SetLFO, 4039, 1+1, XRefNoSaveIndex, XRefOne) @@ -3012,7 +3012,7 @@ OOVPA_END; // * IDirectSoundStream_SetEG // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundStream_SetEG, 4039, 2, +OOVPA_XREF(IDirectSoundStream_SetEG, 4039, 1+1, XRefNoSaveIndex, XRefOne) @@ -3028,7 +3028,7 @@ OOVPA_END; // * IDirectSoundStream_SetFilter // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundStream_SetFilter, 4039, 2, +OOVPA_XREF(IDirectSoundStream_SetFilter, 4039, 1+1, XRefNoSaveIndex, XRefOne) @@ -3044,7 +3044,7 @@ OOVPA_END; // * IDirectSoundStream_SetMixBinVolumes // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundStream_SetMixBinVolumes_8, 4039, 2, +OOVPA_XREF(IDirectSoundStream_SetMixBinVolumes_8, 4039, 1+1, XRefNoSaveIndex, XRefOne) @@ -3090,7 +3090,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Pause // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Pause, 4039, 12, +OOVPA_XREF(CDirectSoundStream_Pause, 4039, 1+11, XREF_CDirectSoundStream_Pause, XRefOne) @@ -3182,7 +3182,7 @@ OOVPA_END; // * CDirectSoundStream::Release // ****************************************************************** // NOTE: Has identical function to DirectSound::CAc97MediaObject::Release -OOVPA_XREF(CDirectSoundStream_Release, 4039, 12, +OOVPA_XREF(CDirectSoundStream_Release, 4039, 1+11, XRefNoSaveIndex, XRefOne) @@ -3230,7 +3230,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CHRTFSource::SetFullHRTF5Channel // ****************************************************************** -OOVPA_XREF(CHRTFSource_SetFullHRTF5Channel, 4039, 9, +OOVPA_XREF(CHRTFSource_SetFullHRTF5Channel, 4039, 1+8, XREF_CHRTFSource_SetFullHRTF5Channel, XRefOne) @@ -3251,7 +3251,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundUseFullHRTF // ****************************************************************** -OOVPA_XREF(DirectSoundUseFullHRTF, 4039, 8, +OOVPA_XREF(DirectSoundUseFullHRTF, 4039, 1+7, XRefNoSaveIndex, XRefOne) @@ -3384,7 +3384,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Flush // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Flush, 4039, 9, +OOVPA_XREF(CDirectSoundStream_Flush, 4039, 1+8, XRefNoSaveIndex, XRefOne) @@ -3470,7 +3470,7 @@ OOVPA_END; // ****************************************************************** // * CMcpxStream_Discontinuity // ****************************************************************** -OOVPA_XREF(CMcpxStream_Discontinuity, 4039, 7, +OOVPA_XREF(CMcpxStream_Discontinuity, 4039, 1+6, XREF_CMcpxStream_Discontinuity, XRefOne) @@ -3493,7 +3493,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Discontinuity // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Discontinuity, 4039, 9, +OOVPA_XREF(CDirectSoundStream_Discontinuity, 4039, 1+8, XRefNoSaveIndex, XRefOne) @@ -3518,7 +3518,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBins, 4039, 10, +OOVPA_XREF(CDirectSoundStream_SetMixBins, 4039, 1+9, XREF_CDirectSoundStream_SetMixBins, XRefOne) @@ -3543,7 +3543,7 @@ OOVPA_END; // * IDirectSoundStream_SetMixBins // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundStream_SetMixBins, 4039, 2, +OOVPA_XREF(IDirectSoundStream_SetMixBins, 4039, 1+1, XRefNoSaveIndex, XRefOne) @@ -3593,7 +3593,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetI3DL2Source, 4039, 12, +OOVPA_XREF(CDirectSoundBuffer_SetI3DL2Source, 4039, 1+11, XREF_CDirectSoundBuffer_SetI3DL2Source, XRefOne) @@ -3624,7 +3624,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetI3DL2Source // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 4039, 10, +OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 4039, 1+9, XRefNoSaveIndex, XRefOne) @@ -3675,7 +3675,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundCreateStream // ****************************************************************** -OOVPA_XREF(DirectSoundCreateStream, 4039, 11, +OOVPA_XREF(DirectSoundCreateStream, 4039, 1+10, XRefNoSaveIndex, XRefOne) @@ -3706,7 +3706,7 @@ OOVPA_END; // * IDirectSoundStream_SetHeadroom // ****************************************************************** // Generic OOVPA as of 4039 and newer -OOVPA_XREF(IDirectSoundStream_SetHeadroom, 4039, 2, +OOVPA_XREF(IDirectSoundStream_SetHeadroom, 4039, 1+1, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index 33e2a40e3..ad2658de1 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -135,7 +135,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer8::SetLoopRegion // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 4134, 9, +OOVPA_XREF(IDirectSoundBuffer_SetLoopRegion, 4134, 1+8, XRefNoSaveIndex, XRefOne) @@ -182,7 +182,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetI3DL2Listener // ****************************************************************** -OOVPA_XREF(IDirectSound_SetI3DL2Listener, 4134, 12, +OOVPA_XREF(IDirectSound_SetI3DL2Listener, 4134, 1+11, XRefNoSaveIndex, XRefOne) @@ -235,7 +235,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 4134, 8, +OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 4134, 1+7, XREF_CDirectSoundBuffer_SetHeadroom, XRefOne) @@ -255,7 +255,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetHeadroom // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 4134, 8, +OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 4134, 1+7, XRefNoSaveIndex, XRefOne) @@ -303,7 +303,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 4134, 17, +OOVPA_XREF(CDirectSoundVoice_SetMixBins, 4134, 1+16, XREF_CDirectSoundVoice_SetMixBins, XRefOne) @@ -341,7 +341,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 4134, 17, +OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 4134, 1+16, XREF_CDirectSoundBuffer_SetMixBins, XRefOne) @@ -378,7 +378,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMixBins // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 4134, 12, +OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 4134, 1+11, XRefNoSaveIndex, XRefOne) @@ -443,7 +443,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_CreateSoundBuffer // ****************************************************************** -OOVPA_XREF(IDirectSound_CreateSoundBuffer, 4134, 12, +OOVPA_XREF(IDirectSound_CreateSoundBuffer, 4134, 1+11, XRefNoSaveIndex, XRefOne) @@ -502,7 +502,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetFrequency // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetFrequency, 4134, 17, +OOVPA_XREF(CDirectSoundBuffer_SetFrequency, 4134, 1+16, XREF_CDirectSoundBuffer_SetFrequency, XRefOne) @@ -539,7 +539,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetFrequency // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFrequency, 4134, 12, +OOVPA_XREF(IDirectSoundBuffer_SetFrequency, 4134, 1+11, XRefNoSaveIndex, XRefOne) @@ -603,7 +603,7 @@ OOVPA_END; // * CDirectSoundVoice_SetVolume // ****************************************************************** // Generic OOVPA as of 4134 and newer. -OOVPA_XREF(CDirectSoundVoice_SetVolume, 4134, 11, +OOVPA_XREF(CDirectSoundVoice_SetVolume, 4134, 1+10, XREF_CDirectSoundVoice_SetVolume, XRefOne) @@ -631,7 +631,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVolume, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetVolume, 4134, 1+8, XREF_CDirectSoundStream_SetVolume, XRefOne) @@ -705,7 +705,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetBufferData // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 4134, 10, +OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 4134, 1+9, XREF_CDirectSoundBuffer_SetBufferData, XRefOne) @@ -732,7 +732,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetBufferData // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 4134, 8, +OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 4134, 1+7, XRefNoSaveIndex, XRefOne) @@ -785,7 +785,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_GetStatus // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetStatus, 4134, 10, +OOVPA_XREF(CDirectSoundBuffer_GetStatus, 4134, 1+9, XREF_CDirectSoundBuffer_GetStatus, XRefOne) @@ -836,7 +836,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 4134, 10, +OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 4134, 1+9, XREF_CDirectSoundBuffer_SetCurrentPosition, XRefOne) @@ -864,7 +864,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 4134, 8, +OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 4134, 1+7, XRefNoSaveIndex, XRefOne) @@ -918,7 +918,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_GetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 4134, 10, +OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 4134, 1+9, XREF_CDirectSoundBuffer_GetCurrentPosition, XRefOne) @@ -946,7 +946,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::Play // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 12, +OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 1+11, XREF_CDirectSoundBuffer_Play, XRefOne) @@ -1006,7 +1006,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetDistanceFactor // ****************************************************************** -OOVPA_XREF(IDirectSound_SetDistanceFactor, 4134, 11, +OOVPA_XREF(IDirectSound_SetDistanceFactor, 4134, 1+10, XRefNoSaveIndex, XRefOne) @@ -1073,7 +1073,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(IDirectSound_SetRolloffFactor, 4134, 11, +OOVPA_XREF(IDirectSound_SetRolloffFactor, 4134, 1+10, XRefNoSaveIndex, XRefOne) @@ -1135,7 +1135,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetDopplerFactor // ****************************************************************** -OOVPA_XREF(IDirectSound_SetDopplerFactor, 4134, 11, +OOVPA_XREF(IDirectSound_SetDopplerFactor, 4134, 1+10, XRefNoSaveIndex, XRefOne) @@ -1221,7 +1221,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 4134, 10, +OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 4134, 1+9, XREF_CDirectSoundBuffer_SetMaxDistance, XRefOne) @@ -1249,7 +1249,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMaxDistance // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 4134, 10, +OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 4134, 1+9, XRefNoSaveIndex, XRefOne) @@ -1276,7 +1276,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMaxDistance, 4134, 11, +OOVPA_XREF(CDirectSoundStream_SetMaxDistance, 4134, 1+10, XREF_CDirectSoundStream_SetMaxDistance, XRefOne) @@ -1327,7 +1327,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 4134, 10, +OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 4134, 1+9, XREF_CDirectSoundBuffer_SetMinDistance, XRefOne) @@ -1354,7 +1354,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMinDistance // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 4134, 10, +OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 4134, 1+9, XRefNoSaveIndex, XRefOne) @@ -1382,7 +1382,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistance, 4134, 11, +OOVPA_XREF(CDirectSoundStream_SetMinDistance, 4134, 1+10, XREF_CDirectSoundStream_SetMinDistance, XRefOne) @@ -1407,7 +1407,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 4134, 12, - XREF_DSVOICESETROLLOFFFACTOR, + XREF_CDirectSoundVoice_SetRolloffFactor, XRefZero) // CDirectSoundVoice_SetRolloffFactor+0x0D : mov edx, [esp+arg_4] @@ -1433,13 +1433,13 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 4134, 10, +OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 4134, 1+9, - XREF_DSBUFFERSETROLLOFFFACTOR, + XREF_CDirectSoundBuffer_SetRolloffFactor, XRefOne) // CDirectSoundBuffer_SetRolloffFactor+0x39 : call [CDirectSoundVoice::SetRolloffFactor] - XREF_ENTRY( 0x3A, XREF_DSVOICESETROLLOFFFACTOR ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetRolloffFactor ), // CDirectSoundBuffer_SetRolloffFactor+0x21 : mov eax, 80004005h { 0x22, 0x05 }, @@ -1460,13 +1460,13 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetRolloffFactor, 4134, 10, +OOVPA_XREF(IDirectSoundBuffer_SetRolloffFactor, 4134, 1+9, XRefNoSaveIndex, XRefOne) // IDirectSoundBuffer_SetRolloffFactor+0x1C : call [CDirectSoundBuffer::SetRolloffFactor] - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETROLLOFFFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetRolloffFactor ), // IDirectSoundBuffer_SetRolloffFactor+0x04 : fld [esp+4+arg_4] { 0x04, 0xD9 }, @@ -1487,12 +1487,12 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetRolloffFactor, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetRolloffFactor, 4134, 1+8, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x3E, XREF_DSVOICESETROLLOFFFACTOR ), + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetRolloffFactor ), { 0x00, 0x56 }, { 0x0C, 0x00 }, @@ -1509,7 +1509,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 4134, 12, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) // CDirectSoundVoice_SetDistanceFactor+0x0D : mov edx, [esp+arg_4] @@ -1535,13 +1535,13 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 4134, 10, +OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 4134, 1+9, - XREF_DSBUFFERSETDISTANCEFACTOR, + XREF_CDirectSoundBuffer_SetDistanceFactor, XRefOne) // CDirectSoundBuffer_SetDistanceFactor+0x39 : call [CDirectSoundVoice::SetDistanceFactor] - XREF_ENTRY( 0x3A, XREF_DSVOICESETDISTANCEFACTOR ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDistanceFactor ), // CDirectSoundBuffer_SetDistanceFactor+0x21 : mov eax, 80004005h { 0x22, 0x05 }, @@ -1562,13 +1562,13 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetDistanceFactor // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 4134, 10, +OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 4134, 1+9, XRefNoSaveIndex, XRefOne) // IDirectSoundBuffer_SetDistanceFactor+0x1C : call [CDirectSoundBuffer::SetDistanceFactor] - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDISTANCEFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDistanceFactor ), // IDirectSoundBuffer_SetDistanceFactor+0x04 : fld [esp+4+arg_4] { 0x04, 0xD9 }, @@ -1613,7 +1613,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 4134, 12, +OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 4134, 1+11, XREF_CDirectSoundBuffer_SetConeAngles, XRefOne) @@ -1644,7 +1644,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetConeAngles // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 4134, 10, +OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 4134, 1+9, XRefNoSaveIndex, XRefOne) @@ -1694,7 +1694,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeOrientation, 4134, 9, +OOVPA_XREF(CDirectSoundBuffer_SetConeOrientation, 4134, 1+8, XREF_CDirectSoundBuffer_SetConeOrientation, XRefOne) @@ -1720,7 +1720,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeOrientation // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOrientation, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetConeOrientation, 4134, 1+8, XREF_CDirectSoundStream_SetConeOrientation, XRefOne) @@ -1768,7 +1768,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeOutsideVolume, 4134, 11, +OOVPA_XREF(CDirectSoundBuffer_SetConeOutsideVolume, 4134, 1+10, XREF_CDirectSoundBuffer_SetConeOutsideVolume, XRefOne) @@ -1796,7 +1796,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolume, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetConeOutsideVolume, 4134, 1+8, XREF_CDirectSoundStream_SetConeOutsideVolume, XRefOne) @@ -1839,7 +1839,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPosition, 4134, 9, +OOVPA_XREF(CDirectSoundBuffer_SetPosition, 4134, 1+8, XREF_CDirectSoundBuffer_SetPosition, XRefOne) @@ -1865,7 +1865,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPosition, 4134, 11, +OOVPA_XREF(CDirectSoundStream_SetPosition, 4134, 1+10, XREF_CDirectSoundStream_SetPosition, XRefOne) @@ -1911,7 +1911,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 4134, 9, +OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 4134, 1+8, XREF_CDirectSoundBuffer_SetVelocity, XRefOne) @@ -1937,7 +1937,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVelocity, 4134, 11, +OOVPA_XREF(CDirectSoundStream_SetVelocity, 4134, 1+10, XREF_CDirectSoundStream_SetVelocity, XRefOne) @@ -1988,9 +1988,9 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDopplerFactor, 4134, 10, +OOVPA_XREF(CDirectSoundBuffer_SetDopplerFactor, 4134, 1+9, - XREF_DSBUFFERSETDOPPLERFACTOR, + XREF_CDirectSoundBuffer_SetDopplerFactor, XRefOne) // CDirectSoundBuffer_SetDopplerFactor+0x39 : call [CDirectSoundVoice::SetDopplerFactor] @@ -2015,13 +2015,13 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetDopplerFactor // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 4134, 9, +OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 4134, 1+8, XRefNoSaveIndex, XRefOne) // IDirectSoundBuffer_SetDopplerFactor+0x1C : call [CDirectSoundBuffer::SetDopplerFactor] - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDOPPLERFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDopplerFactor ), // IDirectSoundBuffer_SetDopplerFactor+0x08 : mov eax, [esp+4+arg_0] { 0x08, 0x8B }, @@ -2068,7 +2068,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetI3DL2Source, 4134, 12, +OOVPA_XREF(CDirectSoundBuffer_SetI3DL2Source, 4134, 1+11, XREF_CDirectSoundBuffer_SetI3DL2Source, XRefOne) @@ -2100,7 +2100,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetI3DL2Source // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 4134, 10, +OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 4134, 1+9, XRefNoSaveIndex, XRefOne) @@ -2128,7 +2128,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetI3DL2Source, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetI3DL2Source, 4134, 1+8, XREF_CDirectSoundStream_SetI3DL2Source, XRefOne) @@ -2193,7 +2193,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetAllParameters, 4134, 8, +OOVPA_XREF(CDirectSoundBuffer_SetAllParameters, 4134, 1+7, XREF_CDirectSoundBuffer_SetAllParameters, XRefOne) @@ -2212,7 +2212,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetAllParameters // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetAllParameters, 4134, 9, +OOVPA_XREF(IDirectSoundBuffer_SetAllParameters, 4134, 1+8, XRefNoSaveIndex, XRefOne) @@ -2232,7 +2232,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetAllParameters // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetAllParameters, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetAllParameters, 4134, 1+8, XREF_CDirectSoundStream_SetAllParameters, XRefOne) @@ -2252,7 +2252,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_GetStatus // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetStatus, 4134, 9, +OOVPA_XREF(IDirectSoundBuffer_GetStatus, 4134, 1+8, XRefNoSaveIndex, XRefOne) @@ -2295,7 +2295,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMode, 4134, 8, +OOVPA_XREF(CDirectSoundBuffer_SetMode, 4134, 1+7, XREF_CDirectSoundBuffer_SetMode, XRefOne) @@ -2314,7 +2314,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMode // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMode, 4134, 9, +OOVPA_XREF(IDirectSoundBuffer_SetMode, 4134, 1+8, XRefNoSaveIndex, XRefOne) @@ -2334,7 +2334,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMode, 4134, 11, +OOVPA_XREF(CDirectSoundStream_SetMode, 4134, 1+10, XREF_CDirectSoundStream_SetMode, XRefOne) @@ -2407,7 +2407,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetFilter // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetFilter, 4134, 7, +OOVPA_XREF(CDirectSoundVoice_SetFilter, 4134, 1+6, XREF_CDirectSoundVoice_SetFilter, XRefOne) @@ -2426,7 +2426,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetFilter // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetFilter, 4134, 8, +OOVPA_XREF(CDirectSoundBuffer_SetFilter, 4134, 1+7, XREF_CDirectSoundBuffer_SetFilter, XRefOne) @@ -2446,7 +2446,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetFilter // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFilter, 4134, 8, +OOVPA_XREF(IDirectSoundBuffer_SetFilter, 4134, 1+7, XRefNoSaveIndex, XRefOne) @@ -2519,7 +2519,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetPitch // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPitch, 4134, 8, +OOVPA_XREF(CDirectSoundBuffer_SetPitch, 4134, 1+7, XREF_CDirectSoundBuffer_SetPitch, XRefOne) @@ -2538,7 +2538,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetPitch // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPitch, 4134, 12, +OOVPA_XREF(CDirectSoundStream_SetPitch, 4134, 1+11, XREF_CDirectSoundStream_SetPitch, XRefOne) @@ -2561,7 +2561,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVolume, 4134, 12, +OOVPA_XREF(CDirectSoundBuffer_SetVolume, 4134, 1+11, XREF_CDirectSoundBuffer_SetVolume, XRefOne) @@ -2593,7 +2593,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer8::SetVolume // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVolume, 4134, 8, +OOVPA_XREF(IDirectSoundBuffer_SetVolume, 4134, 1+7, XRefNoSaveIndex, XRefOne) @@ -2644,7 +2644,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundCreateStream // ****************************************************************** -OOVPA_XREF(DirectSoundCreateStream, 4134, 12, +OOVPA_XREF(DirectSoundCreateStream, 4134, 1+11, XRefNoSaveIndex, XRefOne) @@ -2704,7 +2704,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 4134, 17, +OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 4134, 1+16, XREF_CDirectSoundVoice_SetMixBinVolumes, XRefOne) @@ -2744,7 +2744,7 @@ OOVPA_END; // * CDirectSoundBuffer::SetMixBinVolumes // ****************************************************************** //Generic OOVPA as of 4134 and newer -OOVPA_XREF(CDirectSoundBuffer_SetMixBinVolumes, 4134, 17, +OOVPA_XREF(CDirectSoundBuffer_SetMixBinVolumes, 4134, 1+16, XREF_CDirectSoundBuffer_SetMixBinVolumes, XRefOne) @@ -2780,7 +2780,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMixBinVolumes_8 // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBinVolumes_8, 4134, 12, +OOVPA_XREF(IDirectSoundBuffer_SetMixBinVolumes_8, 4134, 1+11, XRefNoSaveIndex, XRefOne) @@ -2812,7 +2812,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetMixBinVolumes_8 // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_8, 4134, 12, +OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_8, 4134, 1+11, XREF_CDirectSoundStream_SetMixBinVolumes_8, XRefOne) @@ -2858,7 +2858,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetEffectData // ****************************************************************** -OOVPA_XREF(IDirectSound_SetEffectData, 4134, 13, +OOVPA_XREF(IDirectSound_SetEffectData, 4134, 1+12, XRefNoSaveIndex, XRefOne) @@ -2907,7 +2907,7 @@ OOVPA_END; // * CDirectSoundBuffer_Stop // ****************************************************************** //Generic OOVPA as of 4134 and newer. -OOVPA_XREF(CDirectSoundBuffer_Stop, 4134, 13, +OOVPA_XREF(CDirectSoundBuffer_Stop, 4134, 1+12, XREF_CDirectSoundBuffer_Stop, XRefOne) @@ -2939,7 +2939,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetEG // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetEG, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetEG, 4134, 1+8, XREF_CDirectSoundStream_SetEG, XRefOne) @@ -2960,7 +2960,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetFilter // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFilter, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetFilter, 4134, 1+8, XREF_CDirectSoundStream_SetFilter, XRefOne) @@ -2981,7 +2981,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetLFO, 4134, 11, +OOVPA_XREF(CDirectSoundStream_SetLFO, 4134, 1+10, XREF_CDirectSoundStream_SetLFO, XRefOne) @@ -3075,7 +3075,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::Release // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Release, 4134, 12, +OOVPA_XREF(CDirectSoundStream_Release, 4134, 1+11, XRefNoSaveIndex, XRefOne) @@ -3124,7 +3124,7 @@ OOVPA_END; // * DirectSoundUseFullHRTF // ****************************************************************** // Generic OOVPA as of 4134 and newer. -OOVPA_XREF(DirectSoundUseFullHRTF, 4134, 8, +OOVPA_XREF(DirectSoundUseFullHRTF, 4134, 1+7, XRefNoSaveIndex, XRefOne) @@ -3144,7 +3144,7 @@ OOVPA_END; // * DirectSound::CDirectSoundStream::SetMixBins // ****************************************************************** // Generic OOVPA as of 4134 and newer. -OOVPA_XREF(CDirectSoundStream_SetMixBins, 4134, 10, +OOVPA_XREF(CDirectSoundStream_SetMixBins, 4134, 1+9, XREF_CDirectSoundStream_SetMixBins, XRefOne) @@ -3199,7 +3199,7 @@ OOVPA_END; // * CDirectSoundStream_Pause // ****************************************************************** // Generic OOVPA as of 4134 and newer -OOVPA_XREF(CDirectSoundStream_Pause, 4134, 12, +OOVPA_XREF(CDirectSoundStream_Pause, 4134, 1+11, XREF_CDirectSoundStream_Pause, XRefOne) @@ -3344,7 +3344,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Flush // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Flush, 4134, 9, +OOVPA_XREF(CDirectSoundStream_Flush, 4134, 1+8, XRefNoSaveIndex, XRefOne) @@ -3402,7 +3402,7 @@ OOVPA_END; // * CDirectSoundStream_GetStatus // ****************************************************************** // Generic OOVPA as of 4134 and newer -OOVPA_XREF(CDirectSoundStream_GetStatus, 4134, 12, +OOVPA_XREF(CDirectSoundStream_GetStatus, 4134, 1+11, XRefNoSaveIndex, XRefOne) @@ -3463,7 +3463,7 @@ OOVPA_END; // ****************************************************************** // * CMcpxStream_Discontinuity // ****************************************************************** -OOVPA_XREF(CMcpxStream_Discontinuity, 4134, 7, +OOVPA_XREF(CMcpxStream_Discontinuity, 4134, 1+6, XREF_CMcpxStream_Discontinuity, XRefOne) @@ -3486,7 +3486,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Discontinuity // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Discontinuity, 4134, 9, +OOVPA_XREF(CDirectSoundStream_Discontinuity, 4134, 1+8, XRefNoSaveIndex, XRefOne) @@ -3582,7 +3582,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_SetOutputBuffer // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 4134, 18, +OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 4134, 1+17, XREF_CDirectSoundBuffer_SetOutputBuffer, XRefOne) @@ -3682,7 +3682,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetFrequency // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFrequency, 4134, 12, +OOVPA_XREF(CDirectSoundStream_SetFrequency, 4134, 1+11, XREF_CDirectSoundStream_SetFrequency, XRefOne) @@ -3712,7 +3712,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetOutputBuffer // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetOutputBuffer, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetOutputBuffer, 4134, 1+8, XREF_CDirectSoundStream_SetOutputBuffer, XRefOne) @@ -3733,7 +3733,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetConeAngles, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetConeAngles, 4134, 1+8, XREF_CDirectSoundStream_SetConeAngles, XRefOne) @@ -3755,7 +3755,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetHeadroom, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetHeadroom, 4134, 1+8, XRefNoSaveIndex, XRefOne) @@ -3809,7 +3809,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_Play // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 11, +OOVPA_XREF(CDirectSoundBuffer_Play, 4134, 1+10, XREF_CDirectSoundBuffer_Play, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl index 90f82ad08..8397a94ee 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl @@ -54,7 +54,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetFormat // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetFormat, 4242, 8, +OOVPA_XREF(CDirectSoundBuffer_SetFormat, 4242, 1+7, XREF_CDirectSoundBuffer_SetFormat, XRefOne) @@ -73,7 +73,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetFormat // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFormat, 4242, 8, +OOVPA_XREF(IDirectSoundBuffer_SetFormat, 4242, 1+7, XRefNoSaveIndex, XRefOne) @@ -92,7 +92,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetFormat // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFormat, 4242, 9, +OOVPA_XREF(CDirectSoundStream_SetFormat, 4242, 1+8, XREF_CDirectSoundStream_SetFormat, XRefOne) @@ -130,7 +130,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetLFO, 4242, 8, +OOVPA_XREF(CDirectSoundBuffer_SetLFO, 4242, 1+7, XREF_CDirectSoundBuffer_SetLFO, XRefOne) @@ -167,7 +167,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetEG // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetEG, 4242, 8, +OOVPA_XREF(CDirectSoundBuffer_SetEG, 4242, 1+7, XREF_CDirectSoundBuffer_SetEG, XRefOne) @@ -237,7 +237,7 @@ OOVPA_END; // * IDirectSoundStream_SetFormat // ****************************************************************** // Generic OOVPA as of 4___ and newer -OOVPA_XREF(IDirectSoundStream_SetFormat, 4242, 2, +OOVPA_XREF(IDirectSoundStream_SetFormat, 4242, 1+1, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index 32456558c..ec66287ec 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -109,7 +109,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_Pause // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Pause, 4361, 11, +OOVPA_XREF(CDirectSoundStream_Pause, 4361, 1+10, XRefNoSaveIndex, XRefOne) @@ -164,7 +164,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetPlayRegion // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPlayRegion, 4361, 9, +OOVPA_XREF(IDirectSoundBuffer_SetPlayRegion, 4361, 1+8, XRefNoSaveIndex, XRefOne) @@ -215,7 +215,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_Play // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Play, 4361, 9, +OOVPA_XREF(IDirectSoundBuffer_Play, 4361, 1+8, XRefNoSaveIndex, XRefOne) @@ -269,7 +269,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer_Stop // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Stop, 4361, 10, +OOVPA_XREF(CDirectSoundBuffer_Stop, 4361, 1+9, XREF_CDirectSoundBuffer_Stop, XRefOne) @@ -297,7 +297,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_Stop // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Stop, 4361, 8, +OOVPA_XREF(IDirectSoundBuffer_Stop, 4361, 1+7, XRefNoSaveIndex, XRefOne) @@ -341,7 +341,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 4361, 8, +OOVPA_XREF(CDirectSoundVoice_SetMixBinVolumes, 4361, 1+7, XREF_CDirectSoundVoice_SetMixBinVolumes, XRefOne) @@ -361,7 +361,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMixBinVolumes, 4361, 8, +OOVPA_XREF(CDirectSoundBuffer_SetMixBinVolumes, 4361, 1+7, XREF_CDirectSoundBuffer_SetMixBinVolumes, XRefOne) @@ -380,7 +380,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::PlayEx // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_PlayEx, 4361, 8, +OOVPA_XREF(CDirectSoundBuffer_PlayEx, 4361, 1+7, XREF_CDirectSoundBuffer_PlayEx, XRefOne) @@ -399,7 +399,7 @@ OOVPA_END; // ****************************************************************** // * CMcpxBuffer::Stop2 // ****************************************************************** -OOVPA_XREF(CMcpxBuffer_Stop2, 4361, 10, +OOVPA_XREF(CMcpxBuffer_Stop2, 4361, 1+9, XREF_CMcpxBuffer_Stop2, XRefOne) @@ -424,7 +424,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::StopEx // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_StopEx, 4361, 8, +OOVPA_XREF(CDirectSoundBuffer_StopEx, 4361, 1+7, XREF_CDirectSoundBuffer_StopEx, XRefOne) @@ -444,7 +444,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_StopEx // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_StopEx, 4361, 8, +OOVPA_XREF(IDirectSoundBuffer_StopEx, 4361, 1+7, XRefNoSaveIndex, XRefOne) @@ -540,7 +540,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 4361, 12, - XREF_DSVOICESETROLLOFFFACTOR, + XREF_CDirectSoundVoice_SetRolloffFactor, XRefZero) // CDirectSoundVoice_SetRolloffFactor+0x0D : mov edx, [esp+arg_4] @@ -568,7 +568,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 4361, 12, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) // CDirectSoundVoice_SetDistanceFactor+0x0D : mov edx, [esp+arg_4] diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index ee7c2bb7c..9ad768e54 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -37,7 +37,7 @@ // ****************************************************************** // * IDirectSound_SetMixBinHeadroom // ****************************************************************** -OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 4627, 12, +OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 4627, 1+11, XRefNoSaveIndex, XRefOne) @@ -189,7 +189,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundCreateBuffer // ****************************************************************** -OOVPA_XREF(DirectSoundCreateBuffer, 4242, 12, +OOVPA_XREF(DirectSoundCreateBuffer, 4242, 1+11, XRefNoSaveIndex, XRefOne) @@ -528,7 +528,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_EnableHeadphones // ****************************************************************** -OOVPA_XREF(IDirectSound_EnableHeadphones, 4627, 9, +OOVPA_XREF(IDirectSound_EnableHeadphones, 4627, 1+8, XRefNoSaveIndex, XRefOne) @@ -555,7 +555,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetHeadrom // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4627, 9, +OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4627, 1+8, XREF_CDirectSoundVoice_SetHeadroom, XRefOne) // Note : This was -1, which is used nowhere else and probably an error. @@ -638,7 +638,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_GetOutputLevels // ****************************************************************** -OOVPA_XREF(IDirectSound_GetOutputLevels, 4627, 9, +OOVPA_XREF(IDirectSound_GetOutputLevels, 4627, 1+8, XRefNoSaveIndex, XRefOne) @@ -675,7 +675,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::Pause // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Pause, 4928, 8, +OOVPA_XREF(CDirectSoundBuffer_Pause, 4928, 1+7, XREF_CDirectSoundBuffer_Pause, XRefOne) @@ -694,7 +694,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_Pause // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Pause, 4928, 8, +OOVPA_XREF(IDirectSoundBuffer_Pause, 4928, 1+7, XRefNoSaveIndex, XRefOne) @@ -713,7 +713,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::GetStatus // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_GetStatus, 4721, 8, +OOVPA_XREF(CDirectSoundBuffer_GetStatus, 4721, 1+7, XREF_CDirectSoundBuffer_GetStatus, XRefOne) @@ -732,7 +732,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_GetStatus // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetStatus, 4721, 8, +OOVPA_XREF(IDirectSoundBuffer_GetStatus, 4721, 1+7, XRefNoSaveIndex, XRefOne) @@ -753,7 +753,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBins, 4627, 8, +OOVPA_XREF(CDirectSoundStream_SetMixBins, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -793,7 +793,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetEG // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetEG, 4627, 7, +OOVPA_XREF(CDirectSoundVoice_SetEG, 4627, 1+6, XREF_CDirectSoundVoice_SetEG, XRefOne) @@ -812,7 +812,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetEG // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetEG, 4627, 8, +OOVPA_XREF(CDirectSoundStream_SetEG, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -832,7 +832,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetEG // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetEG, 4627, 8, +OOVPA_XREF(CDirectSoundBuffer_SetEG, 4627, 1+7, XREF_CDirectSoundBuffer_SetEG, XRefOne) @@ -852,7 +852,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetEG // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetEG, 4627, 8, +OOVPA_XREF(IDirectSoundBuffer_SetEG, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -874,7 +874,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundStream_FlushEx, 4627, 14, - XREF_DSFLUSHEX2, + XREF_CDirectSoundStream_FlushEx, XRefZero) { 0x0F, 0x00 }, @@ -896,12 +896,12 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_FlushEx // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_FlushEx, 4627, 9, +OOVPA_XREF(IDirectSoundStream_FlushEx, 4627, 1+8, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x11, XREF_DSFLUSHEX2 ), + XREF_ENTRY( 0x11, XREF_CDirectSoundStream_FlushEx ), { 0x01, 0x74 }, { 0x04, 0xFF }, @@ -931,7 +931,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetFilter // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetFilter, 4627, 8, +OOVPA_XREF(CDirectSoundStream_SetFilter, 4627, 1+7, XREF_CDirectSoundStream_SetFilter, XRefOne) @@ -951,7 +951,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetPitch // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPitch, 4627, 8, +OOVPA_XREF(CDirectSoundBuffer_SetPitch, 4627, 1+7, XREF_DSBUFFERSETPITCHA, XRefOne) @@ -971,7 +971,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetPitch // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPitch, 4627, 8, +OOVPA_XREF(IDirectSoundBuffer_SetPitch, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -991,7 +991,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundVoice::SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4627, 8, +OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 4627, 1+7, XREF_CDirectSoundVoice_SetHeadroom, XRefOne) @@ -1031,7 +1031,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetOutputBuffer // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 4627, 8, +OOVPA_XREF(CDirectSoundBuffer_SetOutputBuffer, 4627, 1+7, XREF_CDirectSoundBuffer_SetOutputBuffer, XRefOne) @@ -1052,7 +1052,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetOutputBuffer // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetOutputBuffer, 4627, 8, +OOVPA_XREF(IDirectSoundBuffer_SetOutputBuffer, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -1074,7 +1074,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 4627, 11, - XREF_DSVOICESETROLLOFFCURVE, + XREF_CDirectSoundVoice_SetRolloffCurve, XRefZero) { 0x07, 0x8B }, @@ -1093,12 +1093,12 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetRolloffCurve // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetRolloffCurve, 4627, 8, +OOVPA_XREF(CDirectSoundBuffer_SetRolloffCurve, 4627, 1+7, - XREF_DSBUFFERSETROLLOFFCURVE, + XREF_CDirectSoundBuffer_SetRolloffCurve, XRefOne) - XREF_ENTRY( 0x3A, XREF_DSVOICESETROLLOFFCURVE ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetRolloffCurve ), { 0x0C, 0x00 }, { 0x14, 0x74 }, @@ -1112,12 +1112,12 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetRolloffCurve // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetRolloffCurve, 4627, 8, +OOVPA_XREF(CDirectSoundStream_SetRolloffCurve, 4627, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x3E, XREF_DSVOICESETROLLOFFCURVE ), + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetRolloffCurve ), { 0x0C, 0x00 }, { 0x16, 0x68 }, @@ -1131,12 +1131,12 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetRolloffCurve // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetRolloffCurve, 4627, 8, +OOVPA_XREF(IDirectSoundBuffer_SetRolloffCurve, 4627, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETROLLOFFCURVE ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetRolloffCurve ), { 0x03, 0x10 }, { 0x08, 0xFF }, @@ -1200,7 +1200,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetNotificationPositions // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetNotificationPositions, 4627, 9, +OOVPA_XREF(IDirectSoundBuffer_SetNotificationPositions, 4627, 1+8, XRefNoSaveIndex, XRefOne) @@ -1240,7 +1240,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetLFO, 4627, 7, +OOVPA_XREF(CDirectSoundVoice_SetLFO, 4627, 1+6, XREF_CDirectSoundVoice_SetLFO, XRefOne) @@ -1259,7 +1259,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetLFO, 4627, 8, +OOVPA_XREF(CDirectSoundBuffer_SetLFO, 4627, 1+7, XREF_CDirectSoundBuffer_SetLFO, XRefOne) @@ -1279,7 +1279,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetLFO // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetLFO, 4627, 8, +OOVPA_XREF(IDirectSoundBuffer_SetLFO, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -1299,7 +1299,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetLFO // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetLFO, 4627, 10, +OOVPA_XREF(CDirectSoundStream_SetLFO, 4627, 1+9, XRefNoSaveIndex, XRefOne) @@ -1321,7 +1321,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetPitch // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPitch, 4627, 12, +OOVPA_XREF(CDirectSoundStream_SetPitch, 4627, 1+11, XRefNoSaveIndex, XRefOne) @@ -1347,7 +1347,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 4627, 12, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) // CDirectSoundVoice_SetDistanceFactor+0x0D : mov edx, [esp+arg_4] diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index a61a3122d..b9dfb86e4 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -53,7 +53,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_EnableHeadphones // ****************************************************************** -OOVPA_XREF(IDirectSound_EnableHeadphones, 5233, 8, +OOVPA_XREF(IDirectSound_EnableHeadphones, 5233, 1+7, XRefNoSaveIndex, XRefOne) @@ -79,7 +79,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundStream_FlushEx, 5233, 15, - XREF_DSFLUSHEX2, + XREF_CDirectSoundStream_FlushEx, XRefZero) { 0x24, 0xB8 }, @@ -107,12 +107,12 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundStream_FlushEx // ****************************************************************** -OOVPA_XREF(IDirectSoundStream_FlushEx, 5233, 9, +OOVPA_XREF(IDirectSoundStream_FlushEx, 5233, 1+8, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x11, XREF_DSFLUSHEX2 ), + XREF_ENTRY( 0x11, XREF_CDirectSoundStream_FlushEx ), { 0x00, 0xFF }, { 0x03, 0x10 }, @@ -133,7 +133,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxAPU_SynchPlayback, 5233, 8, - XREF_DSSYNCHPLAYBACKB, + XREF_CMcpxAPU_SynchPlayback, XRefZero) { 0x0C, 0x74 }, @@ -149,12 +149,12 @@ OOVPA_END; // ****************************************************************** // * CDirectSound::SynchPlayback // ****************************************************************** -OOVPA_XREF(CDirectSound_SynchPlayback, 5233, 10, +OOVPA_XREF(CDirectSound_SynchPlayback, 5233, 1+9, - XREF_DSSYNCHPLAYBACKA, + XREF_CDirectSound_SynchPlayback, XRefOne) - XREF_ENTRY( 0x08, XREF_DSSYNCHPLAYBACKB ), + XREF_ENTRY( 0x08, XREF_CMcpxAPU_SynchPlayback ), // CDirectSound_SynchPlayback+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, @@ -175,12 +175,12 @@ OOVPA_END; // ****************************************************************** // * IDirectSound8::SynchPlayback // ****************************************************************** -OOVPA_XREF(IDirectSound_SynchPlayback, 5233, 8, +OOVPA_XREF(IDirectSound_SynchPlayback, 5233, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x11, XREF_DSSYNCHPLAYBACKA ), + XREF_ENTRY( 0x11, XREF_CDirectSound_SynchPlayback ), // IDirectSound_SynchPlayback+0x06 : add eax, 0xFFFFFFF8 { 0x06, 0x83 }, @@ -217,7 +217,7 @@ OOVPA_END; // ****************************************************************** // CDirectSoundBuffer::SetMode // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMode, 5233, 8, +OOVPA_XREF(CDirectSoundBuffer_SetMode, 5233, 1+7, XREF_CDirectSoundBuffer_SetMode, XRefOne) @@ -236,7 +236,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMode // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMode, 5233, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMode, 5233, 1+7, XRefNoSaveIndex, XRefOne) @@ -260,7 +260,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetVolume, 5233, 8, +OOVPA_XREF(CDirectSoundVoice_SetVolume, 5233, 1+7, XREF_CDirectSoundVoice_SetVolume, XRefOne) @@ -279,7 +279,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVolume, 5233, 8, +OOVPA_XREF(CDirectSoundBuffer_SetVolume, 5233, 1+7, XREF_CDirectSoundBuffer_SetVolume, XRefOne) @@ -299,7 +299,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBins, 5233, 8, +OOVPA_XREF(CDirectSoundStream_SetMixBins, 5233, 1+7, XRefNoSaveIndex, XRefOne) @@ -322,7 +322,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 5233, 8, - XREF_DSVOICESETROLLOFFCURVE, + XREF_CDirectSoundVoice_SetRolloffCurve, XRefZero) { 0x07, 0x8B }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl index ca5f85e0a..1978a103a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl @@ -53,7 +53,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 5344, 11, +OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 5344, 1+10, XREF_CDirectSoundBuffer_SetMinDistance, XRefOne) @@ -81,7 +81,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistance, 5344, 8, +OOVPA_XREF(CDirectSoundStream_SetMinDistance, 5344, 1+7, XRefNoSaveIndex, XRefOne) @@ -120,7 +120,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5344, 9, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) { 0x05, 0x41 }, @@ -137,12 +137,12 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 5344, 8, +OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 5344, 1+7, - XREF_DSBUFFERSETDISTANCEFACTOR, + XREF_CDirectSoundBuffer_SetDistanceFactor, XRefOne) - XREF_ENTRY( 0x3A, XREF_DSVOICESETDISTANCEFACTOR ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDistanceFactor ), { 0x0C, 0x00 }, { 0x14, 0x74 }, @@ -156,12 +156,12 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetDistanceFactor // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 5344, 8, +OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 5344, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDISTANCEFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDistanceFactor ), { 0x03, 0x0C }, { 0x08, 0x8B }, @@ -272,7 +272,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 5344, 11, +OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 5344, 1+10, XREF_CDirectSoundBuffer_SetMaxDistance, XRefOne) @@ -300,7 +300,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMaxDistance // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 5344, 11, +OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 5344, 1+10, XRefNoSaveIndex, XRefOne) @@ -364,7 +364,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(IDirectSound_SetRolloffFactor, 5344, 8, +OOVPA_XREF(IDirectSound_SetRolloffFactor, 5344, 1+7, XRefNoSaveIndex, XRefOne) @@ -526,7 +526,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSound_SynchPlayback, 5344, 8, - XREF_DSSYNCHPLAYBACKA, + XREF_CDirectSound_SynchPlayback, XRefZero) { 0x07, 0x3D }, @@ -721,7 +721,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 5344, 12, - XREF_DSVOICESETROLLOFFFACTOR, + XREF_CDirectSoundVoice_SetRolloffFactor, XRefZero) // CDirectSoundVoice_SetRolloffFactor+0x0D : mov edx, [esp+arg_4] @@ -749,7 +749,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 5344, 8, - XREF_DSVOICESETROLLOFFCURVE, + XREF_CDirectSoundVoice_SetRolloffCurve, XRefZero) { 0x07, 0x8B }, @@ -782,7 +782,7 @@ OOVPA_END; // ****************************************************************** // * XAudioCreateAdpcmFormat // ****************************************************************** -OOVPA_XREF(XAudioCreateAdpcmFormat, 5344, 2, +OOVPA_XREF(XAudioCreateAdpcmFormat, 5344, 1+1, XRefNoSaveIndex, XRefOne) @@ -819,7 +819,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 5344, 8, +OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 5344, 1+7, XREF_CDirectSoundBuffer_SetHeadroom, XRefOne) @@ -838,7 +838,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetHeadroom // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 5344, 8, +OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 5344, 1+7, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index 0f25bf826..21484870a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -36,7 +36,7 @@ // * CDirectSound::SynchPlayback // ****************************************************************** OOVPA_XREF(CDirectSound_SynchPlayback, 5558, 7, - XREF_DSSYNCHPLAYBACKA, + XREF_CDirectSound_SynchPlayback, XRefZero) { 0x0C, 0x00 }, @@ -182,7 +182,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetMixBinHeadroom // ****************************************************************** -OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 5558, 9, +OOVPA_XREF(IDirectSound_SetMixBinHeadroom, 5558, 1+8, XRefNoSaveIndex, XRefOne) @@ -237,7 +237,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CHRTFSource::SetFullHRTF5Channel // ****************************************************************** -OOVPA_XREF(CHRTFSource_SetFullHRTF5Channel, 5558, 9, +OOVPA_XREF(CHRTFSource_SetFullHRTF5Channel, 5558, 1+8, XREF_CHRTFSource_SetFullHRTF5Channel, XRefOne) @@ -258,7 +258,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundUseFullHRTF // ****************************************************************** -OOVPA_XREF(DirectSoundUseFullHRTF, 5558, 8, +OOVPA_XREF(DirectSoundUseFullHRTF, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -311,7 +311,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetBufferData // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 5558, 9, +OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 5558, 1+8, XRefNoSaveIndex, XRefOne) @@ -348,7 +348,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 5558, 8, +OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 5558, 1+7, XREF_CDirectSoundBuffer_SetCurrentPosition, XRefOne) @@ -368,7 +368,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 5558, 8, +OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -405,7 +405,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetMixBins, 5558, 8, +OOVPA_XREF(CDirectSoundVoice_SetMixBins, 5558, 1+7, XREF_CDirectSoundVoice_SetMixBins, XRefOne) @@ -424,7 +424,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 5558, 8, +OOVPA_XREF(CDirectSoundBuffer_SetMixBins, 5558, 1+7, XREF_CDirectSoundBuffer_SetMixBins, XRefOne) @@ -444,7 +444,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMixBins // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 5558, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMixBins, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -543,7 +543,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_Play // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Play, 5558, 8, +OOVPA_XREF(IDirectSoundBuffer_Play, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -608,7 +608,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetFormat // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetFormat, 5558, 8, +OOVPA_XREF(CDirectSoundBuffer_SetFormat, 5558, 1+7, XREF_CDirectSoundBuffer_SetFormat, XRefOne) @@ -627,7 +627,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetFormat // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetFormat, 5558, 8, +OOVPA_XREF(IDirectSoundBuffer_SetFormat, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -664,7 +664,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 5558, 8, +OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 5558, 1+7, XREF_CDirectSoundBuffer_SetConeAngles, XRefOne) @@ -683,7 +683,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetConeAngles // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 5558, 8, +OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -702,12 +702,12 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMinDistance, 5558, 8, +OOVPA_XREF(CDirectSoundStream_SetMinDistance, 5558, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x3E, XREF_DSVOICESETROLLOFFCURVE ), + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetRolloffCurve ), { 0x0C, 0x00 }, { 0x16, 0x68 }, @@ -721,7 +721,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMinDistance // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 5558, 11, +OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 5558, 1+10, XRefNoSaveIndex, XRefOne) @@ -765,7 +765,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundVoice::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 5558, 20, +OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 5558, 1+19, XREF_CDirectSoundVoice_SetDopplerFactor, XRefOne) @@ -796,7 +796,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer8::SetAllParameters // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer8_SetAllParameters, 5558, 9, +OOVPA_XREF(IDirectSoundBuffer8_SetAllParameters, 5558, 1+8, XREF_CDirectSoundVoice_SetAllParameters, XRefOne) @@ -833,7 +833,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetPosition, 5558, 9, +OOVPA_XREF(CDirectSoundBuffer_SetPosition, 5558, 1+8, XREF_CDirectSoundBuffer_SetPosition, XRefOne) @@ -853,7 +853,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer8::SetPosition // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetPosition, 5558, 8, +OOVPA_XREF(IDirectSoundBuffer_SetPosition, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -889,7 +889,7 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 5558, 9, +OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 5558, 1+8, XREF_CDirectSoundBuffer_SetVelocity, XRefOne) @@ -908,7 +908,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetVelocity // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetVelocity, 5558, 8, +OOVPA_XREF(IDirectSoundBuffer_SetVelocity, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -946,7 +946,7 @@ OOVPA_XREF(CMcpxStream_Pause, 5558, 7, // ****************************************************************** // * CDirectSoundStream::Pause // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Pause, 5558, 8, +OOVPA_XREF(CDirectSoundStream_Pause, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -968,7 +968,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5558, 12, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) { 0x05, 0x41 }, @@ -988,12 +988,12 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetDistanceFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 5558, 8, +OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 5558, 1+7, - XREF_DSBUFFERSETDISTANCEFACTOR, + XREF_CDirectSoundBuffer_SetDistanceFactor, XRefOne) - XREF_ENTRY( 0x3A, XREF_DSVOICESETDISTANCEFACTOR ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDistanceFactor ), { 0x0C, 0x00 }, { 0x14, 0x74 }, @@ -1007,12 +1007,12 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetDistanceFactor // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 5558, 8, +OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 5558, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDISTANCEFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDistanceFactor ), { 0x03, 0x0C }, { 0x08, 0x8B }, @@ -1026,9 +1026,9 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetDopplerFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetDopplerFactor, 5558, 8, +OOVPA_XREF(CDirectSoundBuffer_SetDopplerFactor, 5558, 1+7, - XREF_DSBUFFERSETDOPPLERFACTOR, + XREF_CDirectSoundBuffer_SetDopplerFactor, XRefOne) XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDopplerFactor), @@ -1045,12 +1045,12 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetDopplerFactor // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 5558, 8, +OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 5558, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDOPPLERFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDopplerFactor ), { 0x03, 0x0C }, { 0x08, 0x8B }, @@ -1096,7 +1096,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetI3DL2Source // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetI3DL2Source, 5558, 8, +OOVPA_XREF(CDirectSoundBuffer_SetI3DL2Source, 5558, 1+7, XREF_CDirectSoundBuffer_SetI3DL2Source, XRefOne) @@ -1115,7 +1115,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetI3DL2Source // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 5558, 9, +OOVPA_XREF(IDirectSoundBuffer_SetI3DL2Source, 5558, 1+8, XRefNoSaveIndex, XRefOne) @@ -1174,7 +1174,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetHeadroom // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 5558, 8, +OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 5558, 1+7, XREF_CDirectSoundBuffer_SetHeadroom, XRefOne) @@ -1193,7 +1193,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetHeadroom // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 5558, 8, +OOVPA_XREF(IDirectSoundBuffer_SetHeadroom, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -1229,7 +1229,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_GetCurrentPosition@12 // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_GetCurrentPosition, 5558, 9, +OOVPA_XREF(IDirectSoundBuffer_GetCurrentPosition, 5558, 1+8, XRefNoSaveIndex, XRefOne) @@ -1251,7 +1251,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMixBins // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBins, 5558, 9, +OOVPA_XREF(CDirectSoundStream_SetMixBins, 5558, 1+8, XRefNoSaveIndex, XRefOne) @@ -1308,7 +1308,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_EnableHeadphones // ****************************************************************** -OOVPA_XREF(IDirectSound_EnableHeadphones, 5558, 8, +OOVPA_XREF(IDirectSound_EnableHeadphones, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -1344,7 +1344,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_GetOutputLevels // ****************************************************************** -OOVPA_XREF(IDirectSound_GetOutputLevels, 5558, 9, +OOVPA_XREF(IDirectSound_GetOutputLevels, 5558, 1+8, XRefNoSaveIndex, XRefOne) @@ -1396,7 +1396,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetPosition // ****************************************************************** -OOVPA_XREF(IDirectSound_SetPosition, 5558, 8, +OOVPA_XREF(IDirectSound_SetPosition, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -1432,7 +1432,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_SetVelocity // ****************************************************************** -OOVPA_XREF(IDirectSound_SetVelocity, 5558, 8, +OOVPA_XREF(IDirectSound_SetVelocity, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -1468,7 +1468,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSound_CreateSoundStream // ****************************************************************** -OOVPA_XREF(IDirectSound_CreateSoundStream, 5558, 8, +OOVPA_XREF(IDirectSound_CreateSoundStream, 5558, 1+7, XRefNoSaveIndex, XRefOne) @@ -1487,12 +1487,12 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetRolloffCurve // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetRolloffCurve, 5558, 8, +OOVPA_XREF(CDirectSoundStream_SetRolloffCurve, 5558, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x3E, XREF_DSVOICESETROLLOFFCURVE ), + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetRolloffCurve ), { 0x0C, 0x00 }, { 0x16, 0x68 }, @@ -1565,7 +1565,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::Use3DVoiceData // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_Use3DVoiceData, 5558, 9, +OOVPA_XREF(CDirectSoundBuffer_Use3DVoiceData, 5558, 1+8, XREF_CDirectSoundBuffer_Use3DVoiceData, XRefOne) @@ -1585,7 +1585,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer::Use3DVoiceData // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_Use3DVoiceData, 5558, 9, +OOVPA_XREF(IDirectSoundBuffer_Use3DVoiceData, 5558, 1+8, XRefNoSaveIndex, XRefOne) @@ -1605,7 +1605,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::Use3DVoiceData // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_Use3DVoiceData, 5558, 9, +OOVPA_XREF(CDirectSoundStream_Use3DVoiceData, 5558, 1+8, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index 0c1873ff8..82b5f7c82 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -131,7 +131,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetCurrentPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 5788, 8, +OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 5788, 1+7, XREF_CDirectSoundBuffer_SetCurrentPosition, XRefOne) @@ -151,7 +151,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 5788, 8, +OOVPA_XREF(IDirectSoundBuffer_SetCurrentPosition, 5788, 1+7, XRefNoSaveIndex, XRefOne) @@ -209,7 +209,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetMaxDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 5788, 8, +OOVPA_XREF(CDirectSoundBuffer_SetMaxDistance, 5788, 1+7, XREF_CDirectSoundBuffer_SetMaxDistance, XRefOne) @@ -228,7 +228,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetMinDistance // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 5788, 8, +OOVPA_XREF(CDirectSoundBuffer_SetMinDistance, 5788, 1+7, XREF_CDirectSoundBuffer_SetMinDistance, XRefOne) @@ -247,7 +247,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMaxDistance // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 5788, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMaxDistance, 5788, 1+7, XRefNoSaveIndex, XRefOne) @@ -267,7 +267,7 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetMinDistance // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 5788, 8, +OOVPA_XREF(IDirectSoundBuffer_SetMinDistance, 5788, 1+7, XRefNoSaveIndex, XRefOne) @@ -305,7 +305,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetVolume // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetVolume, 5788, 8, +OOVPA_XREF(CDirectSoundBuffer_SetVolume, 5788, 1+7, XREF_CDirectSoundBuffer_SetVolume, XRefOne) @@ -345,7 +345,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::PlayEx // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_PlayEx, 5788, 8, +OOVPA_XREF(CDirectSoundBuffer_PlayEx, 5788, 1+7, XREF_CDirectSoundBuffer_PlayEx, XRefOne) @@ -366,7 +366,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 5788, 7, - XREF_DSVOICESETROLLOFFFACTOR, + XREF_CDirectSoundVoice_SetRolloffFactor, XRefZero) { 0x05, 0x41 }, @@ -381,12 +381,12 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundBuffer::SetRolloffFactor // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 5788, 8, +OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 5788, 1+7, - XREF_DSBUFFERSETROLLOFFFACTOR, + XREF_CDirectSoundBuffer_SetRolloffFactor, XRefOne) - XREF_ENTRY( 0x3A, XREF_DSVOICESETROLLOFFFACTOR ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetRolloffFactor ), { 0x0C, 0x00 }, { 0x14, 0x74 }, @@ -400,12 +400,12 @@ OOVPA_END; // ****************************************************************** // * IDirectSoundBuffer_SetRolloffFactor // ****************************************************************** -OOVPA_XREF(IDirectSoundBuffer_SetRolloffFactor, 5788, 8, +OOVPA_XREF(IDirectSoundBuffer_SetRolloffFactor, 5788, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETROLLOFFFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetRolloffFactor ), { 0x03, 0x0C }, { 0x08, 0x8B }, @@ -438,7 +438,7 @@ OOVPA_END; // ****************************************************************** // * DirectSoundCreateStream // ****************************************************************** -OOVPA_XREF(DirectSoundCreateStream, 5788, 9, +OOVPA_XREF(DirectSoundCreateStream, 5788, 1+8, XRefNoSaveIndex, XRefOne) @@ -458,7 +458,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetMixBinVolumes // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_8, 5788, 9, +OOVPA_XREF(CDirectSoundStream_SetMixBinVolumes_8, 5788, 1+8, XRefNoSaveIndex, XRefOne) @@ -497,7 +497,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundStream_FlushEx, 5788, 7, - XREF_DSFLUSHEX2, + XREF_CDirectSoundStream_FlushEx, XRefZero) { 0x0F, 0x00 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl index 7493da097..5382375c9 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl @@ -67,7 +67,7 @@ OOVPA_END; // ****************************************************************** // * DirectSound::CDirectSoundStream::SetPitch // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPitch, 5849, 12, +OOVPA_XREF(CDirectSoundStream_SetPitch, 5849, 1+11, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl index d807ec2fa..0b2c9dd3f 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl @@ -35,7 +35,7 @@ // ****************************************************************** // * XNetStartup // ****************************************************************** -OOVPA_XREF(XNetStartup, 3911, 9, +OOVPA_XREF(XNetStartup, 3911, 1+8, XRefNoSaveIndex, XRefOne) @@ -61,7 +61,7 @@ OOVPA_END; // ****************************************************************** // * WSAStartup // ****************************************************************** -OOVPA_XREF(WSAStartup, 3911, 11, +OOVPA_XREF(WSAStartup, 3911, 1+10, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4361.inl index fa9a39066..ae3499ba3 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4361.inl @@ -65,7 +65,7 @@ OOVPA_END; // ****************************************************************** // * WSAStartup // ****************************************************************** -OOVPA_XREF(WSAStartup, 4361, 9, +OOVPA_XREF(WSAStartup, 4361, 1+8, XRefNoSaveIndex, XRefOne) @@ -89,7 +89,7 @@ OOVPA_END; // ****************************************************************** // * XNetStartup // ****************************************************************** -OOVPA_XREF(XNetStartup, 4361, 8, +OOVPA_XREF(XNetStartup, 4361, 1+7, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl index 462c0758e..72c677c73 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl @@ -76,7 +76,7 @@ OOVPA_END; // ****************************************************************** // * XNetStartup // ****************************************************************** -OOVPA_XREF(XNetStartup, 4627, 8, +OOVPA_XREF(XNetStartup, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -106,7 +106,7 @@ OOVPA_END; // ****************************************************************** // * WSAStartup // ****************************************************************** -OOVPA_XREF(WSAStartup, 4627, 9, +OOVPA_XREF(WSAStartup, 4627, 1+8, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl index 679711fb4..e735d809a 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl @@ -36,7 +36,7 @@ // ****************************************************************** // * XNetStartup // ****************************************************************** -OOVPA_XREF(XNetStartup, 4361, 8, +OOVPA_XREF(XNetStartup, 4361, 1+7, XRefNoSaveIndex, XRefOne) @@ -66,7 +66,7 @@ OOVPA_END; // ****************************************************************** // * WSAStartup // ****************************************************************** -OOVPA_XREF(WSAStartup, 4361, 9, +OOVPA_XREF(WSAStartup, 4361, 1+8, XRefNoSaveIndex, XRefOne) @@ -237,7 +237,7 @@ OOVPA_END; // ****************************************************************** // * XOnlineLogon // ****************************************************************** -OOVPA_XREF(XOnlineLogon, 4361, 5, +OOVPA_XREF(XOnlineLogon, 4361, 1+4, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl index 82788a2dd..711302ac3 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl @@ -71,7 +71,7 @@ OOVPA_END; // ****************************************************************** // * XOnlineLogon // ****************************************************************** -OOVPA_XREF(XOnlineLogon, 5233, 8, +OOVPA_XREF(XOnlineLogon, 5233, 1+7, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl index b9116d0f7..57809f80a 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl @@ -97,7 +97,7 @@ OOVPA_END; // ****************************************************************** // * XOnlineLogon // ****************************************************************** -OOVPA_XREF(XOnlineLogon, 5558, 8, +OOVPA_XREF(XOnlineLogon, 5558, 1+7, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl index 99a0d35ac..1f0273347 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl @@ -77,7 +77,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_RegisterWaveBank // ****************************************************************** -OOVPA_XREF(IXACTEngine_RegisterWaveBank, 4627, 8, +OOVPA_XREF(IXACTEngine_RegisterWaveBank, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -128,7 +128,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_RegisterStreamedWaveBank // ****************************************************************** -OOVPA_XREF(IXACTEngine_RegisterStreamedWaveBank, 4627, 9, +OOVPA_XREF(IXACTEngine_RegisterStreamedWaveBank, 4627, 1+8, XRefNoSaveIndex, XRefOne) @@ -166,7 +166,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_CreateSoundBank // ****************************************************************** -OOVPA_XREF(IXACTEngine_CreateSoundBank, 4627, 8, +OOVPA_XREF(IXACTEngine_CreateSoundBank, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -201,7 +201,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_DownloadEffectsImage // ****************************************************************** -OOVPA_XREF(IXACTEngine_DownloadEffectsImage, 4627, 9, +OOVPA_XREF(IXACTEngine_DownloadEffectsImage, 4627, 1+8, XRefNoSaveIndex, XRefOne) @@ -238,7 +238,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_CreateSoundSource // ****************************************************************** -OOVPA_XREF(IXACTEngine_CreateSoundSource, 4627, 9, +OOVPA_XREF(IXACTEngine_CreateSoundSource, 4627, 1+8, XRefNoSaveIndex, XRefOne) @@ -274,7 +274,7 @@ OOVPA_END; // ****************************************************************** // * IXACTSoundBank_GetSoundCueIndexFromFriendlyName // ****************************************************************** -OOVPA_XREF(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4627, 9, +OOVPA_XREF(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4627, 1+8, XRefNoSaveIndex, XRefOne) @@ -325,7 +325,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_RegisterNotification // ****************************************************************** -OOVPA_XREF(IXACTEngine_RegisterNotification, 4627, 8, +OOVPA_XREF(IXACTEngine_RegisterNotification, 4627, 1+7, XRefNoSaveIndex, XRefOne) @@ -362,7 +362,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_GetNotification // ****************************************************************** -OOVPA_XREF(IXACTEngine_GetNotification, 4627, 9, +OOVPA_XREF(IXACTEngine_GetNotification, 4627, 1+8, XRefNoSaveIndex, XRefOne) @@ -400,7 +400,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_UnRegisterWaveBank // ****************************************************************** -OOVPA_XREF(IXACTEngine_UnRegisterWaveBank, 4627, 8, +OOVPA_XREF(IXACTEngine_UnRegisterWaveBank, 4627, 1+7, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.inl index ec696161a..6acaea06f 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4928.inl @@ -112,7 +112,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_RegisterStreamedWaveBank // ****************************************************************** -OOVPA_XREF(IXACTEngine_RegisterStreamedWaveBank, 4928, 10, +OOVPA_XREF(IXACTEngine_RegisterStreamedWaveBank, 4928, 1+9, XRefNoSaveIndex, XRefOne) @@ -187,7 +187,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_CreateSoundBank // ****************************************************************** -OOVPA_XREF(IXACTEngine_CreateSoundBank, 4928, 10, +OOVPA_XREF(IXACTEngine_CreateSoundBank, 4928, 1+9, XRefNoSaveIndex, XRefOne) @@ -232,7 +232,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_UnRegisterWaveBank // ****************************************************************** -OOVPA_XREF(IXACTEngine_UnRegisterWaveBank, 4928, 8, +OOVPA_XREF(IXACTEngine_UnRegisterWaveBank, 4928, 1+7, XRefNoSaveIndex, XRefOne) @@ -274,7 +274,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_CreateSoundSource // ****************************************************************** -OOVPA_XREF(IXACTEngine_CreateSoundSource, 4928, 9, +OOVPA_XREF(IXACTEngine_CreateSoundSource, 4928, 1+8, XRefNoSaveIndex, XRefOne) @@ -294,7 +294,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_GetNotification // ****************************************************************** -OOVPA_XREF(IXACTEngine_GetNotification, 4928, 9, +OOVPA_XREF(IXACTEngine_GetNotification, 4928, 1+8, XRefNoSaveIndex, XRefOne) @@ -339,7 +339,7 @@ OOVPA_END; // ****************************************************************** // * IXACTSoundBank_GetSoundCueIndexFromFriendlyName // ****************************************************************** -OOVPA_XREF(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4928, 9, +OOVPA_XREF(IXACTSoundBank_GetSoundCueIndexFromFriendlyName, 4928, 1+8, XRefNoSaveIndex, XRefOne) @@ -359,7 +359,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_RegisterNotification // ****************************************************************** -OOVPA_XREF(IXACTEngine_RegisterNotification, 4928, 8, +OOVPA_XREF(IXACTEngine_RegisterNotification, 4928, 1+7, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5120.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5120.inl index 0dcbb4c4d..133afd7d1 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5120.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5120.inl @@ -106,7 +106,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_RegisterWaveBank // ****************************************************************** -OOVPA_XREF(IXACTEngine_RegisterWaveBank, 5120, 10, +OOVPA_XREF(IXACTEngine_RegisterWaveBank, 5120, 1+9, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.inl index 208b551e4..596737fa8 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5233.inl @@ -159,7 +159,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_RegisterWaveBank // ****************************************************************** -OOVPA_XREF(IXACTEngine_RegisterWaveBank, 5120, 10, +OOVPA_XREF(IXACTEngine_RegisterWaveBank, 5120, 1+9, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.inl index eee8cd4ec..1b3506e30 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.5344.inl @@ -59,7 +59,7 @@ OOVPA_END; // ****************************************************************** // * IXACTEngine_DownloadEffectsImage // ****************************************************************** -OOVPA_XREF(IXACTEngine_DownloadEffectsImage, 5344, 11, +OOVPA_XREF(IXACTEngine_DownloadEffectsImage, 5344, 1+10, XRefNoSaveIndex, XRefOne) @@ -107,7 +107,7 @@ OOVPA_END; // ****************************************************************** // * IXACTSoundBank_PlayEx // ****************************************************************** -OOVPA_XREF(IXACTSoundBank_PlayEx, 5344, 11, +OOVPA_XREF(IXACTSoundBank_PlayEx, 5344, 1+10, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl index 53e031606..29dc18e9c 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl @@ -466,7 +466,7 @@ OOVPA_END; // ****************************************************************** // * XInputClose // ****************************************************************** -OOVPA_XREF(XInputClose, 3911, 8, +OOVPA_XREF(XInputClose, 3911, 1+7, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl index 21febee1f..892e5a428 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl @@ -194,9 +194,13 @@ OOVPA_NO_XREF(XSetProcessQuantumLength, 4134, 7) OOVPA_END; // ****************************************************************** -// * XSetProcessQuantumLength +// * GetTypeInformation // ****************************************************************** -OOVPA_XREF(GetTypeInformation, 4134, 24, XREF_XAPI_GetTypeInformation, XRefZero) +OOVPA_XREF(GetTypeInformation, 4134, 24, + + XREF_XAPI_GetTypeInformation, + XRefZero) + { 0x00, 0xB8 }, { 0x05, 0x56 }, { 0x06, 0x8B }, diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5455.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5455.inl index c8f1d0ef1..071ce85a1 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5455.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5455.inl @@ -82,7 +82,7 @@ OOVPA_END; // ****************************************************************** // * XInputClose // ****************************************************************** -OOVPA_XREF(XInputClose, 5455, 9, +OOVPA_XREF(XInputClose, 5455, 1+8, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl index c7729848c..f919c2906 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl @@ -146,7 +146,7 @@ OOVPA_END; // ****************************************************************** // * XInputClose // ****************************************************************** -OOVPA_XREF(XInputClose, 5455, 9, +OOVPA_XREF(XInputClose, 5455, 1+8, XRefNoSaveIndex, XRefOne) diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp index 6022e600e..748519f3f 100644 --- a/src/CxbxKrnl/HLEIntercept.cpp +++ b/src/CxbxKrnl/HLEIntercept.cpp @@ -278,8 +278,8 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) // Request a few fundamental XRefs to be derived instead of checked XRefDataBase[XREF_D3DDEVICE] = XREF_ADDR_DERIVE; - XRefDataBase[XREF_D3DRS_CULLMODE] = XREF_ADDR_DERIVE; - XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] = XREF_ADDR_DERIVE; + XRefDataBase[XREF_D3D_RenderState_CullMode] = XREF_ADDR_DERIVE; + XRefDataBase[XREF_D3D_TextureState_TexCoordIndex] = XREF_ADDR_DERIVE; for(int p=0;UnResolvedXRefs < LastUnResolvedXRefs;p++) { @@ -368,7 +368,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) 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 + // TODO : Simplify this when XREF_D3D_RenderState_CullMode derivation is deemed stable { if (BuildVersion >= 3911 && BuildVersion < 4034) { DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x25); @@ -407,12 +407,12 @@ 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] != XREF_ADDR_DERIVE) - CxbxPopupMessage("Second derived XREF_D3DRS_CULLMODE differs from first!"); + // Temporary verification - is XREF_D3D_RenderState_CullMode derived correctly? + if (XRefDataBase[XREF_D3D_RenderState_CullMode] != DerivedAddr_D3DRS_CULLMODE) { + if (XRefDataBase[XREF_D3D_RenderState_CullMode] != XREF_ADDR_DERIVE) + CxbxPopupMessage("Second derived XREF_D3D_RenderState_CullMode differs from first!"); - XRefDataBase[XREF_D3DRS_CULLMODE] = DerivedAddr_D3DRS_CULLMODE; + XRefDataBase[XREF_D3D_RenderState_CullMode] = DerivedAddr_D3DRS_CULLMODE; } } @@ -421,12 +421,12 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) 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; + XRefDataBase[XREF_D3D_RenderState_MultiSampleMode] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset - 8*4; + XRefDataBase[XREF_D3D_RenderState_MultiSampleRenderTargetMode] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset - 7*4; + XRefDataBase[XREF_D3D_RenderState_StencilCullEnable] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 0*4; + XRefDataBase[XREF_D3D_RenderState_RopZCmpAlwaysRead] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 1*4; + XRefDataBase[XREF_D3D_RenderState_RopZRead] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 2*4; + XRefDataBase[XREF_D3D_RenderState_DoNotCullUncompressed] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 3*4; for(int v=0;v<44;v++) { XTL::EmuD3DDeferredRenderState[v] = XTL::X_D3DRS_UNK; @@ -434,7 +434,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) 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] ); + //DbgPrintf("HLE: 0x%.08X -> XREF_D3D_RenderState_RopZCmpAlwaysRead\n", XRefDataBase[XREF_D3D_RenderState_RopZCmpAlwaysRead] ); } else { XTL::EmuD3DDeferredRenderState = nullptr; CxbxKrnlCleanup("EmuD3DDeferredRenderState was not found!"); @@ -457,7 +457,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) xbaddr DerivedAddr_D3DTSS_TEXCOORDINDEX = NULL; int Decrement = 0x70; // TODO : Rename into something understandable - // TODO : Remove this when XREF_D3DTSS_TEXCOORDINDEX derivation is deemed stable + // TODO : Remove this when XREF_D3D_TextureState_TexCoordIndex derivation is deemed stable { if (BuildVersion >= 3911 && BuildVersion < 4034) // 0x18F180 DerivedAddr_D3DTSS_TEXCOORDINDEX = *(xbaddr*)(pFunc + 0x11); @@ -466,13 +466,13 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) 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!"); + // Temporary verification - is XREF_D3D_TextureState_TexCoordIndex derived correctly? + if (XRefDataBase[XREF_D3D_TextureState_TexCoordIndex] != DerivedAddr_D3DTSS_TEXCOORDINDEX) { + if (XRefDataBase[XREF_D3D_TextureState_TexCoordIndex] != XREF_ADDR_DERIVE) { + CxbxPopupMessage("Second derived XREF_D3D_TextureState_TexCoordIndex differs from first!"); } - XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] = DerivedAddr_D3DTSS_TEXCOORDINDEX; + XRefDataBase[XREF_D3D_TextureState_TexCoordIndex] = DerivedAddr_D3DTSS_TEXCOORDINDEX; } }