ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #366 from jarupxx/Remove-ALIAS-OOVPA 

merged ALIAS OOVPA with multiple patterns into one (part 2)
This commit is contained in:
Luke Usher 2017-04-13 23:12:14 +01:00 committed by GitHub
parent 2a0a1a35d1 fe8589c230
commit 503234b7ce
33 changed files with 148 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -2476,9 +2476,11 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetTile)
}
// ******************************************************************
// * patch: D3DDevice_SetTileNoWait
// * patch: D3DDevice_SetTile
// ******************************************************************
HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetTileNoWait)
// * Dxbx note : SetTile is applied to SetTileNoWait in Cxbx 4361 OOPVA's!
// ******************************************************************
HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetTile)
(
DWORD Index,
CONST X_D3DTILE *pTile
@ -2486,7 +2488,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetTileNoWait)
{
DbgPrintf("EmuD3D8: EmuD3DDevice_SetTileNoWait\n"
DbgPrintf("EmuD3D8: EmuD3DDevice_SetTile\n"
"(\n"
" Index : 0x%.08X\n"
" pTile : 0x%.08X\n"
@ -9577,6 +9579,21 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_KickOff)()
// __asm int 3;
}
// ******************************************************************
// * patch: D3DDevice_KickPushBuffer
// ******************************************************************
VOID WINAPI XTL::EMUPATCH(D3DDevice_KickPushBuffer)()
{
DbgPrintf("EmuD3D8: EmuD3DDevice_KickPushBuffer()\n");
// TODO -oDxbx : Locate the current PushBuffer address, and supply that to RunPushBuffer (without a fixup)
EmuWarning("D3DDevice_KickPushBuffer is not yet implemented!");
}
// ******************************************************************

9
src/CxbxKrnl/EmuD3D8.h
View File

@ -354,9 +354,9 @@ HRESULT WINAPI EMUPATCH(D3DDevice_GetTile)
);
// ******************************************************************
// * patch: D3DDevice_SetTileNoWait
// * patch: D3DDevice_SetTile
// ******************************************************************
HRESULT WINAPI EMUPATCH(D3DDevice_SetTileNoWait)
HRESULT WINAPI EMUPATCH(D3DDevice_SetTile)
(
DWORD Index,
CONST X_D3DTILE *pTile
@ -1756,6 +1756,11 @@ HRESULT WINAPI EMUPATCH(D3DDevice_GetProjectionViewportMatrix)
// ******************************************************************
VOID WINAPI EMUPATCH(D3DDevice_KickOff)();
// ******************************************************************
// * patch: D3DDevice_KickPushBuffer
// ******************************************************************
VOID WINAPI EMUPATCH(D3DDevice_KickPushBuffer)();
// ******************************************************************
// * patch: D3DDevice_GetTexture2
// ******************************************************************

10
src/CxbxKrnl/EmuDSound.cpp
View File

@ -2040,9 +2040,9 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_Pause)
}
// ******************************************************************
// * patch: IDirectSoundStream_SetHeadroom
// * patch: DirectSound_CDirectSoundStream_SetHeadroom
// ******************************************************************
HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_SetHeadroom)
HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetHeadroom)
(
PVOID pThis,
DWORD dwHeadroom
@ -2050,7 +2050,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_SetHeadroom)
{
DbgPrintf("EmuDSound: EmuIDirectSoundStream_SetHeadroom\n"
DbgPrintf("EmuDSound: EmuDirectSound_CDirectSoundStream_SetHeadroom\n"
"(\n"
" pThis : 0x%.08X\n"
" dwHeadroom : 0x%.08X\n"
@ -3442,7 +3442,7 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetI3DL2Source)
}
// ******************************************************************
// * patch: IDirectSoundBuffer_SetI3DL2Source
// * patch: IDirectSoundBuffer_SetAllParameters
// ******************************************************************
HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_SetAllParameters)
(
@ -3465,7 +3465,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_SetAllParameters)
return S_OK;
return DS_OK;
}
// ******************************************************************

4
src/CxbxKrnl/EmuDSound.h
View File

@ -917,9 +917,9 @@ HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_Pause)
);
// ******************************************************************
// * patch: IDirectSoundStream_SetHeadroom
// * patch: DirectSound_CDirectSoundStream_SetHeadroom
// ******************************************************************
HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetHeadroom)
HRESULT WINAPI EMUPATCH(DirectSound_CDirectSoundStream_SetHeadroom)
(
PVOID pThis,
DWORD dwHeadroom

16
src/CxbxKrnl/EmuXapi.cpp
View File

@ -911,9 +911,9 @@ BOOL WINAPI XTL::EMUPATCH(GetOverlappedResult)
}
// ******************************************************************
// * patch: XLaunchNewImage
// * patch: XLaunchNewImageA
// ******************************************************************
DWORD WINAPI XTL::EMUPATCH(XLaunchNewImage)
DWORD WINAPI XTL::EMUPATCH(XLaunchNewImageA)
(
LPCSTR lpTitlePath,
PLAUNCH_DATA pLaunchData
@ -934,7 +934,7 @@ DWORD WINAPI XTL::EMUPATCH(XLaunchNewImage)
// TODO : This patch can be removed once NtOpenSymbolicLinkObject()
// and NtQuerySymbolicLinkObject() work together correctly.
// Also, XLaunchNewImage() depends on XeImageHeader() and uses
// Also, XLaunchNewImageA() depends on XeImageHeader() and uses
// XWriteTitleInfoAndReboot() and indirectly XWriteTitleInfoNoReboot()
// Update the kernel's LaunchDataPage :
@ -978,7 +978,7 @@ DWORD WINAPI XTL::EMUPATCH(XLaunchNewImage)
// Note : While this patch exists, HalReturnToFirmware() calls
// MmPersistContiguousMemory on LaunchDataPage. When this
// patch on XLaunchNewImage is removed, remove the call to
// patch on XLaunchNewImageA is removed, remove the call to
// MmPersistContiguousMemory from HalReturnToFirmware() too!!
xboxkrnl::HalReturnToFirmware(xboxkrnl::ReturnFirmwareQuickReboot);
@ -1163,9 +1163,9 @@ DWORD WINAPI XTL::EMUPATCH(XMountMUA)
}
// ******************************************************************
// * patch: XMountAlternateTitle
// * patch: XMountAlternateTitleA
// ******************************************************************
DWORD WINAPI XTL::EMUPATCH(XMountAlternateTitle)
DWORD WINAPI XTL::EMUPATCH(XMountAlternateTitleA)
(
LPCSTR lpRootPath,
DWORD dwAltTitleId,
@ -1185,9 +1185,9 @@ DWORD WINAPI XTL::EMUPATCH(XMountAlternateTitle)
}
// ******************************************************************
// * patch: XUnmountAlternateTitle
// * patch: XUnmountAlternateTitleA
// ******************************************************************
DWORD WINAPI XTL::EMUPATCH(XUnmountAlternateTitle)
DWORD WINAPI XTL::EMUPATCH(XUnmountAlternateTitleA)
(
CHAR chDrive
)

12
src/CxbxKrnl/EmuXapi.h
View File

@ -596,9 +596,9 @@ BOOL WINAPI EMUPATCH(GetOverlappedResult)
);
// ******************************************************************
// * patch: XLaunchNewImage
// * patch: XLaunchNewImageA
// ******************************************************************
DWORD WINAPI EMUPATCH(XLaunchNewImage)
DWORD WINAPI EMUPATCH(XLaunchNewImageA)
(
LPCSTR lpTitlePath,
PLAUNCH_DATA pLaunchData
@ -695,9 +695,9 @@ DWORD WINAPI EMUPATCH(XMountMURootA)
);
// ******************************************************************
// * patch: XMountAlternateTitle
// * patch: XMountAlternateTitleA
// ******************************************************************
DWORD WINAPI EMUPATCH(XMountAlternateTitle)
DWORD WINAPI EMUPATCH(XMountAlternateTitleA)
(
LPCSTR lpRootPath,
DWORD dwAltTitleId,
@ -705,9 +705,9 @@ DWORD WINAPI EMUPATCH(XMountAlternateTitle)
);
// ******************************************************************
// * patch: XUnmountAlternateTitle
// * patch: XUnmountAlternateTitleA
// ******************************************************************
DWORD WINAPI EMUPATCH(XUnmountAlternateTitle)(CHAR chDrive);
DWORD WINAPI EMUPATCH(XUnmountAlternateTitleA)(CHAR chDrive);
// ******************************************************************
// * patch: MoveFileA

8
src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
View File

@ -3403,17 +3403,17 @@ OOVPA_END;
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_SetTile, 3925, 9)
// D3DDevice_SetTileNoWait+0x06 : sub esp, 0x18
// D3DDevice_SetTile+0x06 : sub esp, 0x18
{ 0x06, 0x83 }, // (Offset,Value)-Pair #1
{ 0x07, 0xEC }, // (Offset,Value)-Pair #2
{ 0x08, 0x18 }, // (Offset,Value)-Pair #3
// D3DDevice_SetTileNoWait+0x15 : cmp [esi+4], eax
// D3DDevice_SetTile+0x15 : cmp [esi+4], eax
{ 0x15, 0x39 }, // (Offset,Value)-Pair #4
{ 0x16, 0x46 }, // (Offset,Value)-Pair #5
{ 0x17, 0x04 }, // (Offset,Value)-Pair #6
// D3DDevice_SetTileNoWait+0x7E : lea edi, [edx+ecx*8+21BCh]
// D3DDevice_SetTile+0x7E : lea edi, [edx+ecx*8+21BCh]
{ 0x7E, 0x83 }, // (Offset,Value)-Pair #7
{ 0x7F, 0xC4 }, // (Offset,Value)-Pair #8
{ 0x80, 0x18 }, // (Offset,Value)-Pair #9
@ -3819,7 +3819,7 @@ OOVPATable D3D8_3925[] = {
REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_BeginStateBlock, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_EndStateBlock, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetTileNoWait, 3925, ALIAS, D3DDevice_SetTile),
REGISTER_OOVPA(D3DDevice_SetTile, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetBackMaterial, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SwitchTexture, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetModelView, 3925, PATCH),

10
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
View File

@ -1634,17 +1634,17 @@ OOVPA_END;
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_SetTile, 4134, 11)
// D3DDevice_SetTileNoWait+0x00 : sub esp, 0x18
// D3DDevice_SetTile+0x00 : sub esp, 0x18
{ 0x00, 0x83 }, // (Offset,Value)-Pair #1
{ 0x01, 0xEC }, // (Offset,Value)-Pair #2
{ 0x02, 0x18 }, // (Offset,Value)-Pair #3
// D3DDevice_SetTileNoWait+0x16 : cmp [esi+4], eax
// D3DDevice_SetTile+0x16 : cmp [esi+4], eax
{ 0x16, 0x39 }, // (Offset,Value)-Pair #4
{ 0x17, 0x46 }, // (Offset,Value)-Pair #5
{ 0x18, 0x04 }, // (Offset,Value)-Pair #6
// D3DDevice_SetTileNoWait+0x3D : lea edi, [edx+ecx*8+0x211C]
// D3DDevice_SetTile+0x3D : lea edi, [edx+ecx*8+0x211C]
{ 0x3D, 0x8D }, // (Offset,Value)-Pair #7
{ 0x3E, 0xBC }, // (Offset,Value)-Pair #8
{ 0x3F, 0xCB }, // (Offset,Value)-Pair #9
@ -2123,10 +2123,10 @@ OOVPATable D3D8_4134[] = {
REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_GetTile, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetTileNoWait, 4134, ALIAS, D3DDevice_SetTile),
REGISTER_OOVPA(D3DDevice_SetTile, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_IsBusy, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_KickOff, 4134, ALIAS, D3DDevice_KickOff),
REGISTER_OOVPA(D3DDevice_KickOff, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_BlockOnFence, 4134, PATCH),
// REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4134, PATCH), INCORRECT, not yet located

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl
View File

@ -1918,7 +1918,7 @@ OOVPATable D3D8_4361[] = {
REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_GetTile, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetTileNoWait, 4134, ALIAS, D3DDevice_SetTile),
REGISTER_OOVPA(D3DDevice_SetTile, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_IsBusy, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetCreationParameters, 4034, PATCH),

16
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
View File

@ -524,21 +524,21 @@ OOVPA_NO_XREF(D3DDevice_GetTile, 4627, 11)
OOVPA_END;
// ******************************************************************
// * D3DDevice_SetTileNoWait
// * D3DDevice_SetTile
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_SetTileNoWait, 4627, 11)
OOVPA_NO_XREF(D3DDevice_SetTile, 4627, 11)
// D3DDevice_SetTileNoWait+0x06 : sub esp, 0x18
// D3DDevice_SetTile+0x06 : sub esp, 0x18
{ 0x06, 0x83 }, // (Offset,Value)-Pair #1
{ 0x07, 0xEC }, // (Offset,Value)-Pair #2
{ 0x08, 0x18 }, // (Offset,Value)-Pair #3
// D3DDevice_SetTileNoWait+0x15 : cmp [esi+4], eax
// D3DDevice_SetTile+0x15 : cmp [esi+4], eax
{ 0x15, 0x39 }, // (Offset,Value)-Pair #4
{ 0x16, 0x46 }, // (Offset,Value)-Pair #5
{ 0x17, 0x04 }, // (Offset,Value)-Pair #6
// D3DDevice_SetTileNoWait+0x3D : lea edi, [edx+ecx*8+0x2260]
// D3DDevice_SetTile+0x3D : lea edi, [edx+ecx*8+0x2260]
{ 0x3D, 0x8D }, // (Offset,Value)-Pair #7
{ 0x3E, 0xBC }, // (Offset,Value)-Pair #8
{ 0x3F, 0xCA }, // (Offset,Value)-Pair #9
@ -2742,7 +2742,7 @@ OOVPA_END;
OOVPATable D3D8_4627[] = {
REGISTER_OOVPA(Direct3D_CreateDevice, 4627, PATCH),
REGISTER_OOVPA(Direct3D_CreateDevice, 4627, ALIAS, D3D_CreateDeviceX),
REGISTER_OOVPA(D3D_CreateDeviceX, 4627, XREF), // If hitting a Breakpoint, redirect to Direct3D_CreateDevice.
REGISTER_OOVPA(D3D_CheckDeviceFormat, 4361, DISABLED),
REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetCreationParameters, 4034, PATCH),
@ -2765,7 +2765,7 @@ OOVPATable D3D8_4627[] = {
REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetTile, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetTileNoWait, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4134, PATCH),
@ -2934,7 +2934,7 @@ REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH),
REGISTER_OOVPA(D3D_LazySetPointParams, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetMaterial, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_KickOff, 4627, ALIAS, D3DDevice_KickPushBuffer),
REGISTER_OOVPA(D3DDevice_KickPushBuffer, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4627, PATCH),
// REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), // TODO: This needs to be verified on 4361, not just 4242!

14
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl
View File

@ -322,21 +322,21 @@ OOVPA_NO_XREF(D3DDevice_SetIndices, 5028, 7)
OOVPA_END;
// ******************************************************************
// * D3DDevice_SetTileNoWait
// * D3DDevice_SetTile
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_SetTileNoWait, 5028, 11)
OOVPA_NO_XREF(D3DDevice_SetTile, 5028, 11)
// D3DDevice_SetTileNoWait+0x06 : sub esp, 0x18
// D3DDevice_SetTile+0x06 : sub esp, 0x18
{ 0x06, 0x83 }, // (Offset,Value)-Pair #1
{ 0x07, 0xEC }, // (Offset,Value)-Pair #2
{ 0x08, 0x18 }, // (Offset,Value)-Pair #3
// D3DDevice_SetTileNoWait+0x15 : cmp [esi+4], eax
// D3DDevice_SetTile+0x15 : cmp [esi+4], eax
{ 0x15, 0x39 }, // (Offset,Value)-Pair #4
{ 0x16, 0x46 }, // (Offset,Value)-Pair #5
{ 0x17, 0x04 }, // (Offset,Value)-Pair #6
// D3DDevice_SetTileNoWait+0x3D : lea edi, [edx+ecx*8+0xXXXX]
// D3DDevice_SetTile+0x3D : lea edi, [edx+ecx*8+0xXXXX]
{ 0x3D, 0x8D }, // (Offset,Value)-Pair #7
{ 0x3E, 0xBC }, // (Offset,Value)-Pair #8
{ 0x3F, 0xCA }, // (Offset,Value)-Pair #9
@ -831,7 +831,7 @@ OOVPATable D3D8_5028[] = {
REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_GetTile, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetTileNoWait, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4134, PATCH),
@ -990,7 +990,7 @@ OOVPATable D3D8_5028[] = {
REGISTER_OOVPA(D3D_LazySetPointParams, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetMaterial, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_KickOff, 4627, ALIAS, D3DDevice_KickPushBuffer),
REGISTER_OOVPA(D3DDevice_KickPushBuffer, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4627, PATCH),
REGISTER_OOVPA(D3D_SetPushBufferSize, 4034, DISABLED),

6
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
View File

@ -521,9 +521,9 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShader, 5233, 14)
OOVPA_END;
// ******************************************************************
// * D3DDevice_SetTileNoWait
// * D3DDevice_SetTile
// ******************************************************************
#define D3DDevice_SetTileNoWait_5233 D3DDevice_SetTileNoWait_5028
#define D3DDevice_SetTile_5233 D3DDevice_SetTile_5028
// ******************************************************************
// * D3DDevice_AddRef
@ -985,7 +985,7 @@ OOVPATable D3D8_5233[] = {
REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_AddRef, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_Reset, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetTileNoWait, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4361, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl
View File

@ -839,7 +839,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_AddRef, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_Reset, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetTileNoWait, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4361, PATCH),

6
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
View File

@ -1451,9 +1451,9 @@ OOVPA_NO_XREF(D3DDevice_GetViewportOffsetAndScale, 5558, 8)
OOVPA_END;
// ******************************************************************
// * D3DDevice_SetTileNoWait
// * D3DDevice_SetTile
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_SetTileNoWait, 5558, 10)
OOVPA_NO_XREF(D3DDevice_SetTile, 5558, 10)
{ 0x00, 0x83 },
{ 0x01, 0xEC },
@ -1634,7 +1634,7 @@ OOVPATable D3D8_5558[] = {
REGISTER_OOVPA(D3DDevice_IsFencePending, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_SetTileNoWait, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH),

10
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
View File

@ -620,15 +620,15 @@ OOVPA_END;
*/
// ******************************************************************
// * D3DDevice_SetTileNoWait
// * D3DDevice_SetTile
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_SetTileNoWait, 5788, 10)
OOVPA_NO_XREF(D3DDevice_SetTile, 5788, 10)
// D3DDevice_SetTileNoWait+0x00: sub esp, 0x1C
// D3DDevice_SetTile+0x00: sub esp, 0x1C
{ 0x00, 0x83 },
{ 0x01, 0xEC },
{ 0x02, 0x1C },
// D3DDevice_SetTileNoWait+0x45: lea ebx, [ebx+ebp*8+0x1AC0]
// D3DDevice_SetTile+0x45: lea ebx, [ebx+ebp*8+0x1AC0]
{ 0x45, 0x8D },
{ 0x46, 0x9C },
{ 0x47, 0xEB },
@ -1330,7 +1330,7 @@ OOVPATable D3D8_5788[] = {
REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5788, PATCH),
REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetTileNoWait, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4928, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5788, PATCH),

10
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
View File

@ -685,15 +685,15 @@ OOVPA_END;
*/
// ******************************************************************
// * D3DDevice_SetTileNoWait
// * D3DDevice_SetTile
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_SetTileNoWait, 5849, 10)
OOVPA_NO_XREF(D3DDevice_SetTile, 5849, 10)
// D3DDevice_SetTileNoWait+0x00: sub esp, 0x1C
// D3DDevice_SetTile+0x00: sub esp, 0x1C
{ 0x00, 0x83 },
{ 0x01, 0xEC },
{ 0x02, 0x1C },
// D3DDevice_SetTileNoWait+0x45: lea ebx, [ebx+ebp*8+0x1AC0]
// D3DDevice_SetTile+0x45: lea ebx, [ebx+ebp*8+0x1AC0]
{ 0x45, 0x8D },
{ 0x46, 0x9C },
{ 0x47, 0xEB },
@ -1385,7 +1385,7 @@ OOVPATable D3D8_5849[] = {
REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5849, PATCH),
REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetTileNoWait, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4928, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5849, PATCH),

26
src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl
View File

@ -896,9 +896,9 @@ OOVPA_XREF(DirectSound_CDirectSoundVoice_SetMixBins, 3936, 9,
OOVPA_END;
// ******************************************************************
// * IDirectSoundStream_SetMixBins
// * DirectSound_CDirectSoundStream_SetMixBins
// ******************************************************************
OOVPA_XREF(IDirectSoundStream_SetMixBins, 3936, 10,
OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBins, 3936, 10,
XRefNoSaveIndex,
XRefOne)
@ -906,18 +906,18 @@ OOVPA_XREF(IDirectSoundStream_SetMixBins, 3936, 10,
// IDirectSoundStream_SetFrequency+0x0C : call [CDirectSoundVoice::SetMixBins]
XREF_ENTRY( 0x0D, XREF_DSSETMIXBINSA ), // (Offset,Value)-Pair #1
// IDirectSoundStream_SetMixBins+0x04 : mov eax, [esp+0x08]
// DirectSound_CDirectSoundStream_SetMixBins+0x04 : mov eax, [esp+0x08]
{ 0x04, 0x8B }, // (Offset,Value)-Pair #2
{ 0x05, 0x44 }, // (Offset,Value)-Pair #3
{ 0x06, 0x24 }, // (Offset,Value)-Pair #4
{ 0x07, 0x08 }, // (Offset,Value)-Pair #5
// IDirectSoundStream_SetMixBins+0x08 : add eax, 0x04
// DirectSound_CDirectSoundStream_SetMixBins+0x08 : add eax, 0x04
{ 0x08, 0x83 }, // (Offset,Value)-Pair #6
{ 0x09, 0xC0 }, // (Offset,Value)-Pair #7
{ 0x0A, 0x04 }, // (Offset,Value)-Pair #8
// IDirectSoundStream_SetMixBins+0x11 : retn 0x08
// DirectSound_CDirectSoundStream_SetMixBins+0x11 : retn 0x08
{ 0x11, 0xC2 }, // (Offset,Value)-Pair #9
{ 0x12, 0x08 }, // (Offset,Value)-Pair #10
OOVPA_END;
@ -2530,28 +2530,28 @@ OOVPA_XREF(DirectSound_CDirectSoundVoice_SetHeadroom, 3936, 10,
OOVPA_END;
// ******************************************************************
// * IDirectSoundStream_SetHeadroom
// * DirectSound_CDirectSoundStream_SetHeadroom
// ******************************************************************
OOVPA_XREF(IDirectSoundStream_SetHeadroom, 3936, 10,
OOVPA_XREF(DirectSound_CDirectSoundStream_SetHeadroom, 3936, 10,
XRefNoSaveIndex,
XRefOne)
// IDirectSoundStream_SetHeadroom+0x0D : call [DirectSound_CDirectSoundVoice_SetHeadroom]
// DirectSound_CDirectSoundStream_SetHeadroom+0x0D : call [DirectSound_CDirectSoundVoice_SetHeadroom]
XREF_ENTRY( 0x0D, XREF_DSSETHEADROOMA ), // (Offset,Value)-Pair #1
// IDirectSoundStream_SetHeadroom+0x04 : mov eax, [esp+0x08]
// DirectSound_CDirectSoundStream_SetHeadroom+0x04 : mov eax, [esp+0x08]
{ 0x04, 0x8B }, // (Offset,Value)-Pair #2
{ 0x05, 0x44 }, // (Offset,Value)-Pair #3
{ 0x06, 0x24 }, // (Offset,Value)-Pair #4
{ 0x07, 0x08 }, // (Offset,Value)-Pair #5
// IDirectSoundStream_SetHeadroom+0x08 : add eax, 0x04
// DirectSound_CDirectSoundStream_SetHeadroom+0x08 : add eax, 0x04
{ 0x08, 0x83 }, // (Offset,Value)-Pair #6
{ 0x09, 0xC0 }, // (Offset,Value)-Pair #7
{ 0x0A, 0x04 }, // (Offset,Value)-Pair #8
// IDirectSoundStream_SetHeadroom+0x11 : retn 0x08
// DirectSound_CDirectSoundStream_SetHeadroom+0x11 : retn 0x08
{ 0x11, 0xC2 }, // (Offset,Value)-Pair #9
{ 0x12, 0x08 }, // (Offset,Value)-Pair #10
OOVPA_END;
@ -4063,7 +4063,7 @@ OOVPATable DSound_3936[] = {
REGISTER_OOVPA(IDirectSoundBuffer_SetBufferData, 3936, PATCH),
REGISTER_OOVPA(CMcpxVoiceClient_SetMixBins, 3936, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBins, 3936, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 3936, ALIAS, IDirectSoundStream_SetMixBins),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBins, 3936, PATCH),
REGISTER_OOVPA(IDirectSoundBuffer_SetMixBins, 3936, PATCH),
REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition, 3936, XREF),
REGISTER_OOVPA(CMcpxBuffer_GetCurrentPosition2, 3936, XREF),
@ -4120,7 +4120,7 @@ OOVPATable DSound_3936[] = {
// REGISTER_OOVPA(IDirectSoundStream_SetI3DL2Source, 3936, PATCH),
// REGISTER_OOVPA(IDirectSoundStream_Unknown1, 3936, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 3936, XREF),
REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 3936, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 3936, PATCH),
REGISTER_OOVPA(IDirectSound_SetOrientation, 3936, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettingsB, 3936, XREF),
REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettingsA, 3936, XREF),

2
src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl
View File

@ -2773,7 +2773,7 @@ OOVPATable DSound_4134[] = {
REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetAllParameters, 4134, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 4134, XREF),
REGISTER_OOVPA(IDirectSound_SetAllParameters, 4134, ALIAS, IDirectSoundBuffer_SetAllParameters), // Use that for now. Okay, it's your call pal...
REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), // Use that for now. Okay, it's your call pal...
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetAllParameters, 4134, PATCH),
REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 4134, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMode, 4134, XREF),

6
src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl
View File

@ -1570,13 +1570,13 @@ OOVPATable DSound_4627[] = {
REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 4627, XREF),
REGISTER_OOVPA(IDirectSound_EnableHeadphones, 4627, PATCH),
// REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 4627, XREF),
// REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 4627, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom),
// REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 4627, PATCH),
REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_GetOutputLevels, 4627, XREF),
REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetAllParameters, 4134, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 4134, XREF),
REGISTER_OOVPA(IDirectSound_SetAllParameters, 4134, ALIAS, IDirectSoundBuffer_SetAllParameters), // Use that for now. Okay, it's your call pal...
REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), // Use that for now. Okay, it's your call pal...
REGISTER_OOVPA(DirectSound_CMcpxBuffer_Pause, 4928, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Pause, 4928, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH),
@ -1612,7 +1612,7 @@ OOVPATable DSound_4627[] = {
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPitch, 4627, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4627, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 4627, XREF),
REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 4627, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 4627, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetOutputBuffer, 4627, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetOutputBuffer, 4627, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 4627, PATCH),

6
src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl
View File

@ -189,13 +189,13 @@ OOVPATable DSound_5028[] = {
REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 4627, XREF),
REGISTER_OOVPA(IDirectSound_EnableHeadphones, 4627, PATCH),
// REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 4627, XREF),
// REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 4627, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom),
// REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 4627, PATCH),
REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_GetOutputLevels, 4627, XREF),
REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetAllParameters, 4134, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetAllParameters, 4134, XREF),
REGISTER_OOVPA(IDirectSound_SetAllParameters, 4134, ALIAS, IDirectSoundBuffer_SetAllParameters), // Use that for now. Okay, it's your call pal...
REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), // Use that for now. Okay, it's your call pal...
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetAllParameters, 4134, PATCH),
REGISTER_OOVPA(DirectSound_CMcpxBuffer_Pause, 4928, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Pause, 4928, XREF),
@ -232,7 +232,7 @@ OOVPATable DSound_5028[] = {
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetPitch, 4627, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 4627, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 4627, XREF),
REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 4627, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 4627, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetOutputBuffer, 4627, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetOutputBuffer, 4627, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 4627, PATCH),

2
src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl
View File

@ -535,7 +535,7 @@ OOVPATable DSound_5233[] = {
REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4134, PATCH),
REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4134, PATCH),
REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH),
REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, DirectSound_CDirectSoundStream_SetVolume), // (This is actually the XREF we are using)
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 5233, PATCH), // (This is actually the XREF we are using)
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5233, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, PATCH),

2
src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl
View File

@ -950,7 +950,7 @@ OOVPATable DSound_5344[] = {
REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 4134, PATCH),
REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4134, PATCH),
REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH),
REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, DirectSound_CDirectSoundStream_SetVolume), // (This is actually the XREF we are using)
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 5233, PATCH), // (This is actually the XREF we are using)
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5233, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, PATCH),

8
src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl
View File

@ -1693,7 +1693,7 @@ OOVPA_END;
// ******************************************************************
// * IDirectSound_EnableHeadphones
// ******************************************************************
OOVPA_XREF(IDirectSound_EnableHeadphones, 5558, 8,
OOVPA_XREF(IDirectSound8_EnableHeadphones, 5558, 8,
XRefNoSaveIndex,
XRefOne)
@ -2081,7 +2081,7 @@ OOVPATable DSound_5558[] = {
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetDistanceFactor, 5558, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetDistanceFactor, 5558, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 5558, PATCH),
REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, DirectSound_CDirectSoundStream_SetVolume), // (This is actually the XREF we are using)
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 5233, PATCH), // (This is actually the XREF we are using)
REGISTER_OOVPA(DirectSoundCreateBuffer, 4627, PATCH),
REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetI3DL2Source, 5558, XREF),
@ -2093,7 +2093,7 @@ OOVPATable DSound_5558[] = {
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetHeadroom, 5558, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetHeadroom, 5558, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH),
REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 5558, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_GetCurrentPosition, 5558, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 5558, PATCH),
@ -2101,7 +2101,7 @@ OOVPATable DSound_5558[] = {
REGISTER_OOVPA(DirectSound_CDirectSound_SetMixBinHeadroom, 5558, XREF),
REGISTER_OOVPA(IDirectSound_SetMixBinHeadroom, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 5558, XREF),
REGISTER_OOVPA(IDirectSound8_EnableHeadphones, 5558, ALIAS, IDirectSound_EnableHeadphones),
REGISTER_OOVPA(IDirectSound8_EnableHeadphones, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_GetOutputLevels, 5558, XREF),
REGISTER_OOVPA(IDirectSound_GetOutputLevels, 5558, PATCH),
REGISTER_OOVPA(XAudioDownloadEffectsImage, 5558, PATCH),

14
src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl
View File

@ -1407,7 +1407,7 @@ OOVPA_END;
// ******************************************************************
// * DirectSound::CDirectSoundStream::SetMixBinVolumes
// ******************************************************************
OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBinVolumes, 5788, 9,
OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5788, 9,
XRefNoSaveIndex,
XRefOne)
@ -1627,7 +1627,7 @@ OOVPATable DSound_5788[] = {
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 4627, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 4627, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5788, ALIAS, DirectSound_CDirectSoundStream_SetMixBinVolumes),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5788, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffCurve, 5233, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffCurve, 5233, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetRolloffCurve, 5558, PATCH),
@ -1692,9 +1692,9 @@ OOVPATable DSound_5788[] = {
REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5788, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 5788, PATCH),
REGISTER_OOVPA(DirectSound_CMcpxBuffer_Stop, 5788, XREF),
REGISTER_OOVPA(DirectSound_CMcpxBuffer_Stop, 5788, XREF), // TODO: Use XREF ?Stop@CMcpxBuffer@DirectSound@@QAEJK@Z?
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 5788, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5788, ALIAS, DirectSound_CDirectSoundBuffer_StopEx),
REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5788, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 5558, XREF),
REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4134, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5788, XREF),
@ -1708,7 +1708,7 @@ OOVPATable DSound_5788[] = {
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetVolume, 5233, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetVolume, 5233, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 5233, PATCH),
REGISTER_OOVPA(IDirectSoundStream_SetVolume, 5233, ALIAS, DirectSound_CDirectSoundStream_SetVolume), // This is actually the XREF we are using
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetVolume, 5233, PATCH), // This is actually the XREF we are using
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_PlayEx, 5788, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 5788, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetRolloffFactor, 5788, XREF),
@ -1738,7 +1738,7 @@ OOVPATable DSound_5788[] = {
REGISTER_OOVPA(DirectSoundDoWork, 5788, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_SynchPlayback, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 5558, XREF),
REGISTER_OOVPA(IDirectSound8_EnableHeadphones, 5558, ALIAS, IDirectSound_EnableHeadphones),
REGISTER_OOVPA(IDirectSound8_EnableHeadphones, 5558, PATCH),
REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_GetOutputLevels, 5558, XREF),
REGISTER_OOVPA(DirectSound_CDirectSound_GetOutputLevels, 5558, XREF),
@ -1750,7 +1750,7 @@ OOVPATable DSound_5788[] = {
REGISTER_OOVPA(XAudioCreateAdpcmFormat, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPitch, 5788, PATCH),
REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 5788, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 5788, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 5558, XREF),
REGISTER_OOVPA(IDirectSound_CreateSoundStream, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play2, 5788, XREF),

13
src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl
View File

@ -1420,7 +1420,7 @@ OOVPA_END;
// ******************************************************************
// * DirectSound::CDirectSoundStream::SetMixBinVolumes
// ******************************************************************
OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBinVolumes, 5849, 9,
OOVPA_XREF(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5849, 9,
XRefNoSaveIndex,
XRefOne)
@ -1719,7 +1719,7 @@ OOVPATable DSound_5849[] = {
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMixBinVolumes, 4627, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMixBinVolumes, 4627, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes, 4627, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5849, ALIAS, DirectSound_CDirectSoundStream_SetMixBinVolumes),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetMixBinVolumes2, 5849, PATCH),
REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 4134, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFrequency, 4134, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFrequency, 4134, XREF),
@ -1766,9 +1766,9 @@ OOVPATable DSound_5849[] = {
REGISTER_OOVPA(IDirectSoundBuffer_GetCurrentPosition, 5849, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 5849, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 5849, PATCH),
REGISTER_OOVPA(DirectSound_CMcpxBuffer_Stop, 5849, XREF),
REGISTER_OOVPA(DirectSound_CMcpxBuffer_Stop, 5849, XREF), // TODO: Use XREF ?Stop@CMcpxBuffer@DirectSound@@QAEJK@Z?
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 5849, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5849, ALIAS, DirectSound_CDirectSoundBuffer_StopEx),
REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5849, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5849, XREF),
REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4134, PATCH), // TODO : Use 5344?
REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5849, XREF),
@ -1793,7 +1793,8 @@ OOVPATable DSound_5849[] = {
REGISTER_OOVPA(DirectSound_CMcpxBuffer_Pause, 5849, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Pause, 5849, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_Pause, 5849, PATCH),
REGISTER_OOVPA(DirectSoundCreateStream, 5849, ALIAS, DirectSound_CDirectSound_CreateSoundStream),
REGISTER_OOVPA(DirectSound_CDirectSound_CreateSoundStream, 5849, XREF),
REGISTER_OOVPA(IDirectSound_CreateSoundStream, 5558, PATCH),
REGISTER_OOVPA(DirectSoundCreateStream, 5849, PATCH),
REGISTER_OOVPA(DirectSound_CMcpxStream_Pause, 5849, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 5849, PATCH),
@ -1807,7 +1808,7 @@ OOVPATable DSound_5849[] = {
REGISTER_OOVPA(XFileCreateMediaObjectAsync, 5849, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 5558, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetPitch, 5849, PATCH),
REGISTER_OOVPA(IDirectSoundStream_SetHeadroom, 5849, ALIAS, DirectSound_CDirectSoundStream_SetHeadroom),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetHeadroom, 5849, PATCH),
REGISTER_OOVPA(DirectSound_CMcpxBuffer_Play2, 5849, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_Play, 5849, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_Play, 5849, PATCH),

6
src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl
View File

@ -1093,10 +1093,10 @@ OOVPATable XAPI_3911[] = {
REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH),
REGISTER_OOVPA(QueueUserAPC, 3911, PATCH),
// REGISTER_OOVPA(lstrcmpiW, 3911, PATCH),
REGISTER_OOVPA(XMountAlternateTitle, 3911, ALIAS, XMountAlternateTitleA),
REGISTER_OOVPA(XUnmountAlternateTitle, 3911, ALIAS, XUnmountAlternateTitleA),
REGISTER_OOVPA(XMountAlternateTitleA, 3911, PATCH),
REGISTER_OOVPA(XUnmountAlternateTitleA, 3911, PATCH),
REGISTER_OOVPA(XMountMUA, 3911, PATCH),
REGISTER_OOVPA(XLaunchNewImage, 3911, ALIAS, XLaunchNewImageA),
REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH),
REGISTER_OOVPA(XGetLaunchInfo, 3911, DISABLED),
REGISTER_OOVPA(XAutoPowerDownResetTimer, 3911, DISABLED), // Just calls KeSetTimer
REGISTER_OOVPA(XMountMURootA, 3911, PATCH),

2
src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl
View File

@ -236,7 +236,7 @@ OOVPATable XAPI_4134[] = {
REGISTER_OOVPA(XMountMUA, 4134, PATCH),
REGISTER_OOVPA(timeSetEvent, 4134, PATCH),
REGISTER_OOVPA(timeKillEvent, 4134, PATCH),
REGISTER_OOVPA(XLaunchNewImage, 3911, ALIAS, XLaunchNewImageA),
REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH),
REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH),
};

2
src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl
View File

@ -79,7 +79,7 @@ OOVPATable XAPI_4432[] = {
REGISTER_OOVPA(QueueUserAPC, 3911, PATCH),
REGISTER_OOVPA(timeSetEvent, 4134, PATCH),
REGISTER_OOVPA(timeKillEvent, 4134, PATCH),
REGISTER_OOVPA(XLaunchNewImage, 3911, ALIAS, XLaunchNewImageA),
REGISTER_OOVPA(XLaunchNewImageA, 3911, PATCH),
REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH),
};

10
src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl
View File

@ -431,8 +431,8 @@ OOVPATable XAPI_4627[] = {
REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED),
REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH),
REGISTER_OOVPA(GetOverlappedResult, 4627, PATCH),
REGISTER_OOVPA(XLaunchNewImage, 4627, ALIAS, XLaunchNewImageA),
REGISTER_OOVPA(XLaunchNewImage, 4928, ALIAS, XLaunchNewImageA),
REGISTER_OOVPA(XLaunchNewImageA, 4627, PATCH),
REGISTER_OOVPA(XLaunchNewImageA, 4928, PATCH),
REGISTER_OOVPA(XGetLaunchInfo, 4627, DISABLED),
REGISTER_OOVPA(XSetProcessQuantumLength, 4627, PATCH),
REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH),
@ -440,9 +440,9 @@ OOVPATable XAPI_4627[] = {
REGISTER_OOVPA(timeKillEvent, 4627, PATCH),
REGISTER_OOVPA(RaiseException, 4627, PATCH),
REGISTER_OOVPA(QueueUserAPC, 3911, PATCH),
REGISTER_OOVPA(XMountAlternateTitle, 4627, ALIAS, XMountAlternateTitleA),
REGISTER_OOVPA(XMountAlternateTitle, 4928, ALIAS, XMountAlternateTitleA),
REGISTER_OOVPA(XUnmountAlternateTitle, 4627, ALIAS, XUnmountAlternateTitleA),
REGISTER_OOVPA(XMountAlternateTitleA, 4627, PATCH),
REGISTER_OOVPA(XMountAlternateTitleA, 4928, PATCH),
REGISTER_OOVPA(XUnmountAlternateTitleA, 4627, PATCH),
REGISTER_OOVPA(XInputGetDeviceDescription, 4831, PATCH),
REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH),
// REGISTER_OOVPA(MoveFileA, 4627, PATCH),

10
src/CxbxKrnl/HLEDataBase/Xapi.1.0.5028.inl
View File

@ -68,8 +68,8 @@ OOVPATable XAPI_5028[] = {
REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED),
REGISTER_OOVPA(GetExitCodeThread, 3911, PATCH),
REGISTER_OOVPA(GetOverlappedResult, 4627, PATCH),
REGISTER_OOVPA(XLaunchNewImage, 4627, ALIAS, XLaunchNewImageA),
REGISTER_OOVPA(XLaunchNewImage, 4928, ALIAS, XLaunchNewImageA),
REGISTER_OOVPA(XLaunchNewImageA, 4627, PATCH),
REGISTER_OOVPA(XLaunchNewImageA, 4928, PATCH),
REGISTER_OOVPA(XGetLaunchInfo, 4627, DISABLED),
REGISTER_OOVPA(XSetProcessQuantumLength, 4627, PATCH),
REGISTER_OOVPA(SignalObjectAndWait, 3911, PATCH),
@ -77,9 +77,9 @@ OOVPATable XAPI_5028[] = {
REGISTER_OOVPA(timeKillEvent, 4627, PATCH),
REGISTER_OOVPA(RaiseException, 4627, PATCH),
REGISTER_OOVPA(QueueUserAPC, 3911, PATCH),
REGISTER_OOVPA(XMountAlternateTitle, 4627, ALIAS, XMountAlternateTitleA),
REGISTER_OOVPA(XMountAlternateTitle, 4928, ALIAS, XMountAlternateTitleA),
REGISTER_OOVPA(XUnmountAlternateTitle, 4627, ALIAS, XUnmountAlternateTitleA),
REGISTER_OOVPA(XMountAlternateTitleA, 4627, PATCH),
REGISTER_OOVPA(XMountAlternateTitleA, 4928, PATCH),
REGISTER_OOVPA(XUnmountAlternateTitleA, 4627, PATCH),
REGISTER_OOVPA(XInputGetDeviceDescription, 4831, PATCH),
REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH),
// REGISTER_OOVPA(MoveFileA, 4627, PATCH),

2
src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl
View File

@ -201,7 +201,7 @@ OOVPATable XAPI_5558[] = {
REGISTER_OOVPA(XInputGetState, 5558, PATCH),
REGISTER_OOVPA(XInputSetState, 5233, PATCH),
// REGISTER_OOVPA(XapiThreadStartup, 4361, PATCH), // obsolete?
REGISTER_OOVPA(XLaunchNewImage, 5558, ALIAS, XLaunchNewImageA),
REGISTER_OOVPA(XLaunchNewImageA, 5558, PATCH),
REGISTER_OOVPA(XGetLaunchInfo, 5558, DISABLED),
REGISTER_OOVPA(QueueUserAPC, 3911, PATCH),
REGISTER_OOVPA(SetThreadPriorityBoost, 4627, PATCH),

2
src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl
View File

@ -165,7 +165,7 @@ OOVPATable XAPI_5788[] = {
REGISTER_OOVPA(XMountMUA, 5558, PATCH),
REGISTER_OOVPA(GetTimeZoneInformation, 3911, DISABLED),
REGISTER_OOVPA(RaiseException, 5788, PATCH),
REGISTER_OOVPA(XLaunchNewImage, 5558, ALIAS, XLaunchNewImageA),
REGISTER_OOVPA(XLaunchNewImageA, 5558, PATCH),
REGISTER_OOVPA(XInputSetState, 5233, PATCH),
REGISTER_OOVPA(XGetDeviceEnumerationStatus, 5788, PATCH),
// REGISTER_OOVPA(SwitchToThread, 5788, PATCH),

2
src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl
View File

@ -193,7 +193,7 @@ OOVPATable XAPI_5849[] = {
REGISTER_OOVPA(timeSetEvent, 5849, PATCH),
REGISTER_OOVPA(timeKillEvent, 5849, PATCH),
REGISTER_OOVPA(RaiseException, 5849, PATCH),
REGISTER_OOVPA(XLaunchNewImage, 5558, ALIAS, XLaunchNewImageA),
REGISTER_OOVPA(XLaunchNewImageA, 5558, PATCH),
REGISTER_OOVPA(XInputSetState, 5233, PATCH),
REGISTER_OOVPA(XGetDeviceEnumerationStatus, 5849, PATCH),
// REGISTER_OOVPA(SwitchToThread, 5849, PATCH),