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 branch 'master' of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded

This commit is contained in:
Luke Usher 2017-01-20 20:58:38 +00:00
parent 321a72d2b7 59dfcd617c
commit 8d4132bec9
77 changed files with 7272 additions and 7268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1307
src/CxbxKrnl/EmuD3D8.cpp
View File

File diff suppressed because it is too large Load Diff

896
src/CxbxKrnl/EmuD3D8.h
View File

File diff suppressed because it is too large Load Diff

2
src/CxbxKrnl/EmuD3D8/Convert.cpp
View File

@ -622,7 +622,7 @@ void XTL::EmuUnswizzleRect
DWORD dwX = dwStartX;
// We use one memcpy for the entire line when pixels are next to eachother :
// TODO : How can we simplify the next check; (dwMaskX & 1) perhaps?
if (dwX + 1 == (dwX - dwMaskX) & dwMaskX) {
if (dwX + 1 == ((dwX - dwMaskX) & dwMaskX)) {
memcpy(pDstBuff, (PBYTE)pSrcBuff + (dwX | dwY | dwZ) * dwBPP, dwBPP * dwWidth); // copy one line
pDstBuff = (PBYTE)pDstBuff + dwBPP * dwWidth; // Step to next line in destination
}

2
src/CxbxKrnl/EmuD3D8/State.cpp
View File

@ -47,7 +47,7 @@ extern uint32 g_BuildVersion;
extern uint32 g_OrigBuildVersion;
// ******************************************************************
// * func: EmuUpdateDeferredStates
// * patch: UpdateDeferredStates
// ******************************************************************
void XTL::EmuUpdateDeferredStates()
{

2
src/CxbxKrnl/EmuD3D8/VertexShader.cpp
View File

@ -2134,7 +2134,7 @@ extern boolean XTL::IsValidCurrentShader(void)
DWORD Handle;
EmuIDirect3DDevice8_GetVertexShader(&Handle);
EMUPATCH(D3DDevice_GetVertexShader)(&Handle);
//printf( "VS = 0x%.08X\n", Handle );

6
src/CxbxKrnl/EmuDInput.cpp
View File

@ -46,7 +46,7 @@
static XBController g_XBController;
// ******************************************************************
// * func: XTL::EmuDInputInit
// * XTL::EmuDInputInit
// ******************************************************************
bool XTL::EmuDInputInit()
{
@ -61,7 +61,7 @@ bool XTL::EmuDInputInit()
}
// ******************************************************************
// * func: XTL::EmuDInputCleanup
// * XTL::EmuDInputCleanup
// ******************************************************************
void XTL::EmuDInputCleanup()
{
@ -69,7 +69,7 @@ void XTL::EmuDInputCleanup()
}
// ******************************************************************
// * func: XTL::EmuDInputPoll
// * XTL::EmuDInputPoll
// ******************************************************************
void XTL::EmuDInputPoll(XTL::PXINPUT_STATE Controller)
{

6
src/CxbxKrnl/EmuDInput.h
View File

@ -38,17 +38,17 @@
#include <dinput.h>
// ******************************************************************
// * func: EmuDInputInit
// * patch: DInputInit
// ******************************************************************
extern bool EmuDInputInit();
// ******************************************************************
// * func: EmuDInputCleanup
// * patch: DInputCleanup
// ******************************************************************
extern void EmuDInputCleanup();
// ******************************************************************
// * func: EmuDInputPoll
// * patch: DInputPoll
// ******************************************************************
extern void EmuDInputPoll(PXINPUT_STATE Controller);

528
src/CxbxKrnl/EmuDSound.cpp
View File

File diff suppressed because it is too large Load Diff

488
src/CxbxKrnl/EmuDSound.h
View File

File diff suppressed because it is too large Load Diff

34
src/CxbxKrnl/EmuXG.cpp
View File

@ -55,9 +55,9 @@ namespace NtDll
/* Leave unpatched
// ******************************************************************
// * func: EmuXGIsSwizzledFormat
// * patch: XGIsSwizzledFormat
// ******************************************************************
PVOID WINAPI XTL::EmuXGIsSwizzledFormat
PVOID WINAPI XTL::EMUPATCH(XGIsSwizzledFormat)
(
X_D3DFORMAT Format
)
@ -70,9 +70,9 @@ PVOID WINAPI XTL::EmuXGIsSwizzledFormat
/* Leave unpatched
// ******************************************************************
// * func: EmuXGSwizzleRect
// * patch: XGSwizzleRect
// ******************************************************************
VOID WINAPI XTL::EmuXGSwizzleRect
VOID WINAPI XTL::EMUPATCH(XGSwizzleRect)
(
LPCVOID pSource,
DWORD Pitch,
@ -130,9 +130,9 @@ VOID WINAPI XTL::EmuXGSwizzleRect
*/
// ******************************************************************
// * func: EmuXGSwizzleBox
// * patch: XGSwizzleBox
// ******************************************************************
VOID WINAPI XTL::EmuXGSwizzleBox
VOID WINAPI XTL::EMUPATCH(XGSwizzleBox)
(
LPCVOID pSource,
DWORD RowPitch,
@ -197,9 +197,9 @@ VOID WINAPI XTL::EmuXGSwizzleBox
}
// ******************************************************************
// * func: EmuXGWriteSurfaceOrTextureToXPR
// * patch: XGWriteSurfaceOrTextureToXPR
// ******************************************************************
HRESULT WINAPI XTL::EmuXGWriteSurfaceOrTextureToXPR
HRESULT WINAPI XTL::EMUPATCH(XGWriteSurfaceOrTextureToXPR)
(
LPVOID pResource,
const char* cPath,
@ -222,9 +222,9 @@ HRESULT WINAPI XTL::EmuXGWriteSurfaceOrTextureToXPR
}
// ******************************************************************
// * func: EmuXGSetTextureHeader
// * patch: XGSetTextureHeader
// ******************************************************************
VOID WINAPI XTL::EmuXGSetTextureHeader
VOID WINAPI XTL::EMUPATCH(XGSetTextureHeader)
(
UINT Width,
UINT Height,
@ -250,9 +250,9 @@ VOID WINAPI XTL::EmuXGSetTextureHeader
LOG_FUNC_END;
// NOTES: This function simply creates a texture that needs to be registered
// via D3DDevice_Register afterwards. So, do I just create the texture via
// EmuIDirect3DDevice8_CreateTexture, or just fill in the interface and let
// EmuIDirect3DDevice8_Register do the rest? Trial and error.
// via EMUPATCH(D3DDevice_Register) afterwards. So, do I just create the texture via
// EMUPATCH(D3DDevice_CreateTexture), or just fill in the interface and let
// EMUPATCH(D3DDevice_Register) do the rest? Trial and error.
X_D3DTexture* pTempTexture = NULL;
DWORD l2w = (DWORD) log( (float)Width ) / log(2.0f);
@ -267,7 +267,7 @@ VOID WINAPI XTL::EmuXGSetTextureHeader
// Generate a temporary texture and fill in the necessary fields within
// the X_D3DTexture interface (lazy, I know).
pTempTexture = (X_D3DTexture*) XTL::EmuIDirect3DDevice8_CreateTexture2(Width, Height, 0, Levels, Usage, Format,
pTempTexture = (X_D3DTexture*) XTL::EMUPATCH(D3DDevice_CreateTexture2)(Width, Height, 0, Levels, Usage, Format,
XTL::D3DRTYPE_TEXTURE);
@ -278,7 +278,7 @@ VOID WINAPI XTL::EmuXGSetTextureHeader
pTexture->Size = pTempTexture->Size;
XTL::EmuIDirect3DResource8_Release(pTempTexture);
XTL::EMUPATCH(D3DResource_Release)(pTempTexture);
// Manually fill in Format parameters
@ -300,9 +300,9 @@ VOID WINAPI XTL::EmuXGSetTextureHeader
}
// ******************************************************************
// * func: EmuXFONT_OpenBitmapFontFromMemory
// * patch: XFONT_OpenBitmapFontFromMemory
// ******************************************************************
//HRESULT WINAPI XTL::EmuXFONT_OpenBitmapFontFromMemory
//HRESULT WINAPI XTL::EMUPATCH(XFONT_OpenBitmapFontFromMemory)
//(
// CONST void *pFontData,
// unsigned uFontDataSize,

24
src/CxbxKrnl/EmuXG.h
View File

@ -44,9 +44,9 @@ XGPOINT3D;
/* Leave unpatched
// ******************************************************************
// * func: EmuXGIsSwizzledFormat
// * patch: XGIsSwizzledFormat
// ******************************************************************
PVOID WINAPI EmuXGIsSwizzledFormat
PVOID WINAPI EMUPATCH(XGIsSwizzledFormat)
(
X_D3DFORMAT Format
);
@ -54,9 +54,9 @@ PVOID WINAPI EmuXGIsSwizzledFormat
/* Leave unpatched
// ******************************************************************
// * func: EmuXGSwizzleRect
// * patch: XGSwizzleRect
// ******************************************************************
VOID WINAPI EmuXGSwizzleRect
VOID WINAPI EMUPATCH(XGSwizzleRect)
(
LPCVOID pSource,
DWORD Pitch,
@ -70,9 +70,9 @@ VOID WINAPI EmuXGSwizzleRect
*/
// ******************************************************************
// * func: EmuXGSwizzleBox
// * patch: XGSwizzleBox
// ******************************************************************
VOID WINAPI EmuXGSwizzleBox
VOID WINAPI EMUPATCH(XGSwizzleBox)
(
LPCVOID pSource,
DWORD RowPitch,
@ -87,9 +87,9 @@ VOID WINAPI EmuXGSwizzleBox
);
// ******************************************************************
// * func: EmuXGWriteSurfaceOrTextureToXPR
// * patch: XGWriteSurfaceOrTextureToXPR
// ******************************************************************
HRESULT WINAPI EmuXGWriteSurfaceOrTextureToXPR
HRESULT WINAPI EMUPATCH(XGWriteSurfaceOrTextureToXPR)
(
LPVOID pResource,
const char* cPath,
@ -97,9 +97,9 @@ HRESULT WINAPI EmuXGWriteSurfaceOrTextureToXPR
);
// ******************************************************************
// * func: EmuXGSetTextureHeader
// * patch: XGSetTextureHeader
// ******************************************************************
VOID WINAPI EmuXGSetTextureHeader
VOID WINAPI EMUPATCH(XGSetTextureHeader)
(
UINT Width,
UINT Height,
@ -113,9 +113,9 @@ VOID WINAPI EmuXGSetTextureHeader
);
// ******************************************************************
// * func: EmuXFONT_OpenBitmapFontFromMemory
// * patch: XFONT_OpenBitmapFontFromMemory
// ******************************************************************
HRESULT WINAPI EmuXFONT_OpenBitmapFontFromMemory
HRESULT WINAPI EMUPATCH(XFONT_OpenBitmapFontFromMemory)
(
CONST void *pFontData,
unsigned uFontDataSize,

4
src/CxbxKrnl/EmuXInput.cpp
View File

@ -71,9 +71,9 @@ static BOOL g_bXInputInitialized = FALSE;
// ******************************************************************
// * func: EmuXInputPCPoll
// * patch: XInputPCPoll
// ******************************************************************
/*void XTL::EmuXInputPCPoll( XTL::PXINPUT_STATE Controller )
/*void XTL::EMUPATCH(XInputPCPoll)( XTL::PXINPUT_STATE Controller )
{
//
// Get the PC's XInput values

2
src/CxbxKrnl/EmuXInput.h
View File

@ -35,7 +35,7 @@
#define EMUXINPUT_H
// ******************************************************************
// * func: EmuXInputPCPoll
// * patch: XInputPCPoll
// ******************************************************************
// void EmuXInputPCPoll( XTL::PXINPUT_STATE Controller );

46
src/CxbxKrnl/EmuXOnline.cpp
View File

@ -51,9 +51,9 @@ namespace NtDll
#include "EmuXTL.h"
// ******************************************************************
// * func: EmuWSAStartup
// * patch: WSAStartup
// ******************************************************************
int WINAPI XTL::EmuWSAStartup
int WINAPI XTL::EMUPATCH(WSAStartup)
(
WORD wVersionRequested,
WSADATA *lpWSAData
@ -70,9 +70,9 @@ int WINAPI XTL::EmuWSAStartup
}
// ******************************************************************
// * func: EmuXNetStartup
// * patch: XNetStartup
// ******************************************************************
INT WINAPI XTL::EmuXNetStartup
INT WINAPI XTL::EMUPATCH(XNetStartup)
(
const PVOID pDummy
)
@ -86,9 +86,9 @@ INT WINAPI XTL::EmuXNetStartup
}
// ******************************************************************
// * func: EmuXNetGetEthernetLinkStatus
// * patch: XNetGetEthernetLinkStatus
// ******************************************************************
DWORD WINAPI XTL::EmuXNetGetEthernetLinkStatus()
DWORD WINAPI XTL::EMUPATCH(XNetGetEthernetLinkStatus)()
{
LOG_FUNC();
@ -99,9 +99,9 @@ DWORD WINAPI XTL::EmuXNetGetEthernetLinkStatus()
}
// ******************************************************************
// * func: EmuThis::Emusocket
// * patch: This::Emusocket
// ******************************************************************
SOCKET XTL::EmuThis::Emusocket
SOCKET XTL::EmuThis::EMUPATCH(socket)
(
int af,
int type,
@ -121,9 +121,9 @@ SOCKET XTL::EmuThis::Emusocket
}
// ******************************************************************
// * func: EmuThis::Emuconnect
// * patch: This::Emuconnect
// ******************************************************************
int XTL::EmuThis::Emuconnect
int XTL::EmuThis::EMUPATCH(connect)
(
SOCKET s,
const struct sockaddr FAR *name,
@ -143,9 +143,9 @@ int XTL::EmuThis::Emuconnect
}
// ******************************************************************
// * func: EmuThis::Emusend
// * patch: This::Emusend
// ******************************************************************
int XTL::EmuThis::Emusend
int XTL::EmuThis::EMUPATCH(send)
(
SOCKET s,
const char FAR *buf,
@ -167,9 +167,9 @@ int XTL::EmuThis::Emusend
}
// ******************************************************************
// * func: EmuThis::Emurecv
// * patch: This::Emurecv
// ******************************************************************
int XTL::EmuThis::Emurecv
int XTL::EmuThis::EMUPATCH(recv)
(
SOCKET s,
char FAR *buf,
@ -191,9 +191,9 @@ int XTL::EmuThis::Emurecv
}
// ******************************************************************
// * func: EmuThis::Emubind
// * patch: This::Emubind
// ******************************************************************
int XTL::EmuThis::Emubind
int XTL::EmuThis::EMUPATCH(bind)
(
SOCKET s,
const struct sockaddr FAR *name,
@ -215,9 +215,9 @@ int XTL::EmuThis::Emubind
}
// ******************************************************************
// * func: EmuThis::Emulisten
// * patch: This::Emulisten
// ******************************************************************
int XTL::EmuThis::Emulisten
int XTL::EmuThis::EMUPATCH(listen)
(
SOCKET s,
int backlog
@ -237,9 +237,9 @@ int XTL::EmuThis::Emulisten
}
// ******************************************************************
// * func: EmuThis::Emuioctlsocket
// * patch: This::Emuioctlsocket
// ******************************************************************
int XTL::EmuThis::Emuioctlsocket
int XTL::EmuThis::EMUPATCH(ioctlsocket)
(
SOCKET s,
long cmd,
@ -259,7 +259,7 @@ int XTL::EmuThis::Emuioctlsocket
}
// ******************************************************************
// * func: EmuXOnlineLaunchNewImage
// * patch: XOnlineLaunchNewImage
// ******************************************************************
HRESULT WINAPI XOnlineLaunchNewImage
(
@ -280,9 +280,9 @@ HRESULT WINAPI XOnlineLaunchNewImage
}
// ******************************************************************
// * func: EmuXOnlineLogon
// * patch: XOnlineLogon
// ******************************************************************
HRESULT WINAPI XTL::EmuXOnlineLogon
HRESULT WINAPI XTL::EMUPATCH(XOnlineLogon)
(
VOID* pUsers,
DWORD* pdwServiceIDs,

46
src/CxbxKrnl/EmuXOnline.h
View File

@ -49,65 +49,65 @@ class EmuThis
{
public:
// ******************************************************************
// * func: Emusocket
// * patch: socket
// ******************************************************************
SOCKET Emusocket(int af, int type, int protocol);
SOCKET EMUPATCH(socket)(int af, int type, int protocol);
// ******************************************************************
// * func: EmuThis::Emuconnect
// * patch: This::Emuconnect
// ******************************************************************
int Emuconnect(SOCKET s, const struct sockaddr FAR *name, int namelen);
int EMUPATCH(connect)(SOCKET s, const struct sockaddr FAR *name, int namelen);
// ******************************************************************
// * func: EmuThis::Emusend
// * patch: This::Emusend
// ******************************************************************
int Emusend(SOCKET s, const char FAR *buf, int len, int flags);
int EMUPATCH(send)(SOCKET s, const char FAR *buf, int len, int flags);
// ******************************************************************
// * func: EmuThis::Emurecv
// * patch: This::Emurecv
// ******************************************************************
int Emurecv(SOCKET s, char FAR *buf, int len, int flags);
int EMUPATCH(recv)(SOCKET s, char FAR *buf, int len, int flags);
// ******************************************************************
// * func: Emubind
// * patch: bind
// ******************************************************************
int Emubind(SOCKET s, const struct sockaddr FAR *name, int namelen);
int EMUPATCH(bind)(SOCKET s, const struct sockaddr FAR *name, int namelen);
// ******************************************************************
// * func: Emulisten
// * patch: listen
// ******************************************************************
int Emulisten(SOCKET s, int backlog);
int EMUPATCH(listen)(SOCKET s, int backlog);
// ******************************************************************
// * func: Emuioctlsocket
// * patch: ioctlsocket
// ******************************************************************
int Emuioctlsocket(SOCKET s, long cmd, u_long FAR *argp);
int EMUPATCH(ioctlsocket)(SOCKET s, long cmd, u_long FAR *argp);
};
// ******************************************************************
// * func: EmuWSAStartup
// * patch: WSAStartup
// ******************************************************************
int WINAPI EmuWSAStartup
int WINAPI EMUPATCH(WSAStartup)
(
WORD wVersionRequested,
WSADATA *lpWSAData
);
// ******************************************************************
// * func: EmuXNetStartup
// * patch: XNetStartup
// ******************************************************************
INT WINAPI EmuXNetStartup
INT WINAPI EMUPATCH(XNetStartup)
(
const PVOID pDummy
);
// ******************************************************************
// * func: EmuXNetGetEthernetLinkStatus
// * patch: XNetGetEthernetLinkStatus
// ******************************************************************
DWORD WINAPI EmuXNetGetEthernetLinkStatus();
DWORD WINAPI EMUPATCH(XNetGetEthernetLinkStatus)();
// ******************************************************************
// * func: EmuXOnlineLaunchNewImage
// * patch: XOnlineLaunchNewImage
// ******************************************************************
HRESULT WINAPI XOnlineLaunchNewImage
(
@ -116,9 +116,9 @@ HRESULT WINAPI XOnlineLaunchNewImage
);
// ******************************************************************
// * func: EmuXOnlineLogon
// * patch: XOnlineLogon
// ******************************************************************
HRESULT WINAPI EmuXOnlineLogon
HRESULT WINAPI EMUPATCH(XOnlineLogon)
(
VOID* pUsers,
DWORD* pdwServiceIDs,

44
src/CxbxKrnl/EmuXactEng.cpp
View File

@ -63,9 +63,9 @@ namespace xboxkrnl
// ******************************************************************
// * func: EmuXACTEngineCreate
// * patch: XACTEngineCreate
// ******************************************************************
HRESULT WINAPI XTL::EmuXACTEngineCreate
HRESULT WINAPI XTL::EMUPATCH(XACTEngineCreate)
(
X_XACT_RUNTIME_PARAMETERS* pParams,
X_XACTEngine** ppEngine
@ -88,7 +88,7 @@ HRESULT WINAPI XTL::EmuXACTEngineCreate
// ******************************************************************
// * EmuXACTEngineDoWork
// ******************************************************************
void WINAPI XTL::EmuXACTEngineDoWork()
void WINAPI XTL::EMUPATCH(XACTEngineDoWork)()
{
LOG_FUNC();
@ -105,7 +105,7 @@ void WINAPI XTL::EmuXACTEngineDoWork()
// ******************************************************************
// * EmuIXACTEngine_RegisterWaveBank
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_RegisterWaveBank
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_RegisterWaveBank)
(
X_XACTEngine* pThis,
LPVOID pvData,
@ -130,7 +130,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_RegisterWaveBank
// ******************************************************************
// * EmuIXACTEngine_RegisterStreamedWaveBank
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_RegisterStreamedWaveBank
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_RegisterStreamedWaveBank)
(
X_XACTEngine* pThis,
X_XACT_WAVEBANK_STREAMING_PARAMETERS* pParams,
@ -153,7 +153,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_RegisterStreamedWaveBank
// ******************************************************************
// * EmuIXACTEngine_CreateSoundBank
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_CreateSoundBank
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_CreateSoundBank)
(
X_XACTEngine* pThis,
LPVOID pvData,
@ -178,7 +178,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_CreateSoundBank
// ******************************************************************
// * EmuIXACTEngine_DownloadEffectsImage
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_DownloadEffectsImage
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_DownloadEffectsImage)
(
X_XACTEngine* pThis,
PVOID pvData,
@ -203,7 +203,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_DownloadEffectsImage
// ******************************************************************
// * EmuIXACTEngine_CreateSoundSource
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_CreateSoundSource
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_CreateSoundSource)
(
X_XACTEngine* pThis,
DWORD dwFlags,
@ -224,7 +224,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_CreateSoundSource
// ******************************************************************
// * EmuIXACTEngine_EnableHeadphones
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_EnableHeadphones
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_EnableHeadphones)
(
X_XACTEngine* pThis,
BOOL fEnabled
@ -241,7 +241,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_EnableHeadphones
// ******************************************************************
// * EmuIXACTEngine_SetListenerOrientation
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_SetListenerOrientation
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_SetListenerOrientation)
(
X_XACTEngine* pThis,
float xFront,
@ -270,7 +270,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_SetListenerOrientation
// ******************************************************************
// * EmuIXACTEngine_SetListenerPosition
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_SetListenerPosition
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_SetListenerPosition)
(
X_XACTEngine* pThis,
float x,
@ -293,7 +293,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_SetListenerPosition
// ******************************************************************
// * EmuIXACTEngine_SetListenerVelocity
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_SetListenerVelocity
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_SetListenerVelocity)
(
X_XACTEngine* pThis,
float x,
@ -316,7 +316,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_SetListenerVelocity
// ******************************************************************
// * EmuIXACTEngine_SetMasterVolume
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_SetMasterVolume
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_SetMasterVolume)
(
X_XACTEngine* pThis,
WORD wCategory,
@ -335,7 +335,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_SetMasterVolume
// ******************************************************************
// * EmuIXACTEngine_CommitDeferredSettings
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_CommitDeferredSettings
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_CommitDeferredSettings)
(
X_XACTEngine* pThis
)
@ -348,7 +348,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_CommitDeferredSettings
// ******************************************************************
// * EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName
HRESULT WINAPI XTL::EMUPATCH(IXACTSoundBank_GetSoundCueIndexFromFriendlyName)
(
X_XACTEngine* pThis,
PCSTR pFriendlyName,
@ -367,7 +367,7 @@ HRESULT WINAPI XTL::EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName
// ******************************************************************
// * EmuIXACTSoundBank_Play
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTSoundBank_Play
HRESULT WINAPI XTL::EMUPATCH(IXACTSoundBank_Play)
(
X_XACTSoundBank* pThis,
DWORD dwSoundCueIndex,
@ -390,7 +390,7 @@ HRESULT WINAPI XTL::EmuIXACTSoundBank_Play
// ******************************************************************
// * EmuIXACTSoundBank_Stop
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTSoundBank_Stop
HRESULT WINAPI XTL::EMUPATCH(IXACTSoundBank_Stop)
(
X_XACTSoundBank* pThis,
DWORD dwSoundCueIndex,
@ -411,7 +411,7 @@ HRESULT WINAPI XTL::EmuIXACTSoundBank_Stop
// ******************************************************************
// * EmuIXACTSoundSource_SetPosition
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTSoundSource_SetPosition
HRESULT WINAPI XTL::EMUPATCH(IXACTSoundSource_SetPosition)
(
X_XACTSoundSource* pThis,
FLOAT x,
@ -434,7 +434,7 @@ HRESULT WINAPI XTL::EmuIXACTSoundSource_SetPosition
// ******************************************************************
// * EmuIXACTSoundSource_SetVelocity
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTSoundSource_SetVelocity
HRESULT WINAPI XTL::EMUPATCH(IXACTSoundSource_SetVelocity)
(
X_XACTSoundSource* pThis,
FLOAT x,
@ -457,7 +457,7 @@ HRESULT WINAPI XTL::EmuIXACTSoundSource_SetVelocity
// ******************************************************************
// * EmuIXACTEngine_RegisterNotification
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_RegisterNotification
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_RegisterNotification)
(
X_XACTEngine* pThis,
PCXACT_NOTIFICATION_DESCRIPTION pNotificationDesc
@ -474,7 +474,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_RegisterNotification
// ******************************************************************
// * EmuIXACTEngine_GetNotification
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_GetNotification
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_GetNotification)
(
X_XACTEngine* pThis,
PCXACT_NOTIFICATION_DESCRIPTION pNotificationDesc,
@ -496,7 +496,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_GetNotification
// ******************************************************************
// * EmuIXACTEngine_UnRegisterWaveBank
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_UnRegisterWaveBank
HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_UnRegisterWaveBank)
(
X_XACTEngine* pThis,
X_XACTWaveBank* pWaveBank

42
src/CxbxKrnl/EmuXactEng.h
View File

@ -143,17 +143,17 @@ struct X_XACTSoundCue
// ******************************************************************
// * EmuXACTEngineCreate
// ******************************************************************
HRESULT WINAPI EmuXACTEngineCreate( X_XACT_RUNTIME_PARAMETERS* pParams, X_XACTEngine** ppEngine );
HRESULT WINAPI EMUPATCH(XACTEngineCreate)( X_XACT_RUNTIME_PARAMETERS* pParams, X_XACTEngine** ppEngine );
// ******************************************************************
// * EmuXACTEngineDoWork
// ******************************************************************
void WINAPI EmuXACTEngineDoWork();
void WINAPI EMUPATCH(XACTEngineDoWork)();
// ******************************************************************
// * EmuIXACTEngine_RegisterWaveBank
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_RegisterWaveBank
HRESULT WINAPI EMUPATCH(IXACTEngine_RegisterWaveBank)
(
X_XACTEngine* pThis,
LPVOID pvData,
@ -164,7 +164,7 @@ HRESULT WINAPI EmuIXACTEngine_RegisterWaveBank
// ******************************************************************
// * EmuIXACTEngine_RegisterStreamedWaveBank
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_RegisterStreamedWaveBank
HRESULT WINAPI EMUPATCH(IXACTEngine_RegisterStreamedWaveBank)
(
X_XACTEngine* pThis,
X_XACT_WAVEBANK_STREAMING_PARAMETERS* pParams,
@ -174,7 +174,7 @@ HRESULT WINAPI EmuIXACTEngine_RegisterStreamedWaveBank
// ******************************************************************
// * EmuIXACTEngine_CreateSoundBank
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_CreateSoundBank
HRESULT WINAPI EMUPATCH(IXACTEngine_CreateSoundBank)
(
X_XACTEngine* pThis,
LPVOID pvData,
@ -185,7 +185,7 @@ HRESULT WINAPI EmuIXACTEngine_CreateSoundBank
// ******************************************************************
// * EmuIXACTEngine_DownloadEffectsImage
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_DownloadEffectsImage
HRESULT WINAPI EMUPATCH(IXACTEngine_DownloadEffectsImage)
(
X_XACTEngine* pThis,
PVOID pvData,
@ -197,7 +197,7 @@ HRESULT WINAPI EmuIXACTEngine_DownloadEffectsImage
// ******************************************************************
// * EmuIXACTEngine_CreateSoundSource
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_CreateSoundSource
HRESULT WINAPI EMUPATCH(IXACTEngine_CreateSoundSource)
(
X_XACTEngine* pThis,
DWORD dwFlags,
@ -207,7 +207,7 @@ HRESULT WINAPI EmuIXACTEngine_CreateSoundSource
// ******************************************************************
// * EmuIXACTEngine_EnableHeadphones
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_EnableHeadphones
HRESULT WINAPI EMUPATCH(IXACTEngine_EnableHeadphones)
(
X_XACTEngine* pThis,
BOOL fEnabled
@ -216,7 +216,7 @@ HRESULT WINAPI EmuIXACTEngine_EnableHeadphones
// ******************************************************************
// * EmuIXACTEngine_SetListenerOrientation
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_SetListenerOrientation
HRESULT WINAPI EMUPATCH(IXACTEngine_SetListenerOrientation)
(
X_XACTEngine* pThis,
float xFront,
@ -231,7 +231,7 @@ HRESULT WINAPI EmuIXACTEngine_SetListenerOrientation
// ******************************************************************
// * EmuIXACTEngine_SetListenerPosition
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_SetListenerPosition
HRESULT WINAPI EMUPATCH(IXACTEngine_SetListenerPosition)
(
X_XACTEngine* pThis,
float x,
@ -243,7 +243,7 @@ HRESULT WINAPI EmuIXACTEngine_SetListenerPosition
// ******************************************************************
// * EmuIXACTEngine_SetListenerVelocity
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_SetListenerVelocity
HRESULT WINAPI EMUPATCH(IXACTEngine_SetListenerVelocity)
(
X_XACTEngine* pThis,
float x,
@ -255,7 +255,7 @@ HRESULT WINAPI EmuIXACTEngine_SetListenerVelocity
// ******************************************************************
// * EmuIXACTEngine_SetMasterVolume
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_SetMasterVolume
HRESULT WINAPI EMUPATCH(IXACTEngine_SetMasterVolume)
(
X_XACTEngine* pThis,
WORD wCategory,
@ -265,12 +265,12 @@ HRESULT WINAPI EmuIXACTEngine_SetMasterVolume
// ******************************************************************
// * EmuIXACTEngine_CommitDeferredSettings
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_CommitDeferredSettings(X_XACTEngine* pThis);
HRESULT WINAPI EMUPATCH(IXACTEngine_CommitDeferredSettings)(X_XACTEngine* pThis);
// ******************************************************************
// * EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName
// ******************************************************************
HRESULT WINAPI EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName
HRESULT WINAPI EMUPATCH(IXACTSoundBank_GetSoundCueIndexFromFriendlyName)
(
X_XACTEngine* pThis,
PCSTR pFriendlyName,
@ -280,7 +280,7 @@ HRESULT WINAPI EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName
// ******************************************************************
// * EmuIXACTSoundBank_Play
// ******************************************************************
HRESULT WINAPI EmuIXACTSoundBank_Play
HRESULT WINAPI EMUPATCH(IXACTSoundBank_Play)
(
X_XACTSoundBank* pThis,
DWORD dwSoundCueIndex,
@ -292,7 +292,7 @@ HRESULT WINAPI EmuIXACTSoundBank_Play
// ******************************************************************
// * EmuIXACTSoundBank_Stop
// ******************************************************************
HRESULT WINAPI EmuIXACTSoundBank_Stop
HRESULT WINAPI EMUPATCH(IXACTSoundBank_Stop)
(
X_XACTSoundBank* pThis,
DWORD dwSoundCueIndex,
@ -303,7 +303,7 @@ HRESULT WINAPI EmuIXACTSoundBank_Stop
// ******************************************************************
// * EmuIXACTSoundSource_SetPosition
// ******************************************************************
HRESULT WINAPI EmuIXACTSoundSource_SetPosition
HRESULT WINAPI EMUPATCH(IXACTSoundSource_SetPosition)
(
X_XACTSoundSource* pThis,
FLOAT x,
@ -315,7 +315,7 @@ HRESULT WINAPI EmuIXACTSoundSource_SetPosition
// ******************************************************************
// * EmuIXACTSoundSource_SetVelocity
// ******************************************************************
HRESULT WINAPI EmuIXACTSoundSource_SetVelocity
HRESULT WINAPI EMUPATCH(IXACTSoundSource_SetVelocity)
(
X_XACTSoundSource* pThis,
FLOAT x,
@ -327,7 +327,7 @@ HRESULT WINAPI EmuIXACTSoundSource_SetVelocity
// ******************************************************************
// * EmuIXACTEngine_RegisterNotification
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_RegisterNotification
HRESULT WINAPI EMUPATCH(IXACTEngine_RegisterNotification)
(
X_XACTEngine* pThis,
PCXACT_NOTIFICATION_DESCRIPTION pNotificationDesc
@ -336,7 +336,7 @@ HRESULT WINAPI EmuIXACTEngine_RegisterNotification
// ******************************************************************
// * EmuIXACTEngine_GetNotification
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_GetNotification
HRESULT WINAPI EMUPATCH(IXACTEngine_GetNotification)
(
X_XACTEngine* pThis,
PCXACT_NOTIFICATION_DESCRIPTION pNotificationDesc,
@ -346,7 +346,7 @@ HRESULT WINAPI EmuIXACTEngine_GetNotification
// ******************************************************************
// * EmuIXACTEngine_UnRegisterWaveBank
// ******************************************************************
HRESULT WINAPI EmuIXACTEngine_UnRegisterWaveBank
HRESULT WINAPI EMUPATCH(IXACTEngine_UnRegisterWaveBank)
(
X_XACTEngine* pThis,
X_XACTWaveBank* pWaveBank

158
src/CxbxKrnl/EmuXapi.cpp
View File

@ -94,9 +94,9 @@ int g_FiberCount = 0;
// ******************************************************************
// * func: EmuXFormatUtilityDrive
// * patch: XFormatUtilityDrive
// ******************************************************************
BOOL WINAPI XTL::EmuXFormatUtilityDrive()
BOOL WINAPI XTL::EMUPATCH(XFormatUtilityDrive)()
{
LOG_FUNC();
@ -106,9 +106,9 @@ BOOL WINAPI XTL::EmuXFormatUtilityDrive()
}
// ******************************************************************
// * func: EmuGetTimeZoneInformation
// * patch: GetTimeZoneInformation
// ******************************************************************
DWORD WINAPI XTL::EmuGetTimeZoneInformation
DWORD WINAPI XTL::EMUPATCH(GetTimeZoneInformation)
(
OUT LPTIME_ZONE_INFORMATION lpTimeZoneInformation
)
@ -121,9 +121,9 @@ DWORD WINAPI XTL::EmuGetTimeZoneInformation
}
// ******************************************************************
// * func: EmuXMountUtilityDrive
// * patch: XMountUtilityDrive
// ******************************************************************
BOOL WINAPI XTL::EmuXMountUtilityDrive
BOOL WINAPI XTL::EMUPATCH(XMountUtilityDrive)
(
BOOL fFormatClean
)
@ -136,9 +136,9 @@ BOOL WINAPI XTL::EmuXMountUtilityDrive
}
// ******************************************************************
// * func: EmuXInitDevices
// * patch: XInitDevices
// ******************************************************************
VOID WINAPI XTL::EmuXInitDevices
VOID WINAPI XTL::EMUPATCH(XInitDevices)
(
DWORD dwPreallocTypeCount,
PXDEVICE_PREALLOC_TYPE PreallocTypes
@ -173,9 +173,9 @@ VOID WINAPI XTL::EmuXInitDevices
}
// ******************************************************************
// * func: EmuXGetDevices
// * patch: XGetDevices
// ******************************************************************
DWORD WINAPI XTL::EmuXGetDevices
DWORD WINAPI XTL::EMUPATCH(XGetDevices)
(
PXPP_DEVICE_TYPE DeviceType
)
@ -193,9 +193,9 @@ DWORD WINAPI XTL::EmuXGetDevices
}
// ******************************************************************
// * func: EmuXGetDeviceChanges
// * patch: XGetDeviceChanges
// ******************************************************************
BOOL WINAPI XTL::EmuXGetDeviceChanges
BOOL WINAPI XTL::EMUPATCH(XGetDeviceChanges)
(
PXPP_DEVICE_TYPE DeviceType,
PDWORD pdwInsertions,
@ -237,9 +237,9 @@ BOOL WINAPI XTL::EmuXGetDeviceChanges
}
// ******************************************************************
// * func: EmuXInputOpen
// * patch: XInputOpen
// ******************************************************************
HANDLE WINAPI XTL::EmuXInputOpen
HANDLE WINAPI XTL::EMUPATCH(XInputOpen)
(
IN PXPP_DEVICE_TYPE DeviceType,
IN DWORD dwPort,
@ -308,9 +308,9 @@ HANDLE WINAPI XTL::EmuXInputOpen
}
// ******************************************************************
// * func: EmuXInputClose
// * patch: XInputClose
// ******************************************************************
VOID WINAPI XTL::EmuXInputClose
VOID WINAPI XTL::EMUPATCH(XInputClose)
(
IN HANDLE hDevice
)
@ -346,9 +346,9 @@ VOID WINAPI XTL::EmuXInputClose
}
// ******************************************************************
// * func: EmuXInputPoll
// * patch: XInputPoll
// ******************************************************************
DWORD WINAPI XTL::EmuXInputPoll
DWORD WINAPI XTL::EMUPATCH(XInputPoll)
(
IN HANDLE hDevice
)
@ -398,9 +398,9 @@ DWORD WINAPI XTL::EmuXInputPoll
}
// ******************************************************************
// * func: EmuXInputGetCapabilities
// * patch: XInputGetCapabilities
// ******************************************************************
DWORD WINAPI XTL::EmuXInputGetCapabilities
DWORD WINAPI XTL::EMUPATCH(XInputGetCapabilities)
(
IN HANDLE hDevice,
OUT PXINPUT_CAPABILITIES pCapabilities
@ -433,9 +433,9 @@ DWORD WINAPI XTL::EmuXInputGetCapabilities
}
// ******************************************************************
// * func: EmuInputGetState
// * patch: InputGetState
// ******************************************************************
DWORD WINAPI XTL::EmuXInputGetState
DWORD WINAPI XTL::EMUPATCH(XInputGetState)
(
IN HANDLE hDevice,
OUT PXINPUT_STATE pState
@ -485,9 +485,9 @@ DWORD WINAPI XTL::EmuXInputGetState
}
// ******************************************************************
// * func: EmuInputSetState
// * patch: InputSetState
// ******************************************************************
DWORD WINAPI XTL::EmuXInputSetState
DWORD WINAPI XTL::EMUPATCH(XInputSetState)
(
IN HANDLE hDevice,
IN OUT PXINPUT_FEEDBACK pFeedback
@ -562,9 +562,9 @@ DWORD WINAPI XTL::EmuXInputSetState
// ******************************************************************
// * func: EmuSetThreadPriorityBoost
// * patch: SetThreadPriorityBoost
// ******************************************************************
BOOL WINAPI XTL::EmuSetThreadPriorityBoost
BOOL WINAPI XTL::EMUPATCH(SetThreadPriorityBoost)
(
HANDLE hThread,
BOOL DisablePriorityBoost
@ -584,9 +584,9 @@ BOOL WINAPI XTL::EmuSetThreadPriorityBoost
}
// ******************************************************************
// * func: EmuSetThreadPriority
// * patch: SetThreadPriority
// ******************************************************************
BOOL WINAPI XTL::EmuSetThreadPriority
BOOL WINAPI XTL::EMUPATCH(SetThreadPriority)
(
HANDLE hThread,
int nPriority
@ -607,9 +607,9 @@ BOOL WINAPI XTL::EmuSetThreadPriority
// ******************************************************************
// * func: EmuGetThreadPriority
// * patch: GetThreadPriority
// ******************************************************************
int WINAPI XTL::EmuGetThreadPriority
int WINAPI XTL::EMUPATCH(GetThreadPriority)
(
HANDLE hThread
)
@ -625,9 +625,9 @@ int WINAPI XTL::EmuGetThreadPriority
}
// ******************************************************************
// * func: EmuGetExitCodeThread
// * patch: GetExitCodeThread
// ******************************************************************
BOOL WINAPI XTL::EmuGetExitCodeThread
BOOL WINAPI XTL::EMUPATCH(GetExitCodeThread)
(
HANDLE hThread,
LPDWORD lpExitCode
@ -644,9 +644,9 @@ BOOL WINAPI XTL::EmuGetExitCodeThread
}
// ******************************************************************
// * func: EmuXapiThreadStartup
// * patch: XapiThreadStartup
// ******************************************************************
VOID WINAPI XTL::EmuXapiThreadStartup
VOID WINAPI XTL::EMUPATCH(XapiThreadStartup)
(
DWORD dwDummy1,
DWORD dwDummy2
@ -677,9 +677,9 @@ VOID WINAPI XTL::EmuXapiThreadStartup
}
// ******************************************************************
// * func: EmuXRegisterThreadNotifyRoutine
// * patch: XRegisterThreadNotifyRoutine
// ******************************************************************
VOID WINAPI XTL::EmuXRegisterThreadNotifyRoutine
VOID WINAPI XTL::EMUPATCH(XRegisterThreadNotifyRoutine)
(
PXTHREAD_NOTIFICATION pThreadNotification,
BOOL fRegister
@ -726,9 +726,9 @@ VOID WINAPI XTL::EmuXRegisterThreadNotifyRoutine
}
// ******************************************************************
// * func: EmuCreateFiber
// * patch: CreateFiber
// ******************************************************************
LPVOID WINAPI XTL::EmuCreateFiber
LPVOID WINAPI XTL::EMUPATCH(CreateFiber)
(
DWORD dwStackSize,
LPFIBER_START_ROUTINE lpStartRoutine,
@ -759,9 +759,9 @@ LPVOID WINAPI XTL::EmuCreateFiber
}
// ******************************************************************
// * func: EmuDeleteFiber
// * patch: DeleteFiber
// ******************************************************************
VOID WINAPI XTL::EmuDeleteFiber
VOID WINAPI XTL::EMUPATCH(DeleteFiber)
(
LPVOID lpFiber
)
@ -778,9 +778,9 @@ VOID WINAPI XTL::EmuDeleteFiber
}
// ******************************************************************
// * func: EmuSwitchToFiber
// * patch: SwitchToFiber
// ******************************************************************
VOID WINAPI XTL::EmuSwitchToFiber
VOID WINAPI XTL::EMUPATCH(SwitchToFiber)
(
LPVOID lpFiber
)
@ -809,9 +809,9 @@ VOID WINAPI XTL::EmuSwitchToFiber
}
// ******************************************************************
// * func: EmuConvertThreadToFiber
// * patch: ConvertThreadToFiber
// ******************************************************************
LPVOID WINAPI XTL::EmuConvertThreadToFiber
LPVOID WINAPI XTL::EMUPATCH(ConvertThreadToFiber)
(
LPVOID lpParameter
)
@ -831,9 +831,9 @@ LPVOID WINAPI XTL::EmuConvertThreadToFiber
}
// ******************************************************************
// * func: EmuXapiFiberStartup
// * patch: XapiFiberStartup
// ******************************************************************
VOID WINAPI XTL::EmuXapiFiberStartup(DWORD dwDummy)
VOID WINAPI XTL::EMUPATCH(XapiFiberStartup)(DWORD dwDummy)
{
DbgPrintf("EmuXapi: EmuXapiFiberStarup()\n"
@ -861,9 +861,9 @@ VOID WINAPI XTL::EmuXapiFiberStartup(DWORD dwDummy)
}
// ******************************************************************
// * func: EmuQueueUserAPC
// * patch: QueueUserAPC
// ******************************************************************
DWORD WINAPI XTL::EmuQueueUserAPC
DWORD WINAPI XTL::EMUPATCH(QueueUserAPC)
(
PAPCFUNC pfnAPC,
HANDLE hThread,
@ -893,9 +893,9 @@ DWORD WINAPI XTL::EmuQueueUserAPC
}
// ******************************************************************
// * func: EmuGetOverlappedResult
// * patch: GetOverlappedResult
// ******************************************************************
BOOL WINAPI XTL::EmuGetOverlappedResult
BOOL WINAPI XTL::EMUPATCH(GetOverlappedResult)
(
HANDLE hFile,
LPOVERLAPPED lpOverlapped,
@ -919,9 +919,9 @@ BOOL WINAPI XTL::EmuGetOverlappedResult
}
// ******************************************************************
// * func: EmuXLaunchNewImage
// * patch: XLaunchNewImage
// ******************************************************************
DWORD WINAPI XTL::EmuXLaunchNewImage
DWORD WINAPI XTL::EMUPATCH(XLaunchNewImage)
(
LPCSTR lpTitlePath,
PLAUNCH_DATA pLaunchData
@ -945,7 +945,7 @@ DWORD WINAPI XTL::EmuXLaunchNewImage
if (PathFileExists(szDashboardPath))
{
MessageBox(CxbxKrnl_hEmuParent, "The title is rebooting to dashboard", "Cxbx-Reloaded", 0);
EmuXLaunchNewImage("C:\\xboxdash.xbe", pLaunchData);
EMUPATCH(XLaunchNewImage)("C:\\xboxdash.xbe", pLaunchData);
}
CxbxKrnlCleanup("The xbe rebooted to Dashboard and xboxdash.xbe could not be found");
@ -999,9 +999,9 @@ DWORD WINAPI XTL::EmuXLaunchNewImage
}
// ******************************************************************
// * func: EmuXGetLaunchInfo
// * patch: XGetLaunchInfo
// ******************************************************************
DWORD WINAPI XTL::EmuXGetLaunchInfo
DWORD WINAPI XTL::EMUPATCH(XGetLaunchInfo)
(
PDWORD pdwLaunchDataType,
PLAUNCH_DATA pLaunchData
@ -1063,9 +1063,9 @@ DWORD WINAPI XTL::EmuXGetLaunchInfo
}
// ******************************************************************
// * func: EmuXSetProcessQuantumLength
// * patch: XSetProcessQuantumLength
// ******************************************************************
VOID WINAPI XTL::EmuXSetProcessQuantumLength
VOID WINAPI XTL::EMUPATCH(XSetProcessQuantumLength)
(
DWORD dwMilliseconds
)
@ -1077,9 +1077,9 @@ VOID WINAPI XTL::EmuXSetProcessQuantumLength
}
// ******************************************************************
// * func: EmuSignalObjectAndWait
// * patch: SignalObjectAndWait
// ******************************************************************
DWORD WINAPI XTL::EmuSignalObjectAndWait
DWORD WINAPI XTL::EMUPATCH(SignalObjectAndWait)
(
HANDLE hObjectToSignal,
HANDLE hObjectToWaitOn,
@ -1100,9 +1100,9 @@ DWORD WINAPI XTL::EmuSignalObjectAndWait
}
// ******************************************************************
// * func: timeSetEvent
// * patch: timeSetEvent
// ******************************************************************
MMRESULT WINAPI XTL::EmutimeSetEvent
MMRESULT WINAPI XTL::EMUPATCH(timeSetEvent)
(
UINT uDelay,
UINT uResolution,
@ -1125,9 +1125,9 @@ MMRESULT WINAPI XTL::EmutimeSetEvent
}
// ******************************************************************
// * func: timeKillEvent
// * patch: timeKillEvent
// ******************************************************************
MMRESULT WINAPI XTL::EmutimeKillEvent
MMRESULT WINAPI XTL::EMUPATCH(timeKillEvent)
(
UINT uTimerID
)
@ -1140,9 +1140,9 @@ MMRESULT WINAPI XTL::EmutimeKillEvent
}
// ******************************************************************
// * func: EmuRaiseException
// * patch: RaiseException
// ******************************************************************
VOID WINAPI XTL::EmuRaiseException
VOID WINAPI XTL::EMUPATCH(RaiseException)
(
DWORD dwExceptionCode, // exception code
DWORD dwExceptionFlags, // continuable exception flag
@ -1164,9 +1164,9 @@ VOID WINAPI XTL::EmuRaiseException
}
// ******************************************************************
// func: XMountMUA
// patch: XMountMUA
// ******************************************************************
DWORD WINAPI XTL::EmuXMountMUA
DWORD WINAPI XTL::EMUPATCH(XMountMUA)
(
DWORD dwPort,
DWORD dwSlot,
@ -1186,9 +1186,9 @@ DWORD WINAPI XTL::EmuXMountMUA
}
// ******************************************************************
// * func: EmuXMountAlternateTitle
// * patch: XMountAlternateTitle
// ******************************************************************
DWORD WINAPI XTL::EmuXMountAlternateTitle
DWORD WINAPI XTL::EMUPATCH(XMountAlternateTitle)
(
LPCSTR lpRootPath,
DWORD dwAltTitleId,
@ -1208,9 +1208,9 @@ DWORD WINAPI XTL::EmuXMountAlternateTitle
}
// ******************************************************************
// * func: EmuXUnmountAlternateTitle
// * patch: XUnmountAlternateTitle
// ******************************************************************
DWORD WINAPI XTL::EmuXUnmountAlternateTitle
DWORD WINAPI XTL::EMUPATCH(XUnmountAlternateTitle)
(
CHAR chDrive
)
@ -1223,9 +1223,9 @@ DWORD WINAPI XTL::EmuXUnmountAlternateTitle
}
// ******************************************************************
// * func: EmuXGetDeviceEnumerationStatus
// * patch: XGetDeviceEnumerationStatus
// ******************************************************************
DWORD WINAPI XTL::EmuXGetDeviceEnumerationStatus()
DWORD WINAPI XTL::EMUPATCH(XGetDeviceEnumerationStatus)()
{
LOG_FUNC();
@ -1235,9 +1235,9 @@ DWORD WINAPI XTL::EmuXGetDeviceEnumerationStatus()
}
// ******************************************************************
// * func: EmuXInputGetDeviceDescription
// * patch: XInputGetDeviceDescription
// ******************************************************************
DWORD WINAPI XTL::EmuXInputGetDeviceDescription
DWORD WINAPI XTL::EMUPATCH(XInputGetDeviceDescription)
(
HANDLE hDevice,
PVOID pDescription
@ -1255,9 +1255,9 @@ DWORD WINAPI XTL::EmuXInputGetDeviceDescription
}
// ******************************************************************
// * func: EmuXAutoPowerDownResetTimer
// * patch: XAutoPowerDownResetTimer
// ******************************************************************
int WINAPI XTL::EmuXAutoPowerDownResetTimer()
int WINAPI XTL::EMUPATCH(XAutoPowerDownResetTimer)()
{
LOG_FUNC();
@ -1268,9 +1268,9 @@ int WINAPI XTL::EmuXAutoPowerDownResetTimer()
}
// ******************************************************************
// * func: EmuXMountMURootA
// * patch: XMountMURootA
// ******************************************************************
DWORD WINAPI XTL::EmuXMountMURootA
DWORD WINAPI XTL::EMUPATCH(XMountMURootA)
(
DWORD dwPort,
DWORD dwSlot,

207
src/CxbxKrnl/EmuXapi.h
View File

@ -313,47 +313,52 @@ LAUNCH_DATA, *PLAUNCH_DATA;
#define XDEVICE_ENUMERATION_BUSY 1
// ******************************************************************
// * func: EmuXFormatUtilityDrive
// * macro: EMUPATCH - marker on patches on original Xbox functions
// ******************************************************************
BOOL WINAPI EmuXFormatUtilityDrive();
#define EMUPATCH(Name) EmuPatch_##Name
// ******************************************************************
// * func: EmuGetTimeZoneInformation
// * patch: XFormatUtilityDrive
// ******************************************************************
DWORD WINAPI EmuGetTimeZoneInformation
BOOL WINAPI EMUPATCH(XFormatUtilityDrive)();
// ******************************************************************
// * patch: GetTimeZoneInformation
// ******************************************************************
DWORD WINAPI EMUPATCH(GetTimeZoneInformation)
(
OUT LPTIME_ZONE_INFORMATION lpTimeZoneInformation
);
// ******************************************************************
// * func: EmuXMountUtilityDrive
// * patch: XMountUtilityDrive
// ******************************************************************
BOOL WINAPI EmuXMountUtilityDrive
BOOL WINAPI EMUPATCH(XMountUtilityDrive)
(
BOOL fFormatClean
);
// ******************************************************************
// * func: EmuXInitDevices
// * patch: XInitDevices
// ******************************************************************
VOID WINAPI EmuXInitDevices
VOID WINAPI EMUPATCH(XInitDevices)
(
DWORD dwPreallocTypeCount,
PXDEVICE_PREALLOC_TYPE PreallocTypes
);
// ******************************************************************
// * func: EmuXGetDevices
// * patch: XGetDevices
// ******************************************************************
DWORD WINAPI EmuXGetDevices
DWORD WINAPI EMUPATCH(XGetDevices)
(
XPP_DEVICE_TYPE *DeviceType
);
// ******************************************************************
// * func: EmuXGetDeviceChanges
// * patch: XGetDeviceChanges
// ******************************************************************
BOOL WINAPI EmuXGetDeviceChanges
BOOL WINAPI EMUPATCH(XGetDeviceChanges)
(
PXPP_DEVICE_TYPE DeviceType,
PDWORD pdwInsertions,
@ -361,9 +366,9 @@ BOOL WINAPI EmuXGetDeviceChanges
);
// ******************************************************************
// * func: EmuXInputOpen
// * patch: XInputOpen
// ******************************************************************
HANDLE WINAPI EmuXInputOpen
HANDLE WINAPI EMUPATCH(XInputOpen)
(
IN PXPP_DEVICE_TYPE DeviceType,
IN DWORD dwPort,
@ -372,43 +377,43 @@ HANDLE WINAPI EmuXInputOpen
);
// ******************************************************************
// * func: EmuXInputClose
// * patch: XInputClose
// ******************************************************************
VOID WINAPI EmuXInputClose
VOID WINAPI EMUPATCH(XInputClose)
(
IN HANDLE hDevice
);
// ******************************************************************
// * func: EmuXInputPoll
// * patch: XInputPoll
// ******************************************************************
DWORD WINAPI EmuXInputPoll
DWORD WINAPI EMUPATCH(XInputPoll)
(
IN HANDLE Device
);
// ******************************************************************
// * func: EmuXInputGetCapabilities
// * patch: XInputGetCapabilities
// ******************************************************************
DWORD WINAPI EmuXInputGetCapabilities
DWORD WINAPI EMUPATCH(XInputGetCapabilities)
(
IN HANDLE hDevice,
OUT PXINPUT_CAPABILITIES pCapabilities
);
// ******************************************************************
// * func: EmuXInputGetState
// * patch: XInputGetState
// ******************************************************************
DWORD WINAPI EmuXInputGetState
DWORD WINAPI EMUPATCH(XInputGetState)
(
IN HANDLE hDevice,
OUT PXINPUT_STATE pState
);
// ******************************************************************
// * func: EmuXInputSetState
// * patch: XInputSetState
// ******************************************************************
DWORD WINAPI EmuXInputSetState
DWORD WINAPI EMUPATCH(XInputSetState)
(
IN HANDLE hDevice,
IN OUT PXINPUT_FEEDBACK pFeedback
@ -416,9 +421,9 @@ DWORD WINAPI EmuXInputSetState
// ******************************************************************
// * func: EmuCreateMutex
// * patch: CreateMutex
// ******************************************************************
HANDLE WINAPI EmuCreateMutex
HANDLE WINAPI EMUPATCH(CreateMutex)
(
LPSECURITY_ATTRIBUTES lpMutexAttributes,
BOOL bInitialOwner,
@ -426,52 +431,52 @@ HANDLE WINAPI EmuCreateMutex
);
// ******************************************************************
// * func: EmuCloseHandle
// * patch: CloseHandle
// ******************************************************************
BOOL WINAPI EmuCloseHandle
BOOL WINAPI EMUPATCH(CloseHandle)
(
HANDLE hObject
);
// ******************************************************************
// * func: EmuSetThreadPriority
// * patch: SetThreadPriority
// ******************************************************************
BOOL WINAPI EmuSetThreadPriority
BOOL WINAPI EMUPATCH(SetThreadPriority)
(
HANDLE hThread,
int nPriority
);
// ******************************************************************
// * func: EmuGetThreadPriority
// * patch: GetThreadPriority
// ******************************************************************
int WINAPI EmuGetThreadPriority
int WINAPI EMUPATCH(GetThreadPriority)
(
HANDLE hThread
);
// ******************************************************************
// * func: EmuSetThreadPriorityBoost
// * patch: SetThreadPriorityBoost
// ******************************************************************
BOOL WINAPI EmuSetThreadPriorityBoost
BOOL WINAPI EMUPATCH(SetThreadPriorityBoost)
(
HANDLE hThread,
BOOL DisablePriorityBoost
);
// ******************************************************************
// * func: EmuGetExitCodeThread
// * patch: GetExitCodeThread
// ******************************************************************
BOOL WINAPI EmuGetExitCodeThread
BOOL WINAPI EMUPATCH(GetExitCodeThread)
(
HANDLE hThread,
LPDWORD lpExitCode
);
// ******************************************************************
// * func: EmuXapiThreadStartup
// * patch: XapiThreadStartup
// ******************************************************************
VOID WINAPI EmuXapiThreadStartup
VOID WINAPI EMUPATCH(XapiThreadStartup)
(
DWORD dwDummy1,
DWORD dwDummy2
@ -479,24 +484,24 @@ VOID WINAPI EmuXapiThreadStartup
/* Too High Level!
// ******************************************************************
// * func: XapiSetupPerTitleDriveLetters
// * patch: XapiSetupPerTitleDriveLetters
// ******************************************************************
NTSTATUS CDECL XapiSetupPerTitleDriveLetters(DWORD dwTitleId, LPCWSTR wszTitleName);
*/
// ******************************************************************
// * func: EmuXRegisterThreadNotifyRoutine
// * patch: XRegisterThreadNotifyRoutine
// ******************************************************************
VOID WINAPI EmuXRegisterThreadNotifyRoutine
VOID WINAPI EMUPATCH(XRegisterThreadNotifyRoutine)
(
PXTHREAD_NOTIFICATION pThreadNotification,
BOOL fRegister
);
// ******************************************************************
// * func: EmuCreateFiber
// * patch: CreateFiber
// ******************************************************************
LPVOID WINAPI EmuCreateFiber
LPVOID WINAPI EMUPATCH(CreateFiber)
(
DWORD dwStackSize,
LPFIBER_START_ROUTINE lpStartRoutine,
@ -504,38 +509,38 @@ LPVOID WINAPI EmuCreateFiber
);
// ******************************************************************
// * func: EmuDeleteFiber
// * patch: DeleteFiber
// ******************************************************************
VOID WINAPI EmuDeleteFiber
VOID WINAPI EMUPATCH(DeleteFiber)
(
LPVOID lpFiber
);
// ******************************************************************
// * func: EmuSwitchToFiber
// * patch: SwitchToFiber
// ******************************************************************
VOID WINAPI EmuSwitchToFiber
VOID WINAPI EMUPATCH(SwitchToFiber)
(
LPVOID lpFiber
);
// ******************************************************************
// * func: EmuConvertThreadToFiber
// * patch: ConvertThreadToFiber
// ******************************************************************
LPVOID WINAPI EmuConvertThreadToFiber
LPVOID WINAPI EMUPATCH(ConvertThreadToFiber)
(
LPVOID lpParameter
);
// ******************************************************************
// * func: EmuXapiFiberStartup
// * patch: XapiFiberStartup
// ******************************************************************
VOID WINAPI EmuXapiFiberStartup(DWORD dwDummy);
VOID WINAPI EMUPATCH(XapiFiberStartup)(DWORD dwDummy);
// ******************************************************************
// * func: EmuQueueUserAPC
// * patch: QueueUserAPC
// ******************************************************************
DWORD WINAPI EmuQueueUserAPC
DWORD WINAPI EMUPATCH(QueueUserAPC)
(
PAPCFUNC pfnAPC,
HANDLE hThread,
@ -543,9 +548,9 @@ DWORD WINAPI EmuQueueUserAPC
);
// ******************************************************************
// * func: EmuGetOverlappedResult
// * patch: GetOverlappedResult
// ******************************************************************
BOOL WINAPI EmuGetOverlappedResult
BOOL WINAPI EMUPATCH(GetOverlappedResult)
(
HANDLE hFile,
LPOVERLAPPED lpOverlapped,
@ -554,35 +559,35 @@ BOOL WINAPI EmuGetOverlappedResult
);
// ******************************************************************
// * func: EmuXLaunchNewImage
// * patch: XLaunchNewImage
// ******************************************************************
DWORD WINAPI EmuXLaunchNewImage
DWORD WINAPI EMUPATCH(XLaunchNewImage)
(
LPCSTR lpTitlePath,
PLAUNCH_DATA pLaunchData
);
// ******************************************************************
// * func: EmuXGetLaunchInfo
// * patch: XGetLaunchInfo
// ******************************************************************
DWORD WINAPI EmuXGetLaunchInfo
DWORD WINAPI EMUPATCH(XGetLaunchInfo)
(
PDWORD pdwLaunchDataType,
PLAUNCH_DATA pLaunchData
);
// ******************************************************************
// * func: EmuXSetProcessQuantumLength
// * patch: XSetProcessQuantumLength
// ******************************************************************
VOID WINAPI EmuXSetProcessQuantumLength
VOID WINAPI EMUPATCH(XSetProcessQuantumLength)
(
DWORD dwMilliseconds
);
// ******************************************************************
// * func: EmuSignalObjectAndWait
// * patch: SignalObjectAndWait
// ******************************************************************
DWORD WINAPI EmuSignalObjectAndWait
DWORD WINAPI EMUPATCH(SignalObjectAndWait)
(
HANDLE hObjectToSignal,
HANDLE hObjectToWaitOn,
@ -591,9 +596,9 @@ DWORD WINAPI EmuSignalObjectAndWait
);
// ******************************************************************
// * func: timeSetEvent
// * patch: timeSetEvent
// ******************************************************************
MMRESULT WINAPI EmutimeSetEvent
MMRESULT WINAPI EMUPATCH(timeSetEvent)
(
UINT uDelay,
UINT uResolution,
@ -603,17 +608,17 @@ MMRESULT WINAPI EmutimeSetEvent
);
// ******************************************************************
// * func: timeKillEvent
// * patch: timeKillEvent
// ******************************************************************
MMRESULT WINAPI EmutimeKillEvent
MMRESULT WINAPI EMUPATCH(timeKillEvent)
(
UINT uTimerID
);
// ******************************************************************
// * func: EmuRaiseException
// * patch: RaiseException
// ******************************************************************
VOID WINAPI EmuRaiseException
VOID WINAPI EMUPATCH(RaiseException)
(
DWORD dwExceptionCode, // exception code
DWORD dwExceptionFlags, // continuable exception flag
@ -622,18 +627,18 @@ VOID WINAPI EmuRaiseException
);
// ******************************************************************
// * func: EmulstrcmpiW
// * patch: lstrcmpiW
// ******************************************************************
int WINAPI EmulstrcmpiW
int WINAPI EMUPATCH(lstrcmpiW)
(
LPCWSTR lpString1,
LPCWSTR lpString2
);
// ******************************************************************
// * func: EmuXMountMUA
// * patch: XMountMUA
// ******************************************************************
DWORD WINAPI EmuXMountMUA
DWORD WINAPI EMUPATCH(XMountMUA)
(
DWORD dwPort,
DWORD dwSlot,
@ -641,9 +646,9 @@ DWORD WINAPI EmuXMountMUA
);
// ******************************************************************
// * func: EmuXMountMURootA
// * patch: XMountMURootA
// ******************************************************************
DWORD WINAPI EmuXMountMURootA
DWORD WINAPI EMUPATCH(XMountMURootA)
(
DWORD dwPort,
DWORD dwSlot,
@ -651,9 +656,9 @@ DWORD WINAPI EmuXMountMURootA
);
// ******************************************************************
// * func: EmuXMountAlternateTitle
// * patch: XMountAlternateTitle
// ******************************************************************
DWORD WINAPI EmuXMountAlternateTitle
DWORD WINAPI EMUPATCH(XMountAlternateTitle)
(
LPCSTR lpRootPath,
DWORD dwAltTitleId,
@ -661,47 +666,47 @@ DWORD WINAPI EmuXMountAlternateTitle
);
// ******************************************************************
// * func: EmuXUnmountAlternateTitle
// * patch: XUnmountAlternateTitle
// ******************************************************************
DWORD WINAPI EmuXUnmountAlternateTitle(CHAR chDrive);
DWORD WINAPI EMUPATCH(XUnmountAlternateTitle)(CHAR chDrive);
// ******************************************************************
// * func: EmuMoveFileA
// * patch: MoveFileA
// ******************************************************************
BOOL WINAPI EmuMoveFileA
BOOL WINAPI EMUPATCH(MoveFileA)
(
LPCSTR lpExistingFileName,
LPCSTR lpNewFileName
);
// ******************************************************************
// * func: EmuXGetDeviceEnumerationStatus
// * patch: XGetDeviceEnumerationStatus
// ******************************************************************
DWORD WINAPI EmuXGetDeviceEnumerationStatus();
DWORD WINAPI EMUPATCH(XGetDeviceEnumerationStatus)();
// ******************************************************************
// * func: EmuSwitchToThread
// * patch: SwitchToThread
// ******************************************************************
BOOL WINAPI EmuSwitchToThread();
BOOL WINAPI EMUPATCH(SwitchToThread)();
// ******************************************************************
// * func: EmuXInputGetDeviceDescription
// * patch: XInputGetDeviceDescription
// ******************************************************************
DWORD WINAPI EmuXInputGetDeviceDescription
DWORD WINAPI EMUPATCH(XInputGetDeviceDescription)
(
HANDLE hDevice,
PVOID pDescription
);
// ******************************************************************
// * func: EmuXAutoPowerDownResetTimer
// * patch: XAutoPowerDownResetTimer
// ******************************************************************
int WINAPI EmuXAutoPowerDownResetTimer();
int WINAPI EMUPATCH(XAutoPowerDownResetTimer)();
// ******************************************************************
// * func: EmuReadFileEx
// * patch: ReadFileEx
// ******************************************************************
BOOL WINAPI EmuReadFileEx
BOOL WINAPI EMUPATCH(ReadFileEx)
(
HANDLE hFile, // handle to file
LPVOID lpBuffer, // data buffer
@ -711,9 +716,9 @@ BOOL WINAPI EmuReadFileEx
);
// ******************************************************************
// * func: EmuWriteFileEx
// * patch: WriteFileEx
// ******************************************************************
BOOL WINAPI EmuWriteFileEx
BOOL WINAPI EMUPATCH(WriteFileEx)
(
HANDLE hFile, // handle to output file
LPCVOID lpBuffer, // data buffer
@ -725,26 +730,26 @@ BOOL WINAPI EmuWriteFileEx
// s+
/* not necessary?
// ******************************************************************
// * func: EmuXCalculateSignatureBegin
// * patch: XCalculateSignatureBegin
// ******************************************************************
HANDLE WINAPI EmuXCalculateSignatureBegin
HANDLE WINAPI EMUPATCH(XCalculateSignatureBegin)
(
DWORD dwFlags
);
// ******************************************************************
// * func: EmuXCalculateSignatureBegin
// * patch: XCalculateSignatureBegin
// ******************************************************************
HANDLE WINAPI EmuXCalculateSignatureBeginEx
HANDLE WINAPI EMUPATCH(XCalculateSignatureBeginEx)
(
DWORD dwFlags,
DWORD dwAltTitleId
);
// ******************************************************************
// * func: EmuXCalculateSignatureUpdate
// * patch: XCalculateSignatureUpdate
// ******************************************************************
DWORD WINAPI EmuXCalculateSignatureUpdate
DWORD WINAPI EMUPATCH(XCalculateSignatureUpdate)
(
HANDLE hCalcSig,
const BYTE *pbData,
@ -752,9 +757,9 @@ DWORD WINAPI EmuXCalculateSignatureUpdate
);
// ******************************************************************
// * func: EmuXCalculateSignatureEnd
// * patch: XCalculateSignatureEnd
// ******************************************************************
DWORD WINAPI EmuXCalculateSignatureEnd
DWORD WINAPI EMUPATCH(XCalculateSignatureEnd)
(
HANDLE hCalcSig,
PXCALCSIG_SIGNATURE pSignature

4
src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.h
View File

@ -36,8 +36,8 @@
#include "OOVPA.h"
extern SOOVPA<11> IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_3925;
extern SOOVPA<15> IDirect3DDevice8_SetRenderState_CullMode_1_0_3925;
extern SOOVPA<11> D3DDevice_SetTextureState_TexCoordIndex_1_0_3925;
extern SOOVPA<15> D3DDevice_SetRenderState_CullMode_1_0_3925;
extern OOVPATable D3D8_1_0_3925[];
extern uint32 D3D8_1_0_3925_SIZE;

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

File diff suppressed because it is too large Load Diff

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.h
View File

@ -36,7 +36,7 @@
#include "OOVPA.h"
extern SOOVPA<14> IDirect3DDevice8_SetRenderState_CullMode_1_0_4034;
extern SOOVPA<14> D3DDevice_SetRenderState_CullMode_1_0_4034;
extern OOVPATable D3D8_1_0_4034[];
extern uint32 D3D8_1_0_4034_SIZE;

570
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl
View File

File diff suppressed because it is too large Load Diff

3
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.h
View File

@ -36,8 +36,7 @@
#include "OOVPA.h"
extern SOOVPA<10> IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4134;
//extern SOOVPA<14> IDirect3DDevice8_SetRenderState_CullMode_1_0_4134;
extern SOOVPA<10> D3DDevice_SetTextureState_TexCoordIndex_1_0_4134;
extern OOVPATable D3D8_1_0_4134[];
extern uint32 D3D8_1_0_4134_SIZE;

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

File diff suppressed because it is too large Load Diff

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

@ -36,7 +36,7 @@
#include "OOVPA.h"
extern SOOVPA<10> IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4361;
extern SOOVPA<10> D3DDevice_SetTextureState_TexCoordIndex_1_0_4361;
extern OOVPATable D3D8_1_0_4361[];
extern uint32 D3D8_1_0_4361_SIZE;

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

File diff suppressed because it is too large Load Diff

508
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
View File

File diff suppressed because it is too large Load Diff

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.h
View File

@ -36,7 +36,7 @@
#include "OOVPA.h"
extern SOOVPA<10> IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4627;
extern SOOVPA<10> D3DDevice_SetTextureState_TexCoordIndex_1_0_4627;
extern OOVPATable D3D8_1_0_4627[];
extern uint32 D3D8_1_0_4627_SIZE;

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

File diff suppressed because it is too large Load Diff

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.h
View File

@ -36,7 +36,7 @@
#include "OOVPA.h"
extern SOOVPA<13> IDirect3DDevice8_SetRenderState_CullMode_1_0_5233;
extern SOOVPA<13> D3DDevice_SetRenderState_CullMode_1_0_5233;
extern OOVPATable D3D8_1_0_5233[];
extern uint32 D3D8_1_0_5233_SIZE;

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -33,9 +33,9 @@
// ******************************************************************
// ******************************************************************
// * IDirect3DDevice8_EndVisibilityTest
// * D3DDevice_EndVisibilityTest
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_EndVisibilityTest_1_0_5849, 7)
OOVPA_NO_XREF(D3DDevice_EndVisibilityTest_1_0_5849, 7)
{ 0x10, 0x09 },
{ 0x12, 0x0E },
@ -47,9 +47,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_EndVisibilityTest_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_GetVisibilityTestResult
// * D3DDevice_GetVisibilityTestResult
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_GetVisibilityTestResult_1_0_5849, 7)
OOVPA_NO_XREF(D3DDevice_GetVisibilityTestResult_1_0_5849, 7)
{ 0x0E, 0x08 },
{ 0x10, 0xFF },
@ -61,9 +61,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetVisibilityTestResult_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_GetViewport
// * D3DDevice_GetViewport
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_GetViewport_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_GetViewport_1_0_5849, 8)
{ 0x09, 0x05 },
{ 0x14, 0x04 },
@ -76,9 +76,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetViewport_1_0_5849, 8)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetBackBufferScale
// * D3DDevice_SetBackBufferScale
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_SetBackBufferScale_1_0_5849, 7)
OOVPA_NO_XREF(D3DDevice_SetBackBufferScale_1_0_5849, 7)
{ 0x1E, 0x24 },
{ 0x3E, 0x06 },
@ -90,63 +90,63 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetBackBufferScale_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_GetBackBuffer2
// * D3DDevice_GetBackBuffer2
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer2_1_0_5849, 12)
OOVPA_NO_XREF(D3DDevice_GetBackBuffer2_1_0_5849, 12)
// IDirect3DDevice8_GetBackBuffer2+0x04 : cmp eax, 0xFFFFFFFF
// D3DDevice_GetBackBuffer2+0x04 : cmp eax, 0xFFFFFFFF
{ 0x04, 0x83 }, // (Offset,Value)-Pair #1
{ 0x05, 0xF8 }, // (Offset,Value)-Pair #2
{ 0x06, 0xFF }, // (Offset,Value)-Pair #3
// IDirect3DDevice8_GetBackBuffer2+0x0D : jnz +0x19
// D3DDevice_GetBackBuffer2+0x0D : jnz +0x19
{ 0x0D, 0x75 }, // (Offset,Value)-Pair #4
{ 0x0E, 0x19 }, // (Offset,Value)-Pair #5
// IDirect3DDevice8_GetBackBuffer2+0x18 : mov esi, [ecx+eax*4+0x21C0]
// D3DDevice_GetBackBuffer2+0x18 : mov esi, [ecx+eax*4+0x21C0]
{ 0x15, 0x8B }, // (Offset,Value)-Pair #6
{ 0x16, 0xB4 }, // (Offset,Value)-Pair #7
{ 0x17, 0x81 }, // (Offset,Value)-Pair #8
{ 0x18, 0x14 }, // (Offset,Value)-Pair #9
{ 0x19, 0x1A }, // (Offset,Value)-Pair #10
// IDirect3DDevice8_GetBackBuffer2+0x40 : retn 0x04
// D3DDevice_GetBackBuffer2+0x40 : retn 0x04
{ 0x40, 0xC2 }, // (Offset,Value)-Pair #11
{ 0x41, 0x04 }, // (Offset,Value)-Pair #12
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_GetDepthStencilSurface2
// * D3DDevice_GetDepthStencilSurface2
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_GetDepthStencilSurface2_1_0_5849, 10)
OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface2_1_0_5849, 10)
// IDirect3DDevice8_GetDepthStencilSurface2+0x00 : mov eax, [addr]
// D3DDevice_GetDepthStencilSurface2+0x00 : mov eax, [addr]
{ 0x00, 0xA1 }, // (Offset,Value)-Pair #1
// IDirect3DDevice8_GetDepthStencilSurface2+0x05 : push esi
// D3DDevice_GetDepthStencilSurface2+0x05 : push esi
{ 0x05, 0x56 }, // (Offset,Value)-Pair #2
// IDirect3DDevice8_GetDepthStencilSurface2+0x06 : mov esi, [eax + 0x1A08]
// D3DDevice_GetDepthStencilSurface2+0x06 : mov esi, [eax + 0x1A08]
{ 0x06, 0x8B }, // (Offset,Value)-Pair #3
{ 0x07, 0xB0 }, // (Offset,Value)-Pair #4
{ 0x08, 0x08 }, // (Offset,Value)-Pair #5
{ 0x09, 0x1A }, // (Offset,Value)-Pair #6
// IDirect3DDevice8_GetDepthStencilSurface2+0x0E : jnz +0x04
// D3DDevice_GetDepthStencilSurface2+0x0E : jnz +0x04
{ 0x0E, 0x75 }, // (Offset,Value)-Pair #7
{ 0x0F, 0x04 }, // (Offset,Value)-Pair #8
// IDirect3DDevice8_GetDepthStencilSurface2+0x15 : call [addr]
// D3DDevice_GetDepthStencilSurface2+0x15 : call [addr]
{ 0x15, 0xE8 }, // (Offset,Value)-Pair #9
// IDirect3DDevice8_GetDepthStencilSurface2+0x1D : retn
// D3DDevice_GetDepthStencilSurface2+0x1D : retn
{ 0x1D, 0xC3 }, // (Offset,Value)-Pair #10
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_CreateVertexShader
// * D3DDevice_CreateVertexShader
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexShader_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_CreateVertexShader_1_0_5849, 8)
{ 0x1E, 0x85 },
{ 0x3E, 0xE8 },
@ -159,9 +159,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexShader_1_0_5849, 8)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_CreatePixelShader
// * D3DDevice_CreatePixelShader
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_CreatePixelShader_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_CreatePixelShader_1_0_5849, 8)
{ 0x07, 0x00 },
{ 0x10, 0xC0 },
@ -174,9 +174,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreatePixelShader_1_0_5849, 8)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetVertexData4f
// * D3DDevice_SetVertexData4f
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData4f_1_0_5849, 7)
OOVPA_NO_XREF(D3DDevice_SetVertexData4f_1_0_5849, 7)
{ 0x0A, 0x46 },
{ 0x16, 0x08 },
@ -188,9 +188,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData4f_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetVertexDataColor
// * D3DDevice_SetVertexDataColor
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_SetVertexDataColor_1_0_5849, 7)
OOVPA_NO_XREF(D3DDevice_SetVertexDataColor_1_0_5849, 7)
{ 0x08, 0x06 },
{ 0x14, 0x8B },
@ -202,9 +202,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexDataColor_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetRenderState_TextureFactor
// * D3DDevice_SetRenderState_TextureFactor
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5849, 7)
OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor_1_0_5849, 7)
{ 0x09, 0x84 },
{ 0x14, 0x46 },
@ -216,9 +216,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetRenderState_StencilEnable
// * D3DDevice_SetRenderState_StencilEnable
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilEnable_1_0_5849, 8)
{ 0x12, 0x8B },
{ 0x24, 0x33 },
@ -231,9 +231,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_5849, 8)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetIndices
// * D3DDevice_SetIndices
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_5849, 7)
OOVPA_NO_XREF(D3DDevice_SetIndices_1_0_5849, 7)
{ 0x0F, 0x10 },
{ 0x20, 0xC7 },
@ -245,9 +245,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_DrawIndexedVertices
// * D3DDevice_DrawIndexedVertices
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_DrawIndexedVertices_1_0_5849, 8)
{ 0x1E, 0x5E },
{ 0x3E, 0x17 },
@ -260,9 +260,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_5849, 8)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_DrawIndexedVerticesUP
// * D3DDevice_DrawIndexedVerticesUP
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_DrawIndexedVerticesUP_1_0_5849, 8)
{ 0x1F, 0x05 },
{ 0x3A, 0x89 },
@ -275,9 +275,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_5849, 8)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetMaterial
// * D3DDevice_SetMaterial
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_5849, 9)
OOVPA_NO_XREF(D3DDevice_SetMaterial_1_0_5849, 9)
{ 0x04, 0x08 },
{ 0x0C, 0x81 },
@ -291,9 +291,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_5849, 9)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_BeginStateBig
// * D3DDevice_BeginStateBig
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_BeginStateBig_1_0_5849, 7)
OOVPA_NO_XREF(D3DDevice_BeginStateBig_1_0_5849, 7)
{ 0x07, 0x01 },
{ 0x10, 0x8D },
@ -305,9 +305,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_BeginStateBig_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_CreateVertexBuffer2
// * D3DDevice_CreateVertexBuffer2
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexBuffer2_1_0_5849, 7)
OOVPA_NO_XREF(D3DDevice_CreateVertexBuffer2_1_0_5849, 7)
{ 0x08, 0xE8 },
{ 0x12, 0x1E },
@ -319,9 +319,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexBuffer2_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DVertexBuffer8_Lock
// * D3DVertexBuffer_Lock
// ******************************************************************
OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock_1_0_5849, 8)
OOVPA_NO_XREF(D3DVertexBuffer_Lock_1_0_5849, 8)
{ 0x01, 0x51 },
{ 0x07, 0x8B },
@ -336,7 +336,7 @@ OOVPA_END;
// ******************************************************************
// * D3DVertexBuffer_Lock2
// ******************************************************************
OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock2_1_0_5849, 7)
OOVPA_NO_XREF(D3DVertexBuffer_Lock2_1_0_5849, 7)
{ 0x08, 0x56 },
{ 0x12, 0x06 },
@ -348,9 +348,9 @@ OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock2_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_LightEnable
// * D3DDevice_LightEnable
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_LightEnable_1_0_5849, 8)
{ 0x1E, 0x8D },
{ 0x3E, 0xC7 },
@ -363,9 +363,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_5849, 8)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_DrawVertices
// * D3DDevice_DrawVertices
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_DrawVertices_1_0_5849, 7)
OOVPA_NO_XREF(D3DDevice_DrawVertices_1_0_5849, 7)
{ 0x12, 0x8B },
{ 0x26, 0x8B },
@ -377,9 +377,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawVertices_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetRenderTarget
// * D3DDevice_SetRenderTarget
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_SetRenderTarget_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_SetRenderTarget_1_0_5849, 8)
{ 0x1E, 0x44 },
{ 0x3E, 0x2C },
@ -392,9 +392,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderTarget_1_0_5849, 8)
OOVPA_END;
// ******************************************************************
// * IDirect3D8_AllocContiguousMemory
// * D3D_AllocContiguousMemory
// ******************************************************************
OOVPA_NO_XREF(IDirect3D8_AllocContiguousMemory_1_0_5849, 7)
OOVPA_NO_XREF(D3D_AllocContiguousMemory_1_0_5849, 7)
{ 0x05, 0x10 },
{ 0x0C, 0x00 },
@ -406,7 +406,7 @@ OOVPA_NO_XREF(IDirect3D8_AllocContiguousMemory_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DTexture8_GetLevelDesc
// * D3DTexture_GetLevelDesc
// ******************************************************************
// * NOTE: We are actually intercepting Get2DSurfaceDesc, because
// * GetLevelDesc Simply redirects to that function
@ -431,9 +431,9 @@ OOVPA_NO_XREF(Get2DSurfaceDesc_1_0_5849, 10)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_CreateTexture2
// * D3DDevice_CreateTexture2
// ******************************************************************
OOVPA_XREF(IDirect3DDevice8_CreateTexture2_1_0_5849, 8,
OOVPA_XREF(D3DDevice_CreateTexture2_1_0_5849, 8,
XRefNoSaveIndex, // ?? XREF_D3DDevice_CreateTexture2,
XRefZero)
@ -449,36 +449,36 @@ OOVPA_XREF(IDirect3DDevice8_CreateTexture2_1_0_5849, 8,
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetVertexShaderConstant1
// * D3DDevice_SetVertexShaderConstant1
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant1_1_0_5849, 11)
OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant1_1_0_5849, 11)
// IDirect3DDevice8_SetVertexShaderConstant1+0x05 : add eax, 0x1C
// D3DDevice_SetVertexShaderConstant1+0x05 : add eax, 0x1C
{ 0x06, 0x83 }, // (Offset,Value)-Pair #1
{ 0x07, 0xC0 }, // (Offset,Value)-Pair #2
{ 0x08, 0x1C }, // (Offset,Value)-Pair #3
// IDirect3DDevice8_SetVertexShaderConstant1+0x0E : jnb +0x43
// D3DDevice_SetVertexShaderConstant1+0x0E : jnb +0x43
{ 0x0F, 0x73 }, // (Offset,Value)-Pair #4
{ 0x10, 0x43 }, // (Offset,Value)-Pair #5
// IDirect3DDevice8_SetVertexShaderConstant1+0x28 : mov [eax-0x18], ecx
// D3DDevice_SetVertexShaderConstant1+0x28 : mov [eax-0x18], ecx
{ 0x1D, 0x89 }, // (Offset,Value)-Pair #6
{ 0x1E, 0x48 }, // (Offset,Value)-Pair #7
{ 0x1F, 0xE8 }, // (Offset,Value)-Pair #8
// IDirect3DDevice8_SetVertexShaderConstant1+0x3D : retn
// D3DDevice_SetVertexShaderConstant1+0x3D : retn
{ 0x53, 0xC3 }, // (Offset,Value)-Pair #9
// IDirect3DDevice8_SetVertexShaderConstant1+0x47 : jmp +0xA2
// D3DDevice_SetVertexShaderConstant1+0x47 : jmp +0xA2
{ 0x5D, 0xEB }, // (Offset,Value)-Pair #10
{ 0x5E, 0xA2 }, // (Offset,Value)-Pair #11
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetVertexData2f
// * D3DDevice_SetVertexData2f
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData2f_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_SetVertexData2f_1_0_5849, 8)
{ 0x0D, 0x05 },
{ 0x17, 0x8D },
@ -491,9 +491,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData2f_1_0_5849, 8)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_DrawVerticesUP
// * D3DDevice_DrawVerticesUP
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_DrawVerticesUP_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_DrawVerticesUP_1_0_5849, 8)
{ 0x1E, 0x72 },
{ 0x3E, 0xC0 },
@ -506,9 +506,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawVerticesUP_1_0_5849, 8)
OOVPA_END;
// ******************************************************************
// * IDirect3DTexture8_LockRect
// * D3DTexture_LockRect
// ******************************************************************
OOVPA_NO_XREF(IDirect3DTexture8_LockRect_1_0_5849, 7)
OOVPA_NO_XREF(D3DTexture_LockRect_1_0_5849, 7)
{ 0x03, 0x14 },
{ 0x08, 0x8B },
@ -520,9 +520,9 @@ OOVPA_NO_XREF(IDirect3DTexture8_LockRect_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_BeginPushBuffer
// * D3DDevice_BeginPushBuffer
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_BeginPushBuffer_1_0_5849, 6)
OOVPA_NO_XREF(D3DDevice_BeginPushBuffer_1_0_5849, 6)
{ 0x09, 0x00 },
{ 0x11, 0x8B },
@ -533,9 +533,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_BeginPushBuffer_1_0_5849, 6)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_EndPushBuffer
// * D3DDevice_EndPushBuffer
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_EndPushBuffer_1_0_5849, 6)
OOVPA_NO_XREF(D3DDevice_EndPushBuffer_1_0_5849, 6)
{ 0x09, 0x00 },
{ 0x15, 0x50 },
@ -546,9 +546,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_EndPushBuffer_1_0_5849, 6)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_RunPushBuffer
// * D3DDevice_RunPushBuffer
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_RunPushBuffer_1_0_5849, 6)
OOVPA_NO_XREF(D3DDevice_RunPushBuffer_1_0_5849, 6)
{ 0x0E, 0xED },
{ 0x42, 0x18 },
@ -559,9 +559,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_RunPushBuffer_1_0_5849, 6)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_SetVerticalBlankCallback
// * D3DDevice_SetVerticalBlankCallback
// ******************************************************************
OOVPA_XREF(IDirect3DDevice8_SetVerticalBlankCallback_1_0_5849, 7,
OOVPA_XREF(D3DDevice_SetVerticalBlankCallback_1_0_5849, 7,
XRefNoSaveIndex,
XRefOne)
@ -639,7 +639,7 @@ OOVPA_END;
// ******************************************************************
// * IDirectD3DDevice8_Release
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_Release_1_0_5849, 8)
OOVPA_NO_XREF(D3DDevice_Release_1_0_5849, 8)
{ 0x07, 0x8B },
{ 0x0C, 0x00 },
@ -734,25 +734,25 @@ OOVPA_END;
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth_1_0_5849, 13)
// IDirect3DDevice8_SetRenderState_LineWidth+0x00 : push ebx
// D3DDevice_SetRenderState_LineWidth+0x00 : push ebx
{ 0x00, 0x53 }, // (Offset,Value)-Pair #1
// IDirect3DDevice8_SetRenderState_LineWidth+0x0C : mov [esp+8+argo_0], ebx
// D3DDevice_SetRenderState_LineWidth+0x0C : mov [esp+8+argo_0], ebx
{ 0x0C, 0x89 }, // (Offset,Value)-Pair #2
{ 0x0D, 0x5C }, // (Offset,Value)-Pair #3
{ 0x0E, 0x24 }, // (Offset,Value)-Pair #4
{ 0x0F, 0x0C }, // (Offset,Value)-Pair #5
// IDirect3DDevice8_SetRenderState_LineWidth+0x28 : fstp [esp+10h+var_10]
// D3DDevice_SetRenderState_LineWidth+0x28 : fstp [esp+10h+var_10]
{ 0x28, 0xD9 }, // (Offset,Value)-Pair #6
{ 0x29, 0x1C }, // (Offset,Value)-Pair #7
{ 0x2A, 0x24 }, // (Offset,Value)-Pair #8
// IDirect3DDevice8_SetRenderState_LineWidth+0x30 : mov edi, eax
// D3DDevice_SetRenderState_LineWidth+0x30 : mov edi, eax
{ 0x30, 0x8B }, // (Offset,Value)-Pair #9
{ 0x31, 0xF8 }, // (Offset,Value)-Pair #10
// IDirect3DDevice8_SetRenderState_LineWidth+0x41 : cmp eax, [esi+4]
// D3DDevice_SetRenderState_LineWidth+0x41 : cmp eax, [esi+4]
{ 0x41, 0x3B }, // (Offset,Value)-Pair #11
{ 0x42, 0x46 }, // (Offset,Value)-Pair #12
{ 0x43, 0x04 }, // (Offset,Value)-Pair #13
@ -1002,26 +1002,26 @@ OOVPA_NO_XREF(D3DDevice_Swap_1_0_5849, 7)
OOVPA_END;
// ******************************************************************
// * IDirect3DDevice8_Swap (2)
// * D3DDevice_Swap (2)
// ******************************************************************
OOVPA_NO_XREF(IDirect3DDevice8_Swap2_1_0_5849, 11)
OOVPA_NO_XREF(D3DDevice_Swap2_1_0_5849, 11)
// IDirect3DDevice8_Swap+0x2A : mov ebx, 5
// D3DDevice_Swap+0x2A : mov ebx, 5
{ 0x2A, 0xBB }, // (Offset,Value)-Pair #1
{ 0x2B, 0x05 }, // (Offset,Value)-Pair #2
// IDirect3DDevice8_Swap+0x37 : test bl, 3
// D3DDevice_Swap+0x37 : test bl, 3
{ 0x37, 0xF6 }, // (Offset,Value)-Pair #3
{ 0x38, 0xC3 }, // (Offset,Value)-Pair #4
{ 0x39, 0x03 }, // (Offset,Value)-Pair #5
// IDirect3DDevice8_Swap+0x60 : inc dword ptr [esi+0x2478]
// D3DDevice_Swap+0x60 : inc dword ptr [esi+0x2478]
{ 0x60, 0xFF }, // (Offset,Value)-Pair #6
{ 0x61, 0x86 }, // (Offset,Value)-Pair #7
{ 0x62, 0x78 }, // (Offset,Value)-Pair #8
{ 0x63, 0x24 }, // (Offset,Value)-Pair #9
// IDirect3DDevice8_Swap+0xE0 : retn 4
// D3DDevice_Swap+0xE0 : retn 4
{ 0xE0, 0xC2 }, // (Offset,Value)-Pair #10
{ 0xE1, 0x04 }, // (Offset,Value)-Pair #11
OOVPA_END;
@ -1289,303 +1289,303 @@ OOVPA_END;
OOVPATable D3D8_1_0_5849[] = {
// IDirect3D8::CreateDevice (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirect3D8_CreateDevice_1_0_4627, XTL::EmuIDirect3D8_CreateDevice),
OOVPA_TABLE_PATCH(D3D_CreateDevice_1_0_4627, D3D_CreateDevice),
// IDirect3DDevice8::BeginVisibilityTest (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginVisibilityTest_1_0_4627, XTL::EmuIDirect3DDevice8_BeginVisibilityTest),
OOVPA_TABLE_PATCH(D3DDevice_BeginVisibilityTest_1_0_4627, D3DDevice_BeginVisibilityTest),
// IDirect3DDevice8::EndVisibilityTest
OOVPA_TABLE_PATCH(IDirect3DDevice8_EndVisibilityTest_1_0_5849, XTL::EmuIDirect3DDevice8_EndVisibilityTest),
OOVPA_TABLE_PATCH(D3DDevice_EndVisibilityTest_1_0_5849, D3DDevice_EndVisibilityTest),
// IDirect3DDevice8::GetVisibilityTestResult
OOVPA_TABLE_PATCH(IDirect3DDevice8_GetVisibilityTestResult_1_0_5849, XTL::EmuIDirect3DDevice8_GetVisibilityTestResult),
OOVPA_TABLE_PATCH(D3DDevice_GetVisibilityTestResult_1_0_5849, D3DDevice_GetVisibilityTestResult),
// IDirect3DDevice8::GetViewport
OOVPA_TABLE_PATCH(IDirect3DDevice8_GetViewport_1_0_5849, XTL::EmuIDirect3DDevice8_GetViewport),
OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_5849, D3DDevice_GetViewport),
// IDirect3DDevice8::SetBackBufferScale
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetBackBufferScale_1_0_5849, XTL::EmuIDirect3DDevice8_SetBackBufferScale),
OOVPA_TABLE_PATCH(D3DDevice_SetBackBufferScale_1_0_5849, D3DDevice_SetBackBufferScale),
// IDirect3DDevice8::GetCreationParameters (* unchanged since 4034 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_GetCreationParameters_1_0_4034, XTL::EmuIDirect3DDevice8_GetCreationParameters),
OOVPA_TABLE_PATCH(D3DDevice_GetCreationParameters_1_0_4034, D3DDevice_GetCreationParameters),
// IDirect3DDevice8::Clear (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_Clear_1_0_5233, XTL::EmuIDirect3DDevice8_Clear),
OOVPA_TABLE_PATCH(D3DDevice_Clear_1_0_5233, D3DDevice_Clear),
// IDirect3DDevice8::Swap
OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_5849, XTL::EmuIDirect3DDevice8_Swap),
OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_5849, D3DDevice_Swap),
// IDirect3DDevice8::Swap (2)
OOVPA_TABLE_PATCH(IDirect3DDevice8_Swap2_1_0_5849, XTL::EmuIDirect3DDevice8_Swap),
OOVPA_TABLE_PATCH(D3DDevice_Swap2_1_0_5849, D3DDevice_Swap),
// IDirect3DDevice8::GetBackBuffer2
OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer2_1_0_5849, XTL::EmuIDirect3DDevice8_GetBackBuffer2),
OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer2_1_0_5849, D3DDevice_GetBackBuffer2),
// IDirect3DDevice8::GetDepthStencilSurface2
OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface2_1_0_5849, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface2),
OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface2_1_0_5849, D3DDevice_GetDepthStencilSurface2),
// IDirect3DDevice8::CreateVertexShader
OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_5849, XTL::EmuIDirect3DDevice8_CreateVertexShader),
OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_5849, D3DDevice_CreateVertexShader),
// IDirect3DDevice8::CreatePixelShader
OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePixelShader_1_0_5849, XTL::EmuIDirect3DDevice8_CreatePixelShader),
OOVPA_TABLE_PATCH(D3DDevice_CreatePixelShader_1_0_5849, D3DDevice_CreatePixelShader),
// IDirect3DDevice8::SetPixelShader (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_5233, XTL::EmuIDirect3DDevice8_SetPixelShader),
OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_5233, D3DDevice_SetPixelShader),
// IDirect3DDevice8::GetDisplayMode (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDisplayMode_1_0_4627, XTL::EmuIDirect3DDevice8_GetDisplayMode),
OOVPA_TABLE_PATCH(D3DDevice_GetDisplayMode_1_0_4627, D3DDevice_GetDisplayMode),
// IDirect3DDevice8::SetVertexData2f
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData2f_1_0_5849, XTL::EmuIDirect3DDevice8_SetVertexData2f),
OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_5849, D3DDevice_SetVertexData2f),
// IDirect3DDevice8::SetVertexData4f
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData4f_1_0_5849, XTL::EmuIDirect3DDevice8_SetVertexData4f),
OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_5849, D3DDevice_SetVertexData4f),
// IDirect3DDevice8::SetVertexDataColor
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexDataColor_1_0_5849, XTL::EmuIDirect3DDevice8_SetVertexDataColor),
OOVPA_TABLE_PATCH(D3DDevice_SetVertexDataColor_1_0_5849, D3DDevice_SetVertexDataColor),
// IDirect3DDevice8::End (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_End_1_0_5558, XTL::EmuIDirect3DDevice8_End),
OOVPA_TABLE_PATCH(D3DDevice_End_1_0_5558, D3DDevice_End),
// IDirect3DDevice8::SetVerticalBlankCallback
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVerticalBlankCallback_1_0_5849, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback),
OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_5849, D3DDevice_SetVerticalBlankCallback),
// IDirect3DDevice8::SetTextureState_TexCoordIndex (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4627, XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex),
OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TexCoordIndex_1_0_4627, D3DDevice_SetTextureState_TexCoordIndex),
// IDirect3DDevice8::SetTextureState_BumpEnv (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_BumpEnv_1_0_4361, XTL::EmuIDirect3DDevice8_SetTextureState_BumpEnv),
OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BumpEnv_1_0_4361, D3DDevice_SetTextureState_BumpEnv),
// IDirect3DDevice8::SetTextureState_BorderColor (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_BorderColor_1_0_4361, XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor),
OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BorderColor_1_0_4361, D3DDevice_SetTextureState_BorderColor),
// IDirect3DDevice8::SetRenderState_CullMode (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullMode_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullMode_1_0_5233, D3DDevice_SetRenderState_CullMode),
// IDirect3DDevice8::SetRenderState_TextureFactor
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_5849, D3DDevice_SetRenderState_TextureFactor),
// IDirect3DDevice8::SetRenderState_NormalizeNormals (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_4432, XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_NormalizeNormals_1_0_4432, D3DDevice_SetRenderState_NormalizeNormals),
// IDirect3DDevice8::SetRenderState_ZBias (* unchanged since 3925 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZBias_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_ZBias),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZBias_1_0_3925, D3DDevice_SetRenderState_ZBias),
// IDirect3DDevice8::SetRenderState_EdgeAntiAlias (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_EdgeAntiAlias_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_4361, D3DDevice_SetRenderState_EdgeAntiAlias),
// IDirect3DDevice8::SetRenderState_FillMode (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FillMode_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_FillMode),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FillMode_1_0_4361, D3DDevice_SetRenderState_FillMode),
// IDirect3DDevice8::SetRenderState_FogColor (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FogColor_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_FogColor),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FogColor_1_0_4134, D3DDevice_SetRenderState_FogColor),
// IDirect3DDevice8::SetRenderState_Simple (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Simple_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_Simple),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Simple_1_0_4361, D3DDevice_SetRenderState_Simple),
// IDirect3DDevice8::SetRenderState_ZEnable (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_5233, D3DDevice_SetRenderState_ZEnable),
// IDirect3DDevice8::SetRenderState_StencilEnable
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_5849, D3DDevice_SetRenderState_StencilEnable),
// IDirect3DDevice8::SetRenderState_OcclusionCullEnable (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_OcclusionCullEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_OcclusionCullEnable_1_0_4134, D3DDevice_SetRenderState_OcclusionCullEnable),
// IDirect3DDevice8::SetRenderState_MultiSampleAntiAlias (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4627, D3DDevice_SetRenderState_MultiSampleAntiAlias),
// IDirect3DDevice8::SetRenderState_ShadowFunc (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_ShadowFunc),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ShadowFunc_1_0_4134, D3DDevice_SetRenderState_ShadowFunc),
// IDirect3DDevice8::SetRenderState_YuvEnable (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_YuvEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_YuvEnable),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_YuvEnable_1_0_4134, D3DDevice_SetRenderState_YuvEnable),
// IDirect3DDevice8::SetVertexShader (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_5558, XTL::EmuIDirect3DDevice8_SetVertexShader),
OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_5558, D3DDevice_SetVertexShader),
// IDirect3DDevice8::SetIndices
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_5849, XTL::EmuIDirect3DDevice8_SetIndices),
OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_5849, D3DDevice_SetIndices),
// IDirect3DDevice8::SetTexture (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_5233, XTL::EmuIDirect3DDevice8_SetTexture),
OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_5233, D3DDevice_SetTexture),
// D3D::CDevice::LazySetStateVB (XREF) (* unchanged since 5558 *)
OOVPA_TABLE_XREF(D3D_CDevice_LazySetStateVB_1_0_5558),
// IDirect3DDevice8::BeginPush (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginPush_1_0_5558, XTL::EmuIDirect3DDevice8_BeginPush),
OOVPA_TABLE_PATCH(D3DDevice_BeginPush_1_0_5558, D3DDevice_BeginPush),
// IDirect3DDevice8::EndPush (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_EndPush_1_0_4627, XTL::EmuIDirect3DDevice8_EndPush),
OOVPA_TABLE_PATCH(D3DDevice_EndPush_1_0_4627, D3DDevice_EndPush),
// /* Not implemented yet.
// IDirect3DDevice8::BeginPushBuffer
OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginPushBuffer_1_0_5849, XTL::EmuIDirect3DDevice8_BeginPushBuffer),
OOVPA_TABLE_PATCH(D3DDevice_BeginPushBuffer_1_0_5849, D3DDevice_BeginPushBuffer),
// IDirect3DDevice8::EndPushBuffer
OOVPA_TABLE_PATCH(IDirect3DDevice8_EndPushBuffer_1_0_5849, XTL::EmuIDirect3DDevice8_EndPushBuffer),
OOVPA_TABLE_PATCH(D3DDevice_EndPushBuffer_1_0_5849, D3DDevice_EndPushBuffer),
// */
// IDirect3DDevice8::RunPushBuffer
OOVPA_TABLE_PATCH(IDirect3DDevice8_RunPushBuffer_1_0_5849, XTL::EmuIDirect3DDevice8_RunPushBuffer),
OOVPA_TABLE_PATCH(D3DDevice_RunPushBuffer_1_0_5849, D3DDevice_RunPushBuffer),
// IDirect3DDevice8::Begin (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_Begin_1_0_5233, XTL::EmuIDirect3DDevice8_Begin),
OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_5233, D3DDevice_Begin),
// IDirect3DDevice8::BeginStateBig
OOVPA_TABLE_XREF(IDirect3DDevice8_BeginStateBig_1_0_5849),
OOVPA_TABLE_XREF(D3DDevice_BeginStateBig_1_0_5849),
// IDirect3DDevice8::GetTransform (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_GetTransform_1_0_4361, XTL::EmuIDirect3DDevice8_GetTransform),
OOVPA_TABLE_PATCH(D3DDevice_GetTransform_1_0_4361, D3DDevice_GetTransform),
// IDirect3DDevice8::SetTransform (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTransform_1_0_5558, XTL::EmuIDirect3DDevice8_SetTransform),
OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_5558, D3DDevice_SetTransform),
// IDirect3DDevice8::DrawIndexedVertices
OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_5849, XTL::EmuIDirect3DDevice8_DrawIndexedVertices),
OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_5849, D3DDevice_DrawIndexedVertices),
// IDirect3DDevice8::DrawIndexedVerticesUP
OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_5849, XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP),
OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVerticesUP_1_0_5849, D3DDevice_DrawIndexedVerticesUP),
// IDirect3DDevice8::SetMaterial
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_5849, XTL::EmuIDirect3DDevice8_SetMaterial),
OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_5849, D3DDevice_SetMaterial),
// IDirect3DDevice8::SetStreamSource (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetStreamSource_1_0_4361, XTL::EmuIDirect3DDevice8_SetStreamSource),
OOVPA_TABLE_PATCH(D3DDevice_SetStreamSource_1_0_4361, D3DDevice_SetStreamSource),
// IDirect3DResource8::Register (* unchanged since 3925 *)
OOVPA_TABLE_PATCH(IDirect3DResource8_Register_1_0_3925, XTL::EmuIDirect3DResource8_Register),
OOVPA_TABLE_PATCH(D3DResource_Register_1_0_3925, D3DResource_Register),
// IDirect3DResource8::AddRef (* unchanged since 3925 *)
OOVPA_TABLE_PATCH(IDirect3DResource8_AddRef_1_0_3925, XTL::EmuIDirect3DResource8_AddRef),
OOVPA_TABLE_PATCH(D3DResource_AddRef_1_0_3925, D3DResource_AddRef),
// IDirect3DResource8::Release (* unchanged since 3925 *)
OOVPA_TABLE_PATCH(IDirect3DResource8_Release_1_0_3925, XTL::EmuIDirect3DResource8_Release),
OOVPA_TABLE_PATCH(D3DResource_Release_1_0_3925, D3DResource_Release),
// IDirect3DResource8::IsBusy (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DResource8_IsBusy_1_0_4361, XTL::EmuIDirect3DResource8_IsBusy),
OOVPA_TABLE_PATCH(D3DResource_IsBusy_1_0_4361, D3DResource_IsBusy),
// IDirect3DSurface8::GetDesc (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DSurface8_GetDesc_1_0_4361, XTL::EmuIDirect3DSurface8_GetDesc),
OOVPA_TABLE_PATCH(D3DSurface_GetDesc_1_0_4361, D3DSurface_GetDesc),
// IDirect3DDevice8::CopyRects (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_CopyRects_1_0_5233, XTL::EmuIDirect3DDevice8_CopyRects),
OOVPA_TABLE_PATCH(D3DDevice_CopyRects_1_0_5233, D3DDevice_CopyRects),
// IDirect3DPalette8::Lock2 (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DPalette8_Lock2_1_0_5233, XTL::EmuIDirect3DPalette8_Lock2),
OOVPA_TABLE_PATCH(D3DPalette_Lock2_1_0_5233, D3DPalette_Lock2),
// IDirect3DTexture8::LockRect
OOVPA_TABLE_PATCH(IDirect3DTexture8_LockRect_1_0_5849, XTL::EmuIDirect3DTexture8_LockRect),
OOVPA_TABLE_PATCH(D3DTexture_LockRect_1_0_5849, D3DTexture_LockRect),
// IDirect3DSurface8::LockRect (* unchanged since 3925 *)
OOVPA_TABLE_PATCH(IDirect3DSurface8_LockRect_1_0_3925, XTL::EmuIDirect3DSurface8_LockRect),
OOVPA_TABLE_PATCH(D3DSurface_LockRect_1_0_3925, D3DSurface_LockRect),
// IDirect3DBaseTexture8::GetLevelCount (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DBaseTexture8_GetLevelCount_1_0_4361, XTL::EmuIDirect3DBaseTexture8_GetLevelCount),
OOVPA_TABLE_PATCH(D3DBaseTexture_GetLevelCount_1_0_4361, D3DBaseTexture_GetLevelCount),
// IDirect3DTexture8::GetSurfaceLevel2 (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirect3DTexture8_GetSurfaceLevel2_1_0_4627, XTL::EmuIDirect3DTexture8_GetSurfaceLevel2),
OOVPA_TABLE_PATCH(D3DTexture_GetSurfaceLevel2_1_0_4627, D3DTexture_GetSurfaceLevel2),
// IDirect3DDevice8::SetLight
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_5558, XTL::EmuIDirect3DDevice8_SetLight),
OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_5558, D3DDevice_SetLight),
// IDirect3DDevice8::CreateVertexBuffer2
OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer2_1_0_5849, XTL::EmuIDirect3DDevice8_CreateVertexBuffer2),
// IDirect3DVertexBuffer8_Lock
OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock_1_0_5849, XTL::EmuIDirect3DVertexBuffer8_Lock),
OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer2_1_0_5849, D3DDevice_CreateVertexBuffer2),
// D3DVertexBuffer_Lock
OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock_1_0_5849, D3DVertexBuffer_Lock),
// IDirect3DVertexBuffer8::Lock2
OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock2_1_0_5849, XTL::EmuIDirect3DVertexBuffer8_Lock2),
// IDirect3DDevice8_LightEnable
OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_5849, XTL::EmuIDirect3DDevice8_LightEnable),
// IDirect3DDevice8_DrawVertices
OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVertices_1_0_5849, XTL::EmuIDirect3DDevice8_DrawVertices),
// IDirect3D8_AllocContiguousMemory
OOVPA_TABLE_PATCH(IDirect3D8_AllocContiguousMemory_1_0_5849, XTL::EmuIDirect3D8_AllocContiguousMemory),
// IDirect3DTexture8_GetLevelDesc
OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5849, XTL::EmuGet2DSurfaceDesc),
OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock2_1_0_5849, D3DVertexBuffer_Lock2),
// D3DDevice_LightEnable
OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_5849, D3DDevice_LightEnable),
// D3DDevice_DrawVertices
OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_5849, D3DDevice_DrawVertices),
// D3D_AllocContiguousMemory
OOVPA_TABLE_PATCH(D3D_AllocContiguousMemory_1_0_5849, D3D_AllocContiguousMemory),
// D3DTexture_GetLevelDesc
OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5849, Get2DSurfaceDesc),
// IDirect3DDevice8::CreateTexture2
OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture2_1_0_5849, XTL::EmuIDirect3DDevice8_CreateTexture2),
OOVPA_TABLE_PATCH(D3DDevice_CreateTexture2_1_0_5849, D3DDevice_CreateTexture2),
// Lock2DSurface
OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, XTL::EmuLock2DSurface),
OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, Lock2DSurface),
// IDirect3DDevice8::SetVertexShaderConstant4
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant4_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant4),
OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant4_1_0_4627, D3DDevice_SetVertexShaderConstant4),
// IDirect3DDevice8::SetVertexShaderConstant1
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant1_1_0_5849, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant1),
OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant1_1_0_5849, D3DDevice_SetVertexShaderConstant1),
// IDirect3DDevice8::DrawVerticesUP
OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVerticesUP_1_0_5849, XTL::EmuIDirect3DDevice8_DrawVerticesUP),
OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUP_1_0_5849, D3DDevice_DrawVerticesUP),
// IDirect3DDevice8::SetRenderTarget
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderTarget_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderTarget),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_5849, D3DDevice_SetRenderTarget),
// IDirect3DDevice8::SetShaderConstantMode (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetShaderConstantMode_1_0_5233, XTL::EmuIDirect3DDevice8_SetShaderConstantMode),
OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_5233, D3DDevice_SetShaderConstantMode),
// IDirect3DDevice8::SetViewport
OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_5849, XTL::EmuIDirect3DDevice8_SetViewport),
OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_5849, D3DDevice_SetViewport),
// IDirect3DDevice8::BlockUntilVerticalBlank
OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_5849, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank),
OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_5849, D3DDevice_BlockUntilVerticalBlank),
// IDirect3DDevice8::SetRenderState_FrontFace (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FrontFace_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_FrontFace),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FrontFace_1_0_4134, D3DDevice_SetRenderState_FrontFace),
// IDirect3DDevice8::SetBackMaterial
OOVPA_TABLE_PATCH(D3DDevice_SetBackMaterial_1_0_5849, XTL::EmuIDirect3DDevice8_SetBackMaterial),
OOVPA_TABLE_PATCH(D3DDevice_SetBackMaterial_1_0_5849, D3DDevice_SetBackMaterial),
// IDirect3DDevice8::SetRenderState_TwoSidedLighting
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TwoSidedLighting_1_0_5849, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TwoSidedLighting_1_0_5849, D3DDevice_SetTextureState_TwoSidedLighting),
// IDirect3D8::KickOffAndWaitForIdle (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3D8_KickOffAndWaitForIdle_1_0_5233, XTL::EmuIDirect3D8_KickOffAndWaitForIdle),
OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle_1_0_5233, D3D_KickOffAndWaitForIdle),
// D3D::SetTileNoWait
OOVPA_TABLE_PATCH(D3DDevice_SetTileNoWait_1_0_5849, XTL::EmuIDirect3DDevice8_SetTileNoWait),
OOVPA_TABLE_PATCH(D3DDevice_SetTileNoWait_1_0_5849, D3DDevice_SetTileNoWait),
// IDirect3DDevice8::SetGammaRamp (* unchanged since 4928 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetGammaRamp_1_0_4928, XTL::EmuIDirect3DDevice8_SetGammaRamp),
OOVPA_TABLE_PATCH(D3DDevice_SetGammaRamp_1_0_4928, D3DDevice_SetGammaRamp),
// IDirect3DDevice8::GetGammaRamp (* unchanged since 4034 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_GetGammaRamp_1_0_4034, XTL::EmuIDirect3DDevice8_GetGammaRamp),
OOVPA_TABLE_PATCH(D3DDevice_GetGammaRamp_1_0_4034, D3DDevice_GetGammaRamp),
// D3DDevice_SetSwapCallback
OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_5849, XTL::EmuIDirect3DDevice8_SetSwapCallback),
OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_5849, D3DDevice_SetSwapCallback),
// IDirect3DDevice8::GetRenderTarget2 (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_GetRenderTarget2_1_0_5233, XTL::EmuIDirect3DDevice8_GetRenderTarget2),
OOVPA_TABLE_PATCH(D3DDevice_GetRenderTarget2_1_0_5233, D3DDevice_GetRenderTarget2),
// D3DDevice_SetRenderState_StencilFail
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_5849, D3DDevice_SetRenderState_StencilFail),
// D3DDevice_SetRenderState_VertexBlend
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_5849, D3DDevice_SetRenderState_VertexBlend),
// IDirect3DDevice8::Reset (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_Reset_1_0_4134, XTL::EmuIDirect3DDevice8_Reset),
OOVPA_TABLE_PATCH(D3DDevice_Reset_1_0_4134, D3DDevice_Reset),
// IDirect3DDevice::Release
OOVPA_TABLE_PATCH(IDirect3DDevice8_Release_1_0_5849, XTL::EmuIDirect3DDevice8_Release),
// IDirect3DDevice8_InsertCallback (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(D3DDevice_InsertCallback_1_0_5558, XTL::EmuIDirect3DDevice8_InsertCallback),
OOVPA_TABLE_PATCH(D3DDevice_Release_1_0_5849, D3DDevice_Release),
// D3DDevice_InsertCallback (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(D3DDevice_InsertCallback_1_0_5558, D3DDevice_InsertCallback),
// D3DDevice::SetRenderState_LineWidth
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_5849, D3DDevice_SetRenderState_LineWidth),
// D3DDevice_SetRenderState_SampleAlpha (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_SampleAlpha_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_SampleAlpha),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_SampleAlpha_1_0_5233, D3DDevice_SetRenderState_SampleAlpha),
// IDirect3DDevice8::SetTextureState_ColorKeyColor (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_ColorKeyColor_1_0_4134, XTL::EmuIDirect3DDevice8_SetTextureState_ColorKeyColor),
OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_ColorKeyColor_1_0_4134, D3DDevice_SetTextureState_ColorKeyColor),
// IDirect3DDevice8::EnableOverlay (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_EnableOverlay_1_0_4361, XTL::EmuIDirect3DDevice8_EnableOverlay),
OOVPA_TABLE_PATCH(D3DDevice_EnableOverlay_1_0_4361, D3DDevice_EnableOverlay),
// D3DDevice_SetRenderState_LogicOp (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_5558, XTL::EmuIDirect3DDevice8_SetRenderState_LogicOp),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_5558, D3DDevice_SetRenderState_LogicOp),
// D3DDevice_SetRenderState_MultiSampleMask
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_5849, D3DDevice_SetRenderState_MultiSampleMask),
// D3DDevice_SetPalette
OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_5849, XTL::EmuIDirect3DDevice8_SetPalette),
OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_5849, D3DDevice_SetPalette),
// D3DDevice_LoadVertexShaderProgram
OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShaderProgram_1_0_5849, XTL::EmuIDirect3DDevice8_LoadVertexShaderProgram),
OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShaderProgram_1_0_5849, D3DDevice_LoadVertexShaderProgram),
// D3DDevice_GetPushBufferOffset
OOVPA_TABLE_PATCH(D3DDevice_GetPushBufferOffset_1_0_5849, XTL::EmuIDirect3DDevice8_GetPushBufferOffset),
OOVPA_TABLE_PATCH(D3DDevice_GetPushBufferOffset_1_0_5849, D3DDevice_GetPushBufferOffset),
// D3D::MakeRequestedSpace
OOVPA_TABLE_XREF(D3D_MakeRequestedSpace_1_0_5849),
// D3D::Unknown
OOVPA_TABLE_XREF(D3D_Unknown_1_0_5849),
// IDirect3DDevice8::SetVertexShaderConstantNotInline (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstantNotInline_1_0_5233, XTL::EmuIDirect3DDevice8_SetVertexShaderConstantNotInline),
OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstantNotInline_1_0_5233, D3DDevice_SetVertexShaderConstantNotInline),
// D3DDevice_FlushVertexCache
OOVPA_TABLE_PATCH(D3DDevice_FlushVertexCache_1_0_5849, XTL::EmuIDirect3DDevice8_FlushVertexCache),
OOVPA_TABLE_PATCH(D3DDevice_FlushVertexCache_1_0_5849, D3DDevice_FlushVertexCache),
// D3DDevice_GetVertexShaderSize (* unchanged since 3925 *)
OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderSize_1_0_3925, XTL::EmuIDirect3DDevice8_GetVertexShaderSize),
OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderSize_1_0_3925, D3DDevice_GetVertexShaderSize),
// IDirect3DDevice8::LoadVertexShader (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_LoadVertexShader_1_0_5233, XTL::EmuIDirect3DDevice8_LoadVertexShader),
OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShader_1_0_5233, D3DDevice_LoadVertexShader),
// IDirect3DDevice8::SelectVertexShader (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SelectVertexShader_1_0_5558, XTL::EmuIDirect3DDevice8_SelectVertexShader),
OOVPA_TABLE_PATCH(D3DDevice_SelectVertexShader_1_0_5558, D3DDevice_SelectVertexShader),
// D3DDevice_RunVertexStateShader (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(X_D3DDevice_RunVertexStateShader_1_0_4627, XTL::EmuIDirect3DDevice8_RunVertexStateShader),
OOVPA_TABLE_PATCH(X_D3DDevice_RunVertexStateShader_1_0_4627, D3DDevice_RunVertexStateShader),
// IDirect3DDevice8::AddRef
OOVPA_TABLE_PATCH(D3DDevice_AddRef_1_0_5849, XTL::EmuIDirect3DDevice8_AddRef),
OOVPA_TABLE_PATCH(D3DDevice_AddRef_1_0_5849, D3DDevice_AddRef),
// D3D::ClearStateBlockFlags
OOVPA_TABLE_XREF(D3D_ClearStateBlockFlags_1_0_5849),
// D3D::RecordStateBlock
OOVPA_TABLE_XREF(D3D_RecordStateBlock_1_0_5849),
// IDirect3DDevice8::BeginStateBlock
OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginStateBlock_1_0_4361, XTL::EmuIDirect3DDevice8_BeginStateBlock),
OOVPA_TABLE_PATCH(D3DDevice_BeginStateBlock_1_0_4361, D3DDevice_BeginStateBlock),
// IDirect3DDevice8::EndStateBlock
OOVPA_TABLE_PATCH(IDirect3DDevice8_EndStateBlock_1_0_4361, XTL::EmuIDirect3DDevice8_EndStateBlock),
OOVPA_TABLE_PATCH(D3DDevice_EndStateBlock_1_0_4361, D3DDevice_EndStateBlock),
// D3DDevice_SetRenderState_BackFillMode
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_5849, D3DDevice_SetRenderState_BackFillMode),
// D3DDevice_SetRenderState_Dxt1NoiseEnable
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_5849, D3DDevice_SetRenderState_Dxt1NoiseEnable),
// D3DDevice_GetTile
OOVPA_TABLE_PATCH(D3DDevice_GetTile_1_0_5849, XTL::EmuIDirect3DDevice8_GetTile),
OOVPA_TABLE_PATCH(D3DDevice_GetTile_1_0_5849, D3DDevice_GetTile),
// D3D::CDevice::KickOff
OOVPA_TABLE_PATCH(D3D_CDevice_KickOff_1_0_5849, XTL::EmuD3DDevice_KickOff),
OOVPA_TABLE_PATCH(D3D_CDevice_KickOff_1_0_5849, D3DDevice_KickOff),
// IDirect3DDevice8::SetRenderState_RopZCmpAlwaysRead (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead_1_0_4134, D3DDevice_SetRenderState_RopZCmpAlwaysRead),
// IDirect3DDevice8::SetRenderState_RopZRead (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_RopZRead_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_RopZRead),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZRead_1_0_4134, D3DDevice_SetRenderState_RopZRead),
// IDirect3DDevice8::SetRenderState_DoNotCullUncompressed (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_DoNotCullUncompressed_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_DoNotCullUncompressed),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_DoNotCullUncompressed_1_0_4134, D3DDevice_SetRenderState_DoNotCullUncompressed),
// IDirect3DDevice8::SetSoftDisplayFilter
OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_5849, XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter),
OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_5849, D3DDevice_SetSoftDisplayFilter),
// IDirect3DDevice8::SetFlickerFilter
OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_5849, XTL::EmuIDirect3DDevice8_SetFlickerFilter),
OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_5849, D3DDevice_SetFlickerFilter),
// IDirect3DDevice8::SetRenderState_MultiSampleMode
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_5849, D3DDevice_SetRenderState_MultiSampleMode),
// IDirect3DDevice8::SetRenderState_MultiSampleRenderTargetMode
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5849, D3DDevice_SetRenderState_MultiSampleRenderTargetMode),
// IDirect3DDevice8::SetRenderState_MultiSampleAntiAlias
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_5849, D3DDevice_SetRenderState_MultiSampleAntiAlias),
// IDirect3DDevice8::SetRenderState_MultiSampleMask
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_5849, D3DDevice_SetRenderState_MultiSampleMode),
// IDirect3DDevice8::SetPixelShaderConstant
OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_5849, XTL::EmuIDirect3DDevice8_SetPixelShaderConstant),
OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_5849, D3DDevice_SetPixelShaderConstant),
// D3DDevice_GetDisplayFieldStatus
OOVPA_TABLE_PATCH(D3DDevice_GetDisplayFieldStatus_1_0_5849, XTL::EmuIDirect3DDevice8_GetDisplayFieldStatus),
OOVPA_TABLE_PATCH(D3DDevice_GetDisplayFieldStatus_1_0_5849, D3DDevice_GetDisplayFieldStatus),
// IDirect3DCubeTexture8::GetCubeMapSurface2 (* Unchanged since 4627 *)
OOVPA_TABLE_PATCH(D3DCubeTexture_GetCubeMapSurface2_1_0_4627, XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface2),
OOVPA_TABLE_PATCH(D3DCubeTexture_GetCubeMapSurface2_1_0_4627, D3DCubeTexture_GetCubeMapSurface2),
// IDirect3DDevice8::SetVertexShaderConstant1Fast (* Unchanged since 5558 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant1Fast_1_0_5558, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant1),
OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant1Fast_1_0_5558, D3DDevice_SetVertexShaderConstant1),
// D3DDevice_SetPixelShaderProgram (* Unchanged since 5558 *)
OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderProgram_1_0_5558, XTL::EmuIDirect3DDevice8_SetPixelShaderProgram),
OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderProgram_1_0_5558, D3DDevice_SetPixelShaderProgram),
// IDirect3DDevice8::SetScissors
OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_5849, XTL::EmuIDirect3DDevice8_SetScissors),
OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_5849, D3DDevice_SetScissors),
// IDirect3DDevice8::GetScissors
OOVPA_TABLE_PATCH(D3DDevice_GetScissors_1_0_5849, XTL::EmuIDirect3DDevice8_GetScissors),
OOVPA_TABLE_PATCH(D3DDevice_GetScissors_1_0_5849, D3DDevice_GetScissors),
// IDirect3DDevice8::GetBackMaterial
OOVPA_TABLE_PATCH(D3DDevice_GetBackMaterial_1_0_5849, XTL::EmuIDirect3DDevice8_GetBackMaterial),
OOVPA_TABLE_PATCH(D3DDevice_GetBackMaterial_1_0_5849, D3DDevice_GetBackMaterial),
// IDirect3DDevice8::ApplyStateBlock (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(D3DDevice_ApplyStateBlock_1_0_4627, XTL::EmuIDirect3DDevice8_ApplyStateBlock),
OOVPA_TABLE_PATCH(D3DDevice_ApplyStateBlock_1_0_4627, D3DDevice_ApplyStateBlock),
// IDirect3DDevice8::CaptureStateBlock
OOVPA_TABLE_PATCH(D3DDevice_CaptureStateBlock_1_0_5849, XTL::EmuIDirect3DDevice8_CaptureStateBlock),
OOVPA_TABLE_PATCH(D3DDevice_CaptureStateBlock_1_0_5849, D3DDevice_CaptureStateBlock),
// IDirect3DDevice8::DeleteStateBlock
OOVPA_TABLE_PATCH(D3DDevice_DeleteStateBlock_1_0_5849, XTL::EmuIDirect3DDevice8_DeleteStateBlock),
OOVPA_TABLE_PATCH(D3DDevice_DeleteStateBlock_1_0_5849, D3DDevice_DeleteStateBlock),
// IDirect3DDevice8::SetRenderState_StencilCullEnable (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilCullEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_StencilCullEnable),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilCullEnable_1_0_4134, D3DDevice_SetRenderState_StencilCullEnable),
// IDirect3DDevice8::SetRenderState_RopZCmpAlwaysRead
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead_1_0_5849, XTL::EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead_1_0_5849, D3DDevice_SetRenderState_RopZCmpAlwaysRead),
// D3DDevice_GetTexture2
OOVPA_TABLE_PATCH(D3DDevice_GetTexture2_1_0_5849, XTL::EmuIDirect3DDevice8_GetTexture2),
OOVPA_TABLE_PATCH(D3DDevice_GetTexture2_1_0_5849, D3DDevice_GetTexture2),
// IDirect3DDevice8::SetRenderTargetFast (* unchanged since 5344 *)
OOVPA_TABLE_PATCH(D3DDevice_SetRenderTargetFast_1_0_5344, XTL::EmuIDirect3DDevice8_SetRenderTargetFast),
OOVPA_TABLE_PATCH(D3DDevice_SetRenderTargetFast_1_0_5344, D3DDevice_SetRenderTargetFast),
// D3DDevice_SetDepthClipPlanes
OOVPA_TABLE_PATCH(D3DDevice_SetDepthClipPlanes_1_0_5849, XTL::EmuIDirect3DDevice8_SetDepthClipPlanes),
OOVPA_TABLE_PATCH(D3DDevice_SetDepthClipPlanes_1_0_5849, D3DDevice_SetDepthClipPlanes),
};
// ******************************************************************

4
src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.h
View File

@ -36,8 +36,8 @@
#include "OOVPA.h"
extern SOOVPA<13> IDirect3DDevice8_SetRenderState_CullMode_1_0_5849_LTCG;
extern SOOVPA<10> IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_5849_LTCG;
extern SOOVPA<13> D3DDevice_SetRenderState_CullMode_1_0_5849_LTCG;
extern SOOVPA<10> D3DDevice_SetTextureState_TexCoordIndex_1_0_5849_LTCG;
extern OOVPATable D3D8LTCG_1_0_5849[];
extern uint32 D3D8LTCG_1_0_5849_SIZE;

442
src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.inl
View File

File diff suppressed because it is too large Load Diff

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

@ -4045,71 +4045,71 @@ OOVPA_END;
OOVPATable DSound_1_0_3936[] = {
// DirectSoundCreate
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_3936, XTL::EmuDirectSoundCreate),
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_3936, DirectSoundCreate),
// DirectSoundDoWorkB (XREF)
OOVPA_TABLE_XREF(DirectSoundDoWorkB_1_0_3936),
// DirectSoundDoWorkA (XREF)
OOVPA_TABLE_XREF(DirectSoundDoWorkA_1_0_3936),
// DirectSoundDoWork
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_3936, XTL::EmuDirectSoundDoWork),
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_3936, DirectSoundDoWork),
// CDirectSound_CreateSoundStream
OOVPA_TABLE_XREF(CDirectSound_CreateSoundStream_1_0_3936),
// IDirectSound8_CreateStream
OOVPA_TABLE_PATCH(IDirectSound8_CreateStream_1_0_3936, XTL::EmuIDirectSound8_CreateStream),
OOVPA_TABLE_PATCH(IDirectSound8_CreateStream_1_0_3936, IDirectSound8_CreateStream),
// CDirectSound_CreateSoundBuffer
OOVPA_TABLE_XREF(CDirectSound_CreateSoundBuffer_1_0_3936),
// IDirectSound8_CreateBuffer
OOVPA_TABLE_PATCH(IDirectSound8_CreateBuffer_1_0_3936, XTL::EmuIDirectSound8_CreateBuffer),
OOVPA_TABLE_PATCH(IDirectSound8_CreateBuffer_1_0_3936, IDirectSound8_CreateBuffer),
// IDirectSoundBuffer8::Release
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, XTL::EmuIDirectSoundBuffer8_Release),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, IDirectSoundBuffer8_Release),
// IDirectSoundBuffer8::SetPitchB (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_SetPitchB_1_0_3936),
// IDirectSoundBuffer8::SetPitchA (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_SetPitchA_1_0_3936),
// IDirectSoundBuffer8::SetPitch
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPitch_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetPitch),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPitch_1_0_3936, IDirectSoundBuffer8_SetPitch),
// CMcpxBuffer::GetStatus (XREF)
OOVPA_TABLE_XREF(CMcpxBuffer_GetStatus_1_0_3936),
// CDirectSoundBuffer::GetStatus (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_GetStatus_1_0_3936),
// IDirectSoundBuffer8::GetStatus
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_3936, XTL::EmuIDirectSoundBuffer8_GetStatus),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_3936, IDirectSoundBuffer8_GetStatus),
// IDirectSoundBuffer8::SetVolumeB (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_SetVolumeB_1_0_3936),
// IDirectSoundBuffer8::SetVolumeA (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_SetVolumeA_1_0_3936),
// IDirectSoundBuffer8::SetVolume
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVolume_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetVolume),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVolume_1_0_3936, IDirectSoundBuffer8_SetVolume),
// IDirectSoundBuffer8::SetCurrentPositionB (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_SetCurrentPositionB_1_0_3936),
// IDirectSoundBuffer8::SetCurrentPositionA (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_SetCurrentPositionA_1_0_3936),
// IDirectSoundBuffer8::SetCurrentPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetCurrentPosition_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetCurrentPosition_1_0_3936, IDirectSoundBuffer8_SetCurrentPosition),
// IDirectSoundBuffer8::SetPlayRegionA (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_SetPlayRegionA_1_0_3936),
// IDirectSoundBuffer8::SetPlayRegion
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetPlayRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_3936, IDirectSoundBuffer8_SetPlayRegion),
// IDirectSoundBuffer8::LockA (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_LockA_1_0_3936),
// IDirectSoundBuffer8::Lock
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Lock_1_0_3936, XTL::EmuIDirectSoundBuffer8_Lock),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Lock_1_0_3936, IDirectSoundBuffer8_Lock),
// IDirectSoundBuffer8::SetHeadroomA (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_SetHeadroomA_1_0_3936),
// IDirectSoundBuffer8::SetHeadroom
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetHeadroom_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetHeadroom),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetHeadroom_1_0_3936, IDirectSoundBuffer8_SetHeadroom),
// IDirectSoundBuffer8::SetBufferDataA (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_SetBufferDataA_1_0_3936),
// IDirectSoundBuffer8::SetBufferData
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetBufferData),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_3936, IDirectSoundBuffer8_SetBufferData),
// CMcpxVoiceClient::SetMixBins (XRef)
OOVPA_TABLE_XREF(CMcpxVoiceClient_SetMixBins_1_0_3936),
// CDirectSoundVoice::SetMixBins (XRef)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMixBins_1_0_3936),
// IDirectSoundStream::SetMixBins
OOVPA_TABLE_PATCH(IDirectSoundStream_SetMixBins_1_0_3936, XTL::EmuCDirectSoundStream_SetMixBins),
OOVPA_TABLE_PATCH(IDirectSoundStream_SetMixBins_1_0_3936, CDirectSoundStream_SetMixBins),
// IDirectSoundBuffer8::SetMixBins
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBins_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetMixBins),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBins_1_0_3936, IDirectSoundBuffer8_SetMixBins),
// CMcpxBuffer::GetCurrentPosition
OOVPA_TABLE_XREF(CMcpxBuffer_GetCurrentPosition_1_0_3936),
// CMcpxBuffer::GetCurrentPosition
@ -4117,14 +4117,14 @@ OOVPATable DSound_1_0_3936[] = {
// CDirectSoundBuffer::GetCurrentPosition
OOVPA_TABLE_XREF(CDirectSoundBuffer_GetCurrentPosition_1_0_3936),
// IDirectSoundBuffer8::GetCurrentPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetCurrentPosition_1_0_3936, XTL::EmuIDirectSoundBuffer8_GetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetCurrentPosition_1_0_3936, IDirectSoundBuffer8_GetCurrentPosition),
// CDirectSoundBuffer_Play
OOVPA_TABLE_XREF(CDirectSoundBuffer_Play_1_0_3936),
// IDirectSoundBuffer8::Play
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play_1_0_3936, XTL::EmuIDirectSoundBuffer8_Play),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play_1_0_3936, IDirectSoundBuffer8_Play),
// IDirectSoundBuffer8::Play
/* {
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play2_1_0_3936, XTL::EmuIDirectSoundBuffer8_Play,
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play2_1_0_3936, IDirectSoundBuffer8_Play,
#ifdef _DEBUG_TRACE
"EmuIDirectSoundBuffer8_Play [YESSSS! IT WORKED!]"
@ -4133,29 +4133,29 @@ OOVPATable DSound_1_0_3936[] = {
// CDirectSoundBuffer::Stop
OOVPA_TABLE_XREF(CDirectSoundBuffer_Stop_1_0_3936),
// IDirectSoundBuffer8::Stop
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Stop_1_0_3936, XTL::EmuIDirectSoundBuffer8_Stop),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Stop_1_0_3936, IDirectSoundBuffer8_Stop),
// CMcpxVoiceClient_SetVolume
OOVPA_TABLE_XREF(CMcpxVoiceClient_SetVolume_1_0_3936),
// CDirectSoundStream_SetVolume
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_3936, XTL::EmuCDirectSoundStream_SetVolume),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_3936, CDirectSoundStream_SetVolume),
// CDirectSoundStream::SetConeAnglesB (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetConeAnglesB_1_0_3936),
// CDirectSoundStream::SetConeAnglesA (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetConeAnglesA_1_0_3936),
// CDirectSoundStream::SetConeAngles
OOVPA_TABLE_PATCH(CDirectSoundStream_SetConeAngles_1_0_3936, XTL::EmuCDirectSoundStream_SetConeAngles),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetConeAngles_1_0_3936, CDirectSoundStream_SetConeAngles),
// CDirectSoundStream::SetConeOutsideVolumeB (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetConeOutsideVolumeB_1_0_3936),
// CDirectSoundStream::SetConeOutsideVolumeA (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetConeOutsideVolumeA_1_0_3936),
// CDirectSoundStream::SetConeOutsideVolume
OOVPA_TABLE_PATCH(CDirectSoundStream_SetConeOutsideVolume_1_0_3936, XTL::EmuCDirectSoundStream_SetConeOutsideVolume),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetConeOutsideVolume_1_0_3936, CDirectSoundStream_SetConeOutsideVolume),
//// CDirectSoundStream::SetAllParametersB (XREF)
//OOVPA_TABLE_XREF(CDirectSoundStream_SetAllParametersB_1_0_3936),
//// CDirectSoundStream::SetAllParametersA (XREF)
//OOVPA_TABLE_XREFCDirectSoundStream_SetAllParametersA_1_0_3936),
//// CDirectSoundStream::SetAllParameters
//OOVPA_TABLE_PATCH(CDirectSoundStream_SetAllParameters_1_0_3936, XTL::EmuCDirectSoundStream_SetAllParameters),
//OOVPA_TABLE_PATCH(CDirectSoundStream_SetAllParameters_1_0_3936, CDirectSoundStream_SetAllParameters),
// CDirectSoundStream::SetMaxDistanceC (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetMaxDistanceC_1_0_3936),
// CDirectSoundStream::SetMaxDistanceB (XREF)
@ -4163,7 +4163,7 @@ OOVPATable DSound_1_0_3936[] = {
// CDirectSoundStream::SetMaxDistanceA (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetMaxDistanceA_1_0_3936),
// CDirectSoundStream::SetMaxDistance
OOVPA_TABLE_PATCH(CDirectSoundStream_SetMaxDistance_1_0_3936, XTL::EmuCDirectSoundStream_SetMaxDistance),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetMaxDistance_1_0_3936, CDirectSoundStream_SetMaxDistance),
// CDirectSoundStream::SetMinDistanceC (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetMinDistanceC_1_0_3936),
// CDirectSoundStream::SetMinDistanceB (XREF)
@ -4171,7 +4171,7 @@ OOVPATable DSound_1_0_3936[] = {
// CDirectSoundStream::SetMinDistanceA (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetMinDistanceA_1_0_3936),
// CDirectSoundStream::SetMinDistance
OOVPA_TABLE_PATCH(CDirectSoundStream_SetMinDistance_1_0_3936, XTL::EmuCDirectSoundStream_SetMinDistance),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetMinDistance_1_0_3936, CDirectSoundStream_SetMinDistance),
// CDirectSoundStream::SetVelocityC (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetVelocityC_1_0_3936),
// CDirectSoundStream::SetVelocityB (XREF)
@ -4179,11 +4179,11 @@ OOVPATable DSound_1_0_3936[] = {
// CDirectSoundStream::SetVelocityA (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetVelocityA_1_0_3936),
// CDirectSoundStream::SetVelocity
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVelocity_1_0_3936, XTL::EmuCDirectSoundStream_SetVelocity),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVelocity_1_0_3936, CDirectSoundStream_SetVelocity),
// CDirectSoundBuffer::SetVelocity (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetVelocity_1_0_3936),
// IDirectSoundBuffer8_SetVelocity
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVelocity_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVelocity_1_0_3936, IDirectSoundBuffer8_SetVelocity),
// CDirectSoundStream::SetConeOrientationC (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetConeOrientationC_1_0_3936),
// CDirectSoundStream::SetConeOrientationB (XREF)
@ -4191,7 +4191,7 @@ OOVPATable DSound_1_0_3936[] = {
// CDirectSoundStream::SetConeOrientationA (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetConeOrientationA_1_0_3936),
// CDirectSoundStream::SetConeOrientation
OOVPA_TABLE_PATCH(CDirectSoundStream_SetConeOrientation_1_0_3936, XTL::EmuCDirectSoundStream_SetConeOrientation),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetConeOrientation_1_0_3936, CDirectSoundStream_SetConeOrientation),
// CDirectSoundStream::SetPositionC (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetPositionC_1_0_3936),
// CDirectSoundStream::SetPositionB (XREF)
@ -4199,89 +4199,89 @@ OOVPATable DSound_1_0_3936[] = {
// CDirectSoundStream::SetPositionA (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetPositionA_1_0_3936),
// CDirectSoundStream::SetPosition
OOVPA_TABLE_PATCH(CDirectSoundStream_SetPosition_1_0_3936, XTL::EmuCDirectSoundStream_SetPosition),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetPosition_1_0_3936, CDirectSoundStream_SetPosition),
// CDirectSoundBuffer::SetPosition (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetPosition_1_0_3936),
// IDirectSoundBuffer8_SetPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPosition_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPosition_1_0_3936, IDirectSoundBuffer8_SetPosition),
// CDirectSoundStream::SetFrequencyB (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetFrequencyB_1_0_3936),
// CDirectSoundStream::SetFrequencyA (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_SetFrequencyA_1_0_3936),
// CDirectSoundStream::SetFrequency
OOVPA_TABLE_PATCH(CDirectSoundStream_SetFrequency_1_0_3936, XTL::EmuCDirectSoundStream_SetFrequency),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetFrequency_1_0_3936, CDirectSoundStream_SetFrequency),
// IDirectSoundBuffer8::SetFrequency
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetFrequency),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_3936, IDirectSoundBuffer8_SetFrequency),
// CMcpxVoiceClient::Set3dMode (XREF)
OOVPA_TABLE_XREF(CMcpxVoiceClient_Set3dMode_1_0_3936),
// CDirectSoundVoice::SetMode (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMode_1_0_3936),
// IDirectSoundBuffer8::SetMode
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMode_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetMode),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMode_1_0_3936, IDirectSoundBuffer8_SetMode),
// IDirectSoundStream::SetI3DL2SourceA (XREF)
/*
OOVPA_TABLE_XREF(IDirectSoundStream_SetI3DL2SourceA_1_0_3936),
// IDirectSoundStream::SetI3DL2Source
OOVPA_TABLE_PATCH(IDirectSoundStream_SetI3DL2Source_1_0_3936, XTL::EmuIDirectSoundStream_SetI3DL2Source),
OOVPA_TABLE_PATCH(IDirectSoundStream_SetI3DL2Source_1_0_3936, IDirectSoundStream_SetI3DL2Source),
*/
/*
// IDirectSoundStream::Unknown1
OOVPA_TABLE_PATCH(IDirectSoundStream_Unknown1_1_0_3936, XTL::EmuIDirectSoundStream_Unknown1),
OOVPA_TABLE_PATCH(IDirectSoundStream_Unknown1_1_0_3936, IDirectSoundStream_Unknown1),
*/
// IDirectSoundStream::SetHeadroomA (XREF)
OOVPA_TABLE_XREF(IDirectSoundStream_SetHeadroomA_1_0_3936),
// IDirectSoundStream::SetHeadroom
OOVPA_TABLE_PATCH(IDirectSoundStream_SetHeadroom_1_0_3936, XTL::EmuIDirectSoundStream_SetHeadroom),
OOVPA_TABLE_PATCH(IDirectSoundStream_SetHeadroom_1_0_3936, IDirectSoundStream_SetHeadroom),
// IDirectSound8::SetOrientation
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, XTL::EmuIDirectSound8_SetOrientation),
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, IDirectSound8_SetOrientation),
// CDirectSound::CommitDeferredSettingsB (XREF)
OOVPA_TABLE_XREF(CDirectSound_CommitDeferredSettingsB_1_0_3936),
// CDirectSound::CommitDeferredSettingsA (XREF)
OOVPA_TABLE_XREF(CDirectSound_CommitDeferredSettingsA_1_0_3936),
// CDirectSound::CommitDeferredSettings
OOVPA_TABLE_PATCH(CDirectSound_CommitDeferredSettings_1_0_3936, XTL::EmuCDirectSound_CommitDeferredSettings),
OOVPA_TABLE_PATCH(CDirectSound_CommitDeferredSettings_1_0_3936, CDirectSound_CommitDeferredSettings),
// IDirectSound8::Release
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, XTL::EmuIDirectSound8_Release),
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, IDirectSound8_Release),
// CDirectSound::SetDistanceFactorB (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDistanceFactorB_1_0_3936),
// CDirectSound::SetDistanceFactorA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDistanceFactorA_1_0_3936),
// IDirectSound8::SetDistanceFactor
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_3936, XTL::EmuIDirectSound8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_3936, IDirectSound8_SetDistanceFactor),
// CDirectSound::SetRolloffFactorB (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetRolloffFactorB_1_0_3936),
// CDirectSound::SetRolloffFactorA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetRolloffFactorA_1_0_3936),
// IDirectSound8::SetRolloffFactor
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_3936, XTL::EmuIDirectSound8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_3936, IDirectSound8_SetRolloffFactor),
// CDirectSound::SetMixBinHeadroomB (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetMixBinHeadroomB_1_0_3936),
// CDirectSound::SetMixBinHeadroomA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetMixBinHeadroomA_1_0_3936),
// IDirectSound8::SetMixBinHeadroom
OOVPA_TABLE_PATCH(IDirectSound8_SetMixBinHeadroom_1_0_3936, XTL::EmuIDirectSound8_SetMixBinHeadroom),
OOVPA_TABLE_PATCH(IDirectSound8_SetMixBinHeadroom_1_0_3936, IDirectSound8_SetMixBinHeadroom),
// CDirectSound::SetPositionB (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetPositionB_1_0_3936),
// CDirectSound::SetPositionA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetPositionA_1_0_3936),
// IDirectSound8::SetPosition
OOVPA_TABLE_PATCH(IDirectSound8_SetPosition_1_0_3936, XTL::EmuIDirectSound8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSound8_SetPosition_1_0_3936, IDirectSound8_SetPosition),
// CDirectSound::SetVelocityB (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetVelocityB_1_0_3936),
// CDirectSound::SetVelocityA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetVelocityA_1_0_3936),
// IDirectSound8::SetVelocity
OOVPA_TABLE_PATCH(IDirectSound8_SetVelocity_1_0_3936, XTL::EmuIDirectSound8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSound8_SetVelocity_1_0_3936, IDirectSound8_SetVelocity),
// CDirectSound::SetAllParametersB (XREF)
OOVPA_TABLE_XREF(CMcpxAPU_Set3dParameters_1_0_3936),
// CDirectSound::SetAllParametersA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetAllParameters_1_0_3936),
// IDirectSound8::SetAllParameters
OOVPA_TABLE_PATCH(IDirectSound_SetAllParameters_1_0_3936, XTL::EmuIDirectSound8_SetAllParameters),
OOVPA_TABLE_PATCH(IDirectSound_SetAllParameters_1_0_3936, IDirectSound8_SetAllParameters),
// IDirectSound8::DownloadEffectsImage
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, XTL::EmuIDirectSound8_DownloadEffectsImage),
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, IDirectSound8_DownloadEffectsImage),
// CDirectSoundStream::SetMode
OOVPA_TABLE_PATCH(CDirectSoundStream_SetMode_1_0_3936, XTL::EmuCDirectSoundStream_SetMode),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetMode_1_0_3936, CDirectSoundStream_SetMode),
// DirectSound::CMcpxBuffer::Play (XREF)
/*
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_Play_1_0_4361),
@ -4291,73 +4291,73 @@ OOVPATable DSound_1_0_3936[] = {
// CDirectSound::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDopplerFactor_1_0_3936),
// IDirectSound_SetDopplerFactor
OOVPA_TABLE_PATCH(IDirectSound_SetDopplerFactor_1_0_3936, XTL::EmuIDirectSound8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSound_SetDopplerFactor_1_0_3936, IDirectSound8_SetDopplerFactor),
// CSensaura3d::GetFullHRTFFilterPair (XREF)
OOVPA_TABLE_XREF(CSensaura3d_GetFullHRTFFilterPair_1_0_3936),
// DirectSoundUseFullHRTF
OOVPA_TABLE_PATCH(DirectSoundUseFullHRTF_1_0_3936, XTL::EmuDirectSoundUseFullHRTF),
OOVPA_TABLE_PATCH(DirectSoundUseFullHRTF_1_0_3936, DirectSoundUseFullHRTF),
// CDirectSound::GetCaps (XREF)
OOVPA_TABLE_XREF(CDirectSound_GetCaps_1_0_3936),
// IDirectSound_GetCaps
OOVPA_TABLE_PATCH(IDirectSound_GetCaps_1_0_3936, XTL::EmuIDirectSound8_GetCaps),
OOVPA_TABLE_PATCH(IDirectSound_GetCaps_1_0_3936, IDirectSound8_GetCaps),
// CDirectSoundVoice::SetConeAngles (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetConeAngles_1_0_3936),
// IDirectSoundBuffer_SetConeAngles
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetConeAngles_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetConeAngles),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetConeAngles_1_0_3936, IDirectSoundBuffer8_SetConeAngles),
// DirectSoundEnterCriticalSection (XREF)
OOVPA_TABLE_XREF(DirectSoundEnterCriticalSection_1_0_3936),
// DirectSoundUseFullHRTF
OOVPA_TABLE_PATCH(DirectSoundUseFullHRTF2_1_0_3936, XTL::EmuDirectSoundUseFullHRTF),
OOVPA_TABLE_PATCH(DirectSoundUseFullHRTF2_1_0_3936, DirectSoundUseFullHRTF),
// DirectSound::CDirectSoundBuffer::PlayEx (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_PlayEx_1_0_3936),
// IDirectSoundBuffer_PlayEx
OOVPA_TABLE_PATCH(IDirectSoundBuffer_PlayEx_1_0_3936, XTL::EmuIDirectSoundBuffer8_PlayEx),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_PlayEx_1_0_3936, IDirectSoundBuffer8_PlayEx),
// IDirectSound8::AddRef
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, XTL::EmuIDirectSound8_AddRef),
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, IDirectSound8_AddRef),
// DirectSoundGetSampleTime
OOVPA_TABLE_PATCH(DirectSoundGetSampleTime_1_0_3936, XTL::EmuDirectSoundGetSampleTime),
OOVPA_TABLE_PATCH(DirectSoundGetSampleTime_1_0_3936, DirectSoundGetSampleTime),
// IDirectSoundBuffer_AddRef
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_AddRef_1_0_3936, XTL::EmuIDirectSoundBuffer8_AddRef),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_AddRef_1_0_3936, IDirectSoundBuffer8_AddRef),
// CDirectSoundBuffer::SetMinDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMinDistance_1_0_3936),
// IDirectSoundBuffer_SetMinDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetMinDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_3936, IDirectSoundBuffer8_SetMinDistance),
// CDirectSoundBuffer::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMaxDistance_1_0_3936),
// IDirectSoundBuffer_SetMaxDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetMaxDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_3936, IDirectSoundBuffer8_SetMaxDistance),
// CMcpxVoiceClient::Commit3dSettings (XREF)
OOVPA_TABLE_XREF(CMcpxVoiceClient_Commit3dSettings_1_0_3936),
// CMcpxVoiceClient::SetI3DL2Source (XREF)
OOVPA_TABLE_XREF(CMcpxVoiceClient_SetI3DL2Source_1_0_3936),
// CDirectSoundVoice::SetI3DL2Source (XREF)
OOVPA_TABLE_PATCH(CDirectSoundVoice_SetI3DL2Source_1_0_3936, XTL::EmuCDirectSoundStream_SetI3DL2Source),
OOVPA_TABLE_PATCH(CDirectSoundVoice_SetI3DL2Source_1_0_3936, CDirectSoundStream_SetI3DL2Source),
// IDirectSoundBuffer_SetI3DL2Source
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetI3DL2Source_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetI3DL2Source),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetI3DL2Source_1_0_3936, IDirectSoundBuffer8_SetI3DL2Source),
// CDirectSoundVoice::SetMixBinVolumes
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMixBinVolumes_1_0_3936),
// IDirectSoundBuffer_SetMixBinVolumes
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMixBinVolumes_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetMixBinVolumes),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMixBinVolumes_1_0_3936, IDirectSoundBuffer8_SetMixBinVolumes),
// CDirectSound_SetI3DL2Listener
OOVPA_TABLE_XREF(CDirectSound_SetI3DL2Listener_1_0_3936),
// IDirectSound8_SetI3DL2Listener
OOVPA_TABLE_PATCH(IDirectSound_SetI3DL2Listener_1_0_3936, XTL::EmuIDirectSound8_SetI3DL2Listener),
OOVPA_TABLE_PATCH(IDirectSound_SetI3DL2Listener_1_0_3936, IDirectSound8_SetI3DL2Listener),
// DirectSound::CDirectSound::EnableHeadphones (XREF)
OOVPA_TABLE_XREF(CDirectSound_EnableHeadphones_1_0_3936),
// EmuIDirectSound_EnableHeadphones
OOVPA_TABLE_PATCH(IDirectSound_EnableHeadphones_1_0_3936, XTL::EmuIDirectSound_EnableHeadphones),
OOVPA_TABLE_PATCH(IDirectSound_EnableHeadphones_1_0_3936, IDirectSound_EnableHeadphones),
// CDirectSoundStream::SetMixBinVolumes
OOVPA_TABLE_PATCH(CDirectSoundStream_SetMixBinVolumes_1_0_3936, XTL::EmuCDirectSoundStream_SetMixBinVolumes),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetMixBinVolumes_1_0_3936, CDirectSoundStream_SetMixBinVolumes),
// CDirectSoundStream::SetI3DL2Source
/*
OOVPA_TABLE_PATCH(CDirectSoundStream_SetI3DL2Source_1_0_3936, XTL::EmuCDirectSoundStream_SetI3DL2Source),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetI3DL2Source_1_0_3936, CDirectSoundStream_SetI3DL2Source),
*/
// CDirectSoundBuffer_SetNotificationPositions
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetNotificationPositions_1_0_3936),
// IDirectSoundBuffer_SetNotificationPositions
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetNotificationPositions_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetNotificationPositions),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetNotificationPositions_1_0_3936, IDirectSoundBuffer8_SetNotificationPositions),
// CDirectSoundStream::Pause
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_3936, XTL::EmuCDirectSoundStream_Pause),
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_3936, CDirectSoundStream_Pause),
};
// ******************************************************************

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

@ -389,43 +389,43 @@ OOVPA_END;
OOVPATable DSound_1_0_4134[] = {
// DirectSoundCreate
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4134, XTL::EmuDirectSoundCreate),
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4134, DirectSoundCreate),
// IDirectSound8::AddRef (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, XTL::EmuIDirectSound8_AddRef),
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, IDirectSound8_AddRef),
// IDirectSound8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, XTL::EmuIDirectSound8_Release),
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, IDirectSound8_Release),
// IDirectSound8::DownloadEffectsImage (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, XTL::EmuIDirectSound8_DownloadEffectsImage),
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, IDirectSound8_DownloadEffectsImage),
// IDirectSound8::CreateSoundBuffer
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4134, XTL::EmuIDirectSound8_CreateSoundBuffer),
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4134, IDirectSound8_CreateSoundBuffer),
// DirectSound::CDirectSoundVoice::SetHeadroom (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetHeadroom_1_0_4134),
// DirectSound::CDirectSoundBuffer::SetHeadroom (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetHeadroom_1_0_4134),
// IDirectSoundBuffer_SetHeadroom
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetHeadroom_1_0_4134, XTL::EmuIDirectSoundBuffer8_SetHeadroom),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetHeadroom_1_0_4134, IDirectSoundBuffer8_SetHeadroom),
// IDirectSoundBuffer8::Lock
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Lock_1_0_4134, XTL::EmuIDirectSoundBuffer8_Lock),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Lock_1_0_4134, IDirectSoundBuffer8_Lock),
// DirectSound::CDirectSoundVoice::SetVolume (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetVolume_1_0_4134),
// DirectSound::CDirectSoundBuffer::SetVolume (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetVolume_1_0_4134),
// IDirectSoundBuffer_SetVolume (XREF)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetVolume_1_0_4134, XTL::EmuIDirectSoundBuffer8_SetVolume),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetVolume_1_0_4134, IDirectSoundBuffer8_SetVolume),
// CDirectSound_SetI3DL2Listener
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetI3DL2Listener_1_0_4134),
// IDirectSound8_SetI3DL2Listener
OOVPA_TABLE_PATCH(IDirectSound_SetI3DL2Listener_1_0_4134, XTL::EmuIDirectSound8_SetI3DL2Listener),
OOVPA_TABLE_PATCH(IDirectSound_SetI3DL2Listener_1_0_4134, IDirectSound8_SetI3DL2Listener),
// CDirectSound_GetEffectData
OOVPA_TABLE_XREF(DirectSound_CDirectSound_GetEffectData_1_0_4134),
// IDirectSound8_SetI3DL2Listener
OOVPA_TABLE_PATCH(IDirectSound_GetEffectData_1_0_4134, XTL::EmuIDirectSound8_GetEffectData),
OOVPA_TABLE_PATCH(IDirectSound_GetEffectData_1_0_4134, IDirectSound8_GetEffectData),
// CDirectSoundBuffer::SetBufferData
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetBufferData_1_0_4134),
// IDirectSoundBuffer8::SetBufferData
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetBufferData_1_0_4134, XTL::EmuIDirectSoundBuffer8_SetBufferData),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetBufferData_1_0_4134, IDirectSoundBuffer8_SetBufferData),
// IDirectSound8_CreateStream
OOVPA_TABLE_PATCH(IDirectSound8_CreateStream_1_0_3936, XTL::EmuIDirectSound8_CreateStream),
OOVPA_TABLE_PATCH(IDirectSound8_CreateStream_1_0_3936, IDirectSound8_CreateStream),
// CDirectSoundVoiceSettings::SetMixBins
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBins_1_0_4134),
// CDirectSoundVoice::SetMixBins
@ -433,7 +433,7 @@ OOVPATable DSound_1_0_4134[] = {
// CDirectSoundBuffer::SetMixBins
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetMixBins_1_0_4134),
// IDirectSoundBuffer8::SetMixBins
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMixBins_1_0_4134, XTL::EmuIDirectSoundBuffer8_SetMixBins),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMixBins_1_0_4134, IDirectSoundBuffer8_SetMixBins),
};
// ******************************************************************

36
src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl
View File

@ -798,51 +798,51 @@ OOVPA_END;
OOVPATable DSound_1_0_4361[] = {
// DirectSoundCreate
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, XTL::EmuDirectSoundCreate),
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, DirectSoundCreate),
// CDirectSound_CreateSoundStream
OOVPA_TABLE_XREF(CDirectSound_CreateSoundStream_1_0_4361),
// IDirectSound8_CreateStream
OOVPA_TABLE_PATCH(IDirectSound8_CreateStream_1_0_3936, XTL::EmuIDirectSound8_CreateStream),
OOVPA_TABLE_PATCH(IDirectSound8_CreateStream_1_0_3936, IDirectSound8_CreateStream),
// DirectSoundCreateStream
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_4361, XTL::EmuDirectSoundCreateStream),
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_4361, DirectSoundCreateStream),
// CMcpxStream::Pause
OOVPA_TABLE_XREF(CMcpxStream_Pause_1_0_4361),
// CDirectSoundStream::Pause
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_4361, XTL::EmuCDirectSoundStream_Pause),
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_4361, CDirectSoundStream_Pause),
// IDirectSound8::AddRef (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, XTL::EmuIDirectSound8_AddRef),
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, IDirectSound8_AddRef),
// IDirectSound8::CreateSoundBuffer
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4361, XTL::EmuIDirectSound8_CreateSoundBuffer),
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4361, IDirectSound8_CreateSoundBuffer),
// IDirectSoundBuffer8::SetPlayRegion
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetPlayRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_4361, IDirectSoundBuffer8_SetPlayRegion),
// IDirectSoundBuffer8::SetLoopRegion
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLoopRegion_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetLoopRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLoopRegion_1_0_4361, IDirectSoundBuffer8_SetLoopRegion),
// IDirectSoundBuffer8::SetVolume
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVolume_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetVolume),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVolume_1_0_4361, IDirectSoundBuffer8_SetVolume),
// CMcpxBuffer::SetBufferData
OOVPA_TABLE_XREF(CMcpxBuffer_SetBufferData_1_0_4361),
// CDirectSoundBuffer::SetBufferData
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetBufferData_1_0_4361),
// IDirectSoundBuffer8::SetBufferData
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetBufferData),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, IDirectSoundBuffer8_SetBufferData),
// CMcpxBuffer::SetCurrentPosition
OOVPA_TABLE_XREF(CMcpxBuffer_SetCurrentPosition_1_0_4361),
// CDirectSoundBuffer::SetCurrentPosition
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetCurrentPosition_1_0_4361),
// IDirectSoundBuffer8::SetCurrentPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetCurrentPosition_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetCurrentPosition_1_0_4361, IDirectSoundBuffer8_SetCurrentPosition),
// CMcpxBuffer::GetCurrentPosition
OOVPA_TABLE_XREF(CMcpxBuffer_GetCurrentPosition_1_0_4361),
// CDirectSoundBuffer::GetCurrentPosition
OOVPA_TABLE_XREF(CDirectSoundBuffer_GetCurrentPosition_1_0_4361),
// IDirectSoundBuffer8::GetCurrentPosition (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetCurrentPosition_1_0_3936, XTL::EmuIDirectSoundBuffer8_GetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetCurrentPosition_1_0_3936, IDirectSoundBuffer8_GetCurrentPosition),
// CMcpxBuffer::Play
OOVPA_TABLE_XREF(CMcpxBuffer_Play_1_0_4361),
// CDirectSoundBuffer::Play
OOVPA_TABLE_XREF(CDirectSoundBuffer_Play_1_0_4361),
// IDirectSoundBuffer8::Play
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play_1_0_4361, XTL::EmuIDirectSoundBuffer8_Play),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play_1_0_4361, IDirectSoundBuffer8_Play),
// CMcpxBuffer::Stop
OOVPA_TABLE_XREF(CMcpxBuffer_Stop_1_0_4361),
// CMcpxBuffer_Stop2
@ -850,7 +850,7 @@ OOVPATable DSound_1_0_4361[] = {
// CDirectSoundBuffer::Stop
OOVPA_TABLE_XREF(CDirectSoundBuffer_Stop_1_0_4361),
// IDirectSoundBuffer8::Stop
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Stop_1_0_4361, XTL::EmuIDirectSoundBuffer8_Stop),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Stop_1_0_4361, IDirectSoundBuffer8_Stop),
// CDirectSoundVoiceSettings_SetMixBinVolumes
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBinVolumes_1_0_4361),
// CDirectSoundVoice_SetMixBinVolumes
@ -860,15 +860,15 @@ OOVPATable DSound_1_0_4361[] = {
// DirectSound::CDirectSoundBuffer::PlayEx (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_PlayEx_1_0_4361),
// IDirectSoundBuffer_PlayEx
OOVPA_TABLE_PATCH(IDirectSoundBuffer_PlayEx_1_0_4361, XTL::EmuIDirectSoundBuffer8_PlayEx),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_PlayEx_1_0_4361, IDirectSoundBuffer8_PlayEx),
// DirectSound::CDirectSoundBuffer::StopEx (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_StopEx_1_0_4361),
// IDirectSoundBuffer_StopEx
OOVPA_TABLE_PATCH(IDirectSoundBuffer_StopEx_1_0_4361, XTL::EmuIDirectSoundBuffer8_StopEx),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_StopEx_1_0_4361, IDirectSoundBuffer8_StopEx),
// IDirectSoundBuffer_AddRef (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_AddRef_1_0_3936, XTL::EmuIDirectSoundBuffer8_AddRef),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_AddRef_1_0_3936, IDirectSoundBuffer8_AddRef),
// IDirectSound8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, XTL::EmuIDirectSound8_Release),
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, IDirectSound8_Release),
};
// ******************************************************************

44
src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl
View File

@ -573,65 +573,61 @@ OOVPA_END;
OOVPATable DSound_1_0_4432[] = {
// DirectSoundCreate (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, XTL::EmuDirectSoundCreate),
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, DirectSoundCreate),
// IDirectSound8_CreateStream
OOVPA_TABLE_PATCH(IDirectSound8_CreateStream_1_0_3936, XTL::EmuIDirectSound8_CreateStream),
OOVPA_TABLE_PATCH(IDirectSound8_CreateStream_1_0_3936, IDirectSound8_CreateStream),
// CDirectSound_CreateSoundStream (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSound_CreateSoundStream_1_0_4361),
// DirectSoundCreateStream (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_4361, XTL::EmuDirectSoundCreateStream),
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_4361, DirectSoundCreateStream),
// CMcpxStream::Pause (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxStream_Pause_1_0_4361),
// CDirectSoundStream::Pause (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_4361, XTL::EmuCDirectSoundStream_Pause),
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_4361, CDirectSoundStream_Pause),
// IDirectSound8::AddRef (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, XTL::EmuIDirectSound8_AddRef),
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, IDirectSound8_AddRef),
// IDirectSound8::Release
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_4432, XTL::EmuIDirectSound8_Release),
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_4432, IDirectSound8_Release),
// IDirectSound8::CreateSoundBuffer (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4361, XTL::EmuIDirectSound8_CreateSoundBuffer),
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4361, IDirectSound8_CreateSoundBuffer),
// IDirectSoundBuffer8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, XTL::EmuIDirectSoundBuffer8_Release),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, IDirectSoundBuffer8_Release),
// IDirectSoundBuffer8::SetLoopRegion (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLoopRegion_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetLoopRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLoopRegion_1_0_4361, IDirectSoundBuffer8_SetLoopRegion),
// CMcpxBuffer::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxBuffer_SetBufferData_1_0_4361),
// CDirectSoundBuffer::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetBufferData_1_0_4361),
// IDirectSoundBuffer8::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetBufferData),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, IDirectSoundBuffer8_SetBufferData),
// CMcpxBuffer::SetCurrentPosition (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxBuffer_SetCurrentPosition_1_0_4361),
// CDirectSoundBuffer::SetCurrentPosition (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetCurrentPosition_1_0_4361),
// IDirectSoundBuffer8::SetCurrentPosition (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetCurrentPosition_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetCurrentPosition_1_0_4361, IDirectSoundBuffer8_SetCurrentPosition),
// CMcpxBuffer::Stop (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxBuffer_Stop_1_0_4361),
// CDirectSoundBuffer::Stop (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_Stop_1_0_4361),
// IDirectSoundBuffer8::Stop (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Stop_1_0_4361, XTL::EmuIDirectSoundBuffer8_Stop),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Stop_1_0_4361, IDirectSoundBuffer8_Stop),
// CDirectSoundVoice::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMaxDistance_1_0_4432),
// CDirectSoundBuffer::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMaxDistance_1_0_4432),
// IDirectSoundBuffer_SetMaxDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_4432,
XTL::EmuIDirectSoundBuffer8_SetMaxDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_4432, IDirectSoundBuffer8_SetMaxDistance),
// CDirectSoundVoice::SetMinDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMinDistance_1_0_4432),
// CDirectSoundBuffer::SetMinDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMinDistance_1_0_4432),
// IDirectSoundBuffer_SetMinDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_4432,
XTL::EmuIDirectSoundBuffer8_SetMinDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_4432, IDirectSoundBuffer8_SetMinDistance),
// CDirectSound_SetI3DL2Listener
OOVPA_TABLE_XREF(CDirectSound_SetI3DL2Listener_1_0_4432),
// IDirectSound8_SetI3DL2Listener
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_4432, XTL::EmuIDirectSound8_SetI3DL2Listener),
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_4432, IDirectSound8_SetI3DL2Listener),
// CDirectSoundVoiceSettings_SetMixBins
OOVPA_TABLE_XREF(CDirectSoundVoiceSettings_SetMixBins_1_0_4432),
// CDirectSoundVoice_SetMixBins
@ -639,17 +635,17 @@ OOVPATable DSound_1_0_4432[] = {
// CDirectSoundBuffer_SetMixBins
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMixBins_1_0_4432),
// IDirectSoundBuffer8_SetMixBins
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBins_1_0_4432, XTL::EmuIDirectSoundBuffer8_SetMixBins),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBins_1_0_4432, IDirectSoundBuffer8_SetMixBins),
// CDirectSound::CommitDeferredSettings
OOVPA_TABLE_PATCH(CDirectSound_CommitDeferredSettings_1_0_4432, XTL::EmuCDirectSound_CommitDeferredSettings),
OOVPA_TABLE_PATCH(CDirectSound_CommitDeferredSettings_1_0_4432, CDirectSound_CommitDeferredSettings),
// CDirectSound::SetDistanceFactorA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDistanceFactorA_1_0_4432),
// IDirectSound8::SetDistanceFactor
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_4432, XTL::EmuIDirectSound8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_4432, IDirectSound8_SetDistanceFactor),
// IDirectSound8::DownloadEffectsImage (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, XTL::EmuIDirectSound8_DownloadEffectsImage),
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, IDirectSound8_DownloadEffectsImage),
// IDirectSoundBuffer_AddRef (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_AddRef_1_0_3936, XTL::EmuIDirectSoundBuffer8_AddRef),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_AddRef_1_0_3936, IDirectSoundBuffer8_AddRef),
};
// ******************************************************************

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

@ -2851,31 +2851,31 @@ OOVPA_END;
OOVPATable DSound_1_0_4627[] = {
// DirectSoundCreate (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, XTL::EmuDirectSoundCreate),
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, DirectSoundCreate),
// DirectSoundDoWork
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_4627, XTL::EmuDirectSoundDoWork),
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_4627, DirectSoundDoWork),
// CDirectSound_CreateSoundBuffer
OOVPA_TABLE_XREF(CDirectSound_CreateSoundBuffer_1_0_4627),
// IDirectSoundBuffer8::SetPlayRegion (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetPlayRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_4361, IDirectSoundBuffer8_SetPlayRegion),
// IDirectSoundBuffer8::SetLoopRegion (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLoopRegion_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetLoopRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLoopRegion_1_0_4361, IDirectSoundBuffer8_SetLoopRegion),
// CDirectSound_SetI3DL2Listener (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSound_SetI3DL2Listener_1_0_4432),
// IDirectSound8_SetI3DL2Listener (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_4432, XTL::EmuIDirectSound8_SetI3DL2Listener),
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_4432, IDirectSound8_SetI3DL2Listener),
// CDirectSound_SetMixBinHeadroom
OOVPA_TABLE_XREF(CDirectSound_SetMixBinHeadroom_1_0_4627),
// IDirectSound8_SetMixBinHeadroom
OOVPA_TABLE_PATCH(IDirectSound8_SetMixBinHeadroom_1_0_4627, XTL::EmuIDirectSound8_SetMixBinHeadroom),
OOVPA_TABLE_PATCH(IDirectSound8_SetMixBinHeadroom_1_0_4627, IDirectSound8_SetMixBinHeadroom),
// IDirectSoundBuffer8::SetHeadroomA (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_SetHeadroomA_1_0_4928),
// IDirectSoundBuffer8::SetHeadroom
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetHeadroom_1_0_4928, XTL::EmuIDirectSoundBuffer8_SetHeadroom),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetHeadroom_1_0_4928, IDirectSoundBuffer8_SetHeadroom),
// CDirectSound::SetVelocity (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetVelocity_1_0_4627),
// IDirectSound8::SetVelocity (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetVelocity_1_0_3936, XTL::EmuIDirectSound8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSound8_SetVelocity_1_0_3936, IDirectSound8_SetVelocity),
// CDirectSound::SetAllParametersA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetAllParametersA_1_0_4627),
// CDirectSound::SetAllParametersA (XREF)
@ -2885,7 +2885,7 @@ OOVPATable DSound_1_0_4627[] = {
// CDirectSound_SetAllParameters (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetAllParameters_1_0_4928),
// IDirectSound8::SetAllParameters (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetAllParameters_1_0_3936, XTL::EmuIDirectSound8_SetAllParameters),
OOVPA_TABLE_PATCH(IDirectSound8_SetAllParameters_1_0_3936, IDirectSound8_SetAllParameters),
// CDirectSoundVoiceSettings_SetMixBins (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundVoiceSettings_SetMixBins_1_0_4432),
// CDirectSoundVoice_SetMixBins (* unchanged since 4432 *)
@ -2893,7 +2893,7 @@ OOVPATable DSound_1_0_4627[] = {
// CDirectSoundBuffer_SetMixBins (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMixBins_1_0_4432),
// IDirectSoundBuffer8_SetMixBins (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBins_1_0_4432, XTL::EmuIDirectSoundBuffer8_SetMixBins),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBins_1_0_4432, IDirectSoundBuffer8_SetMixBins),
// CDirectSoundVoiceSettings_SetMixBinVolumes
OOVPA_TABLE_XREF(CDirectSoundVoiceSettings_SetMixBinVolumes_1_0_4627),
// CDirectSoundVoice_SetMixBinVolumes
@ -2901,52 +2901,52 @@ OOVPATable DSound_1_0_4627[] = {
// CDirectSoundBuffer_SetMixBinVolumes
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMixBinVolumes_1_0_4627),
// IDirectSoundBuffer8_SetMixBinVolumes
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBinVolumes_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetMixBinVolumes),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBinVolumes_1_0_4627, IDirectSoundBuffer8_SetMixBinVolumes),
// CDirectSound::SetPositionA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetPositionA_1_0_4627),
// CDirectSound::SetPositionA (XREF)
// TODO: Find a cure for laziness...
OOVPA_TABLE_XREF(CDirectSound_SetPositionA_1_0_4432),
// IDirectSound8::SetPosition (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetPosition_1_0_3936, XTL::EmuIDirectSound8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSound8_SetPosition_1_0_3936, IDirectSound8_SetPosition),
// DirectSoundCreateBuffer
OOVPA_TABLE_PATCH(DirectSoundCreateBuffer_1_0_4627, XTL::EmuDirectSoundCreateBuffer),
OOVPA_TABLE_PATCH(DirectSoundCreateBuffer_1_0_4627, DirectSoundCreateBuffer),
// IDirectSound8::CreateSoundBuffer
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4627, XTL::EmuIDirectSound8_CreateSoundBuffer),
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4627, IDirectSound8_CreateSoundBuffer),
// IDirectSound8::AddRef (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, XTL::EmuIDirectSound8_AddRef),
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, IDirectSound8_AddRef),
// CDirectSoundVoice::SetFrequency (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetFrequency_1_0_4627),
// CDirectSoundBuffer::SetFrequency
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetFrequency_1_0_4627),
// IDirectSoundBuffer8::SetFrequency
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetFrequency),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_4627, IDirectSoundBuffer8_SetFrequency),
// CMcpxVoiceClient_SetVolume
OOVPA_TABLE_XREF(CMcpxVoiceClient_SetVolume_1_0_4627),
// CDirectSoundStream_SetVolume
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_4627, XTL::EmuCDirectSoundStream_SetVolume),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_4627, CDirectSoundStream_SetVolume),
// IDirectSoundBuffer8::LockA (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_LockA_1_0_4627),
// IDirectSoundBuffer8::Lock (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Lock_1_0_3936, XTL::EmuIDirectSoundBuffer8_Lock),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Lock_1_0_3936, IDirectSoundBuffer8_Lock),
// CDirectSound_CreateSoundStream (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSound_CreateSoundStream_1_0_4361),
// IDirectSound8_CreateStream
OOVPA_TABLE_PATCH(IDirectSound8_CreateStream_1_0_3936, XTL::EmuIDirectSound8_CreateStream),
OOVPA_TABLE_PATCH(IDirectSound8_CreateStream_1_0_3936, IDirectSound8_CreateStream),
// DirectSoundCreateStream (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_4361, XTL::EmuDirectSoundCreateStream),
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_4361, DirectSoundCreateStream),
// CMcpxStream::Pause (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxStream_Pause_1_0_4361),
// CMcpxStream::Pause
OOVPA_TABLE_XREF(CMcpxStream_Pause_1_0_4928),
// CDirectSoundStream::Pause (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_4361, XTL::EmuCDirectSoundStream_Pause),
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_4361, CDirectSoundStream_Pause),
// CMcpxBuffer::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxBuffer_SetBufferData_1_0_4361),
// CDirectSoundBuffer::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetBufferData_1_0_4361),
// IDirectSoundBuffer8::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetBufferData),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, IDirectSoundBuffer8_SetBufferData),
// CMcpxBuffer::GetStatus
OOVPA_TABLE_XREF(CMcpxBuffer_GetStatus_1_0_4627),
// CMcpxBuffer::GetStatus
@ -2960,21 +2960,21 @@ OOVPATable DSound_1_0_4627[] = {
// CDirectSoundBuffer::GetStatus
OOVPA_TABLE_XREF(CDirectSoundBuffer_GetStatus_1_0_4627),
// IDirectSoundBuffer8::GetStatus
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_4627, XTL::EmuIDirectSoundBuffer8_GetStatus),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_4627, IDirectSoundBuffer8_GetStatus),
// CMcpxBuffer::SetCurrentPosition (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxBuffer_SetCurrentPosition_1_0_4361),
// CDirectSoundBuffer::SetCurrentPosition (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetCurrentPosition_1_0_4361),
// IDirectSoundBuffer8::SetCurrentPosition (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetCurrentPosition_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetCurrentPosition_1_0_4361, IDirectSoundBuffer8_SetCurrentPosition),
// CMcpxBuffer::GetCurrentPosition (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxBuffer_GetCurrentPosition_1_0_4361),
// CDirectSoundBuffer::GetCurrentPosition (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_GetCurrentPosition_1_0_4361),
// IDirectSoundBuffer8::GetCurrentPosition (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetCurrentPosition_1_0_3936, XTL::EmuIDirectSoundBuffer8_GetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetCurrentPosition_1_0_3936, IDirectSoundBuffer8_GetCurrentPosition),
// CDirectSound::GetSpeakerConfig
OOVPA_TABLE_PATCH(CDirectSound_GetSpeakerConfig_1_0_4627, XTL::EmuCDirectSound_GetSpeakerConfig),
OOVPA_TABLE_PATCH(CDirectSound_GetSpeakerConfig_1_0_4627, CDirectSound_GetSpeakerConfig),
// CMcpxBuffer::Play (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxBuffer_Play_1_0_4361),
// CMcpxBuffer::Play
@ -2984,131 +2984,131 @@ OOVPATable DSound_1_0_4627[] = {
// CDirectSoundBuffer::Play (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_Play_1_0_4361),
// IDirectSoundBuffer8::Play (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play_1_0_4361, XTL::EmuIDirectSoundBuffer8_Play),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play_1_0_4361, IDirectSoundBuffer8_Play),
// IDirectSound8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, XTL::EmuIDirectSound8_Release),
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, IDirectSound8_Release),
// IDirectSound8::DownloadEffectsImage (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, XTL::EmuIDirectSound8_DownloadEffectsImage),
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, IDirectSound8_DownloadEffectsImage),
// IDirectSound8::SetOrientation (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, XTL::EmuIDirectSound8_SetOrientation),
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, IDirectSound8_SetOrientation),
// CDirectSound::SetDistanceFactorA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDistanceFactorA_1_0_4531),
// CDirectSound::SetDistanceFactorA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDistanceFactorA_1_0_4627),
// IDirectSound8::SetDistanceFactor (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_4432, XTL::EmuIDirectSound8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_4432, IDirectSound8_SetDistanceFactor),
// CDirectSound::SetRolloffFactor (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetRolloffFactor_1_0_4627),
// IDirectSound8::SetRolloffFactor
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_4627, XTL::EmuIDirectSound8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_4627, IDirectSound8_SetRolloffFactor),
// CDirectSound::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDopplerFactor_1_0_4531),
// CDirectSound::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDopplerFactor_1_0_4627),
// IDirectSound8::SetDopplerFactor
OOVPA_TABLE_PATCH(IDirectSound8_SetDopplerFactor_1_0_4627, XTL::EmuIDirectSound8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDopplerFactor_1_0_4627, IDirectSound8_SetDopplerFactor),
// CDirectSound::CommitDeferredSettings (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(CDirectSound_CommitDeferredSettings_1_0_4432, XTL::EmuCDirectSound_CommitDeferredSettings),
OOVPA_TABLE_PATCH(CDirectSound_CommitDeferredSettings_1_0_4432, CDirectSound_CommitDeferredSettings),
// CDirectSoundVoice::SetMaxDistance (XREF) (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMaxDistance_1_0_4432),
// CDirectSoundBuffer::SetMaxDistance (XREF) (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMaxDistance_1_0_4432),
// IDirectSoundBuffer_SetMaxDistance (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_4432, XTL::EmuIDirectSoundBuffer8_SetMaxDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_4432, IDirectSoundBuffer8_SetMaxDistance),
// CDirectSoundVoice::SetMinDistance (XREF) (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMinDistance_1_0_4432),
// CDirectSoundBuffer::SetMinDistance (XREF) (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMinDistance_1_0_4432),
// IDirectSoundBuffer_SetMinDistance (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_4432, XTL::EmuIDirectSoundBuffer8_SetMinDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_4432, IDirectSoundBuffer8_SetMinDistance),
// s+
// CDirectSoundVoice::SetRolloffFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetRolloffFactor_1_0_4627),
// CDirectSoundBuffer::SetRolloffFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetRolloffFactor_1_0_4627),
// IDirectSoundBuffer_SetRolloffFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetRolloffFactor_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetRolloffFactor_1_0_4627, IDirectSoundBuffer8_SetRolloffFactor),
// CDirectSoundVoice::SetDistanceFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetDistanceFactor_1_0_4627),
// CDirectSoundBuffer::SetDistanceFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetDistanceFactor_1_0_4627),
// IDirectSoundBuffer_SetDistanceFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetDistanceFactor_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetDistanceFactor_1_0_4627, IDirectSoundBuffer8_SetDistanceFactor),
// CDirectSoundVoice::SetConeAngles (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetConeAngles_1_0_4627),
// CDirectSoundBuffer::SetConeAngles (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetConeAngles_1_0_4627),
// IDirectSoundBuffer_SetConeAngles
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetConeAngles_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetConeAngles),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetConeAngles_1_0_4627, IDirectSoundBuffer8_SetConeAngles),
// CDirectSoundVoice::SetConeOrientation (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetConeOrientation_1_0_4627),
// CDirectSoundBuffer::SetConeOrientation (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetConeOrientation_1_0_4627),
// IDirectSoundBuffer_SetConeOrientation
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetConeOrientation_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetConeOrientation),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetConeOrientation_1_0_4627, IDirectSoundBuffer8_SetConeOrientation),
// CDirectSoundVoice::SetConeOutsideVolume (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetConeOutsideVolume_1_0_4627),
// CDirectSoundBuffer::SetConeOutsideVolume (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetConeOutsideVolume_1_0_4627),
// IDirectSoundBuffer_SetConeOutsideVolume
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetConeOutsideVolume_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetConeOutsideVolume),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetConeOutsideVolume_1_0_4627, IDirectSoundBuffer8_SetConeOutsideVolume),
// CDirectSoundVoice::SetPosition (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetPosition_1_0_4627),
// CDirectSoundBuffer::SetPosition (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetPosition_1_0_4627),
// IDirectSoundBuffer8_SetPosition (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPosition_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPosition_1_0_3936, IDirectSoundBuffer8_SetPosition),
// CDirectSoundVoice::SetVelocity (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetVelocity_1_0_4627),
// CDirectSoundBuffer::SetVelocity (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetVelocity_1_0_4627),
// IDirectSoundBuffer8_SetVelocity (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVelocity_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVelocity_1_0_3936, IDirectSoundBuffer8_SetVelocity),
// CDirectSoundVoice::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetDopplerFactor_1_0_4627),
// CDirectSoundBuffer::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetDopplerFactor_1_0_4627),
// IDirectSoundBuffer_SetDopplerFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetDopplerFactor_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetDopplerFactor_1_0_4627, IDirectSoundBuffer8_SetDopplerFactor),
// CDirectSoundVoice::SetI3DL2Source (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetI3DL2Source_1_0_4627),
// CDirectSoundBuffer::SetI3DL2Source (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetI3DL2Source_1_0_4627),
// IDirectSoundBuffer_SetI3DL2Source
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetI3DL2Source_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetI3DL2Source),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetI3DL2Source_1_0_4627, IDirectSoundBuffer8_SetI3DL2Source),
// IDirectSoundBuffer_Stop (Possibly weak, but quite OK for 4627 DSOUND)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Stop_1_0_4627, XTL::EmuIDirectSoundBuffer8_Stop),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Stop_1_0_4627, IDirectSoundBuffer8_Stop),
// IDirectSoundBuffer8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, XTL::EmuIDirectSoundBuffer8_Release),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, IDirectSoundBuffer8_Release),
// +s
// DirectSound::CDirectSoundVoice::SetFormat (XREF)
OOVPA_TABLE_XREF(X_DirectSound_CDirectSoundVoice_SetFormat_1_0_4627),
// DirectSound::CDirectSoundBuffer::SetFormat (XREF)
OOVPA_TABLE_XREF(X_DirectSound_CDirectSoundBuffer_SetFormat_1_0_4627),
// IDirectSoundBuffer_SetFormat
OOVPA_TABLE_PATCH(X_IDirectSoundBuffer_SetFormat_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetFormat),
OOVPA_TABLE_PATCH(X_IDirectSoundBuffer_SetFormat_1_0_4627, IDirectSoundBuffer8_SetFormat),
// CDirectSoundStream_SetMixBinVolumes
OOVPA_TABLE_XREF(CDirectSoundStream_SetMixBinVolumes_1_0_4627),
// DirectSound::CDirectSound::EnableHeadphones (XREF)
OOVPA_TABLE_XREF(X_DirectSound_CDirectSound_EnableHeadphones_1_0_4627),
// EmuIDirectSound_EnableHeadphones
OOVPA_TABLE_PATCH(EmuIDirectSound_EnableHeadphones_1_0_4627, XTL::EmuIDirectSound_EnableHeadphones),
OOVPA_TABLE_PATCH(EmuIDirectSound_EnableHeadphones_1_0_4627, IDirectSound_EnableHeadphones),
//// DirectSound::CDirectSoundVoice::SetHeadroom (XREF)
//OOVPA_TABLE_XREF(CDirectSoundVoice_SetHeadroom_1_0_4627),
//// CDirectSoundStream_SetHeadroom (XREF)
//OOVPA_TABLE_PATCH(CDirectSoundStream_SetHeadroom_1_0_4627, XTL::EmuIDirectSoundStream_SetHeadroom),
//OOVPA_TABLE_PATCH(CDirectSoundStream_SetHeadroom_1_0_4627, IDirectSoundStream_SetHeadroom),
// IDirectSoundBuffer_AddRef (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_AddRef_1_0_3936, XTL::EmuIDirectSoundBuffer8_AddRef),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_AddRef_1_0_3936, IDirectSoundBuffer8_AddRef),
// CDirectSound_GetOutputLevels (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_GetOutputLevels_1_0_4627),
// IDirectSound8_GetOutputLevels
OOVPA_TABLE_PATCH(IDirectSound_GetOutputLevels_1_0_4627, XTL::EmuIDirectSound8_GetOutputLevels),
OOVPA_TABLE_PATCH(IDirectSound_GetOutputLevels_1_0_4627, IDirectSound8_GetOutputLevels),
// CDirectSoundVoice::SetAllParameters (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetAllParameters_1_0_4627),
// CDirectSoundBuffer::SetAllParameters (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetAllParameters_1_0_4627),
// IDirectSoundBuffer8::SetAllParameters
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetAllParameters_1_0_4627, XTL::EmuIDirectSound8_SetAllParameters),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetAllParameters_1_0_4627, IDirectSound8_SetAllParameters),
// Use that for now, EmuIDirectSoundBuffer8_SetAllParameters,
// ^ Okay, it's your call pal...
// DirectSound_CMcpxBuffer_Pause_1_0_4928
@ -3116,37 +3116,37 @@ OOVPATable DSound_1_0_4627[] = {
// CDirectSoundBuffer::Pause
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_Pause_1_0_4928),
// IDirectSoundBuffer8_Pause
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Pause_1_0_4928, XTL::EmuIDirectSoundBuffer8_Pause),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Pause_1_0_4928, IDirectSoundBuffer8_Pause),
// DirectSound::CMcpxBuffer::GetStatus (XREF)
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_GetStatus_1_0_4721),
// DirectSound::CDirectSoundBuffer::GetStatus (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_GetStatus_1_0_4721),
// IDirectSoundBuffer_GetStatus
OOVPA_TABLE_PATCH(IDirectSoundBuffer_GetStatus_1_0_4721, XTL::EmuIDirectSoundBuffer8_GetStatus),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_GetStatus_1_0_4721, IDirectSoundBuffer8_GetStatus),
// CDirectSoundStream::SetMixBins
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBins_1_0_4627, XTL::EmuCDirectSoundStream_SetMixBins),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBins_1_0_4627, CDirectSoundStream_SetMixBins),
// CMcpxVoiceClient::SetEG
OOVPA_TABLE_XREF(DirectSound_CMcpxVoiceClient_SetEG_1_0_4627),
// CDirectSoundVoice::SetEG (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetEG_1_0_4627),
// DirectSound::CDirectSoundStream::SetEG
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetEG_1_0_4627, XTL::EmuCDirectSoundStream_SetEG),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetEG_1_0_4627, CDirectSoundStream_SetEG),
// DirectSound::CDirectSoundBuffer::SetEG (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetEG_1_0_4627),
// IDirectSoundBuffer::SetEG
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetEG_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetEG),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetEG_1_0_4627, IDirectSoundBuffer8_SetEG),
// CDirectSoundStream::FlushEx (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundStream_FlushEx_1_0_4627),
// IDirectSoundStream_FlushEx
OOVPA_TABLE_PATCH(IDirectSoundStream_FlushEx_1_0_4627, XTL::EmuIDirectSoundStream_FlushEx),
OOVPA_TABLE_PATCH(IDirectSoundStream_FlushEx_1_0_4627, IDirectSoundStream_FlushEx),
// XAudioDownloadEffectsImage
OOVPA_TABLE_PATCH(XAudioDownloadEffectsImage_1_0_4627, XTL::EmuXAudioDownloadEffectsImage),
OOVPA_TABLE_PATCH(XAudioDownloadEffectsImage_1_0_4627, XAudioDownloadEffectsImage),
// CDirectSoundVoice::SetMode (XRef)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetMode_1_0_4627),
// CDirectSoundBuffer::SetMode (XRef)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetMode_1_0_4627),
// IDirectSoundBuffer_SetMode
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMode_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetMode),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMode_1_0_4627, IDirectSoundBuffer8_SetMode),
// DirectSound::CMcpxVoiceClient::SetFilter (XREF)
OOVPA_TABLE_XREF(DirectSound_CMcpxVoiceClient_SetFilter_1_0_4627),
// DirectSound::CDirectSoundVoice::SetFilter (XREF)
@ -3154,19 +3154,19 @@ OOVPATable DSound_1_0_4627[] = {
// DirectSound::CDirectSoundBuffer::SetFilter (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetFilter_1_0_4627),
// DirectSound::CDirectSoundStream::SetFilter (XREF)
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFilter_1_0_4627, XTL::EmuCDirectSoundStream_SetFilter),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFilter_1_0_4627, CDirectSoundStream_SetFilter),
// IDirectSoundBuffer_SetFilter
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetFilter_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetFilter),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetFilter_1_0_4627, IDirectSoundBuffer8_SetFilter),
// DirectSound::CDirectSoundBuffer::PlayEx (XREF) (* unchanged since 4361 *)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_PlayEx_1_0_4361),
// IDirectSoundBuffer_PlayEx (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_PlayEx_1_0_4361, XTL::EmuIDirectSoundBuffer8_PlayEx),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_PlayEx_1_0_4361, IDirectSoundBuffer8_PlayEx),
// CMcpxBuffer_Stop2
OOVPA_TABLE_XREF(CMcpxBuffer_Stop2_1_0_4361),
// DirectSound::CDirectSoundBuffer::StopEx (XREF) (* unchanged since 4361 *)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_StopEx_1_0_4361),
// IDirectSoundBuffer_StopEx (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_StopEx_1_0_4361, XTL::EmuIDirectSoundBuffer8_StopEx),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_StopEx_1_0_4361, IDirectSoundBuffer8_StopEx),
// CDirectSound::SetVelocity (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetVelocity_1_0_4432),
// CDirectSoundVoice::SetPosition (XREF)
@ -3176,19 +3176,19 @@ OOVPATable DSound_1_0_4627[] = {
// IDirectSoundBuffer8::SetPitch
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetPitch_1_0_4627),
// IDirectSoundBuffer8::SetPitch
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPitch_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetPitch),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPitch_1_0_4627, IDirectSoundBuffer8_SetPitch),
// DirectSound::CDirectSoundVoice::SetHeadroom (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetHeadroom_1_0_4627),
// CDirectSoundStream_SetHeadroom (XREF)
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetHeadroom_1_0_4627, XTL::EmuIDirectSoundStream_SetHeadroom),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetHeadroom_1_0_4627, IDirectSoundStream_SetHeadroom),
// CDirectSoundVoice::SetOutputBuffer
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetOutputBuffer_1_0_4627),
// CDirectSoundBuffer::SetOutputBuffer
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetOutputBuffer_1_0_4627),
// IDirectSoundBuffer8::SetOutputBuffer
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetOutputBuffer_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetOutputBuffer),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetOutputBuffer_1_0_4627, IDirectSoundBuffer8_SetOutputBuffer),
// CDirectSoundStream::SetOutputBuffer
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetOutputBuffer_1_0_4627, XTL::EmuCDirectSoundStream_SetOutputBuffer),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetOutputBuffer_1_0_4627, CDirectSoundStream_SetOutputBuffer),
// CDirectSoundVoice::SetRolloffCurve (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetRolloffCurve_1_0_4627),
// CDirectSoundBuffer::SetRolloffCurve (XREF)
@ -3196,11 +3196,11 @@ OOVPATable DSound_1_0_4627[] = {
// CDirectSoundStream::SetRolloffCurve (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundStream_SetRolloffCurve_1_0_4627),
// IDirectSoundBuffer8::SetRolloffCurve
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetRolloffCurve_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetRolloffCurve),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetRolloffCurve_1_0_4627, IDirectSoundBuffer8_SetRolloffCurve),
// XFileCreateMediaObjectEx
OOVPA_TABLE_PATCH(XFileCreateMediaObjectEx_1_0_4627, XTL::EmuXFileCreateMediaObjectEx),
OOVPA_TABLE_PATCH(XFileCreateMediaObjectEx_1_0_4627, XFileCreateMediaObjectEx),
// XWaveFileCreateMediaObject
OOVPA_TABLE_PATCH(XWaveFileCreateMediaObject_1_0_4627, XTL::EmuXWaveFileCreateMediaObject),
OOVPA_TABLE_PATCH(XWaveFileCreateMediaObject_1_0_4627, XWaveFileCreateMediaObject),
//// CDirectSoundBuffer::SetNotificationPosition (XREF)
//OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetNotificationPositions_1_0_4627),
//// IDirectSoundBuffer8::SetNotificationPositions

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

@ -844,9 +844,9 @@ OOVPA_END;
OOVPATable DSound_1_0_5233[] = {
// DirectSoundCreate (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, XTL::EmuDirectSoundCreate),
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, DirectSoundCreate),
// DirectSoundDoWork (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_4627, XTL::EmuDirectSoundDoWork),
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_4627, DirectSoundDoWork),
// CDirectSound::CreateSoundBuffer (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSound_CreateSoundBuffer_1_0_4627),
// CMcpxAPU::SynchPlayback (XRef)
@ -854,19 +854,19 @@ OOVPATable DSound_1_0_5233[] = {
// CDirectSound::SynchPlayback (XRef)
OOVPA_TABLE_XREF(CDirectSound_SynchPlayback_1_0_5233),
// IDirectSound_SynchPlayback
OOVPA_TABLE_PATCH(IDirectSound8_SynchPlayback_1_0_5233, XTL::EmuIDirectSound8_SynchPlayback),
OOVPA_TABLE_PATCH(IDirectSound8_SynchPlayback_1_0_5233, IDirectSound8_SynchPlayback),
// CMcpxStream::Pause (XRef)
OOVPA_TABLE_XREF(CMcpxStream_Pause_1_0_5233),
// CDirectSoundStream::Pause (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_4361, XTL::EmuCDirectSoundStream_Pause),
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_4361, CDirectSoundStream_Pause),
// CDirectSound_SetI3DL2Listener (XREF) (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSound_SetI3DL2Listener_1_0_4432),
// IDirectSound8_SetI3DL2Listener (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_4432, XTL::EmuIDirectSound8_SetI3DL2Listener),
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_4432, IDirectSound8_SetI3DL2Listener),
// CDirectSound::SetVelocity (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSound_SetVelocity_1_0_4627),
// IDirectSound8::SetVelocity (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetVelocity_1_0_3936, XTL::EmuIDirectSound8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSound8_SetVelocity_1_0_3936, IDirectSound8_SetVelocity),
// CDirectSoundVoiceSettings::SetMixBins (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundVoiceSettings_SetMixBins_1_0_4432),
// CDirectSoundVoice::SetMixBins (* unchanged since 4432 *)
@ -874,25 +874,25 @@ OOVPATable DSound_1_0_5233[] = {
// CDirectSoundBuffer::SetMixBins (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMixBins_1_0_4432),
// IDirectSoundBuffer8::SetMixBins (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBins_1_0_4432, XTL::EmuIDirectSoundBuffer8_SetMixBins),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBins_1_0_4432, IDirectSoundBuffer8_SetMixBins),
// CDirectSoundStream::SetMixBins
OOVPA_TABLE_PATCH(CDirectSoundStream_SetMixBins_1_0_5233, XTL::EmuCDirectSoundStream_SetMixBins),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetMixBins_1_0_5233, CDirectSoundStream_SetMixBins),
// CDirectSound::SetPositionA (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSound_SetPositionA_1_0_4627),
// IDirectSound8::SetPosition (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetPosition_1_0_3936, XTL::EmuIDirectSound8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSound8_SetPosition_1_0_3936, IDirectSound8_SetPosition),
// DirectSoundCreateBuffer (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(DirectSoundCreateBuffer_1_0_4627, XTL::EmuDirectSoundCreateBuffer),
OOVPA_TABLE_PATCH(DirectSoundCreateBuffer_1_0_4627, DirectSoundCreateBuffer),
// IDirectSound8::CreateSoundBuffer (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4627, XTL::EmuIDirectSound8_CreateSoundBuffer),
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4627, IDirectSound8_CreateSoundBuffer),
// CDirectSoundVoice::SetFrequency (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetFrequency_1_0_4627),
// CDirectSoundBuffer::SetFrequency (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetFrequency_1_0_4627),
// IDirectSoundBuffer8::SetFrequency (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetFrequency),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_4627, IDirectSoundBuffer8_SetFrequency),
// CDirectSoundStream::SetFrequency
OOVPA_TABLE_PATCH(CDirectSoundStream_SetFrequency_1_0_5233, XTL::EmuCDirectSoundStream_SetFrequency),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetFrequency_1_0_5233, CDirectSoundStream_SetFrequency),
// CMcpxVoiceClient_SetVolume (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CMcpxVoiceClient_SetVolume_1_0_4627),
// CDirectSoundVoice::SetVolume (XREF)
@ -900,31 +900,31 @@ OOVPATable DSound_1_0_5233[] = {
// CDirectSoundBuffer::SetVolume (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetVolume_1_0_5233),
// IDirectSoundBuffer8::SetVolume
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVolume_1_0_5233, XTL::EmuIDirectSoundBuffer8_SetVolume),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVolume_1_0_5233, IDirectSoundBuffer8_SetVolume),
// CDirectSoundStream_SetVolume (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_4627, XTL::EmuCDirectSoundStream_SetVolume),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_4627, CDirectSoundStream_SetVolume),
// IDirectSoundBuffer8::LockA (XREF)
OOVPA_TABLE_XREF(IDirectSoundBuffer8_LockA_1_0_4627),
// IDirectSoundBuffer8::Lock (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Lock_1_0_3936, XTL::EmuIDirectSoundBuffer8_Lock),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Lock_1_0_3936, IDirectSoundBuffer8_Lock),
// CDirectSound_CreateSoundStream (XREF) (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSound_CreateSoundStream_1_0_4361),
// DirectSoundCreateStream (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_4361, XTL::EmuDirectSoundCreateStream),
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_4361, DirectSoundCreateStream),
// IDirectSound8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, XTL::EmuIDirectSound8_Release),
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, IDirectSound8_Release),
// CMcpxBuffer::SetBufferData (XREF) (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxBuffer_SetBufferData_1_0_4361),
// CDirectSoundBuffer::SetBufferData (XREF) (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetBufferData_1_0_4361),
// IDirectSoundBuffer8::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetBufferData),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, IDirectSoundBuffer8_SetBufferData),
// CMcpxBuffer::GetStatusB (XRef) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CMcpxBuffer_GetStatusB_1_0_4627),
// CDirectSoundBuffer::GetStatus (XRef) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_GetStatus_1_0_4627),
// IDirectSoundBuffer8::GetStatus (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_4627, XTL::EmuIDirectSoundBuffer8_GetStatus),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_4627, IDirectSoundBuffer8_GetStatus),
// CMcpxBuffer::GetCurrentPosition (XRef) (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CMcpxBuffer_GetCurrentPosition_1_0_4361),
// CMcpxBuffer::Play (XREF) (* unchanged since 4928 *)
@ -932,125 +932,125 @@ OOVPATable DSound_1_0_5233[] = {
// CDirectSoundBuffer::Play (XREF) (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_Play_1_0_4361),
// IDirectSoundBuffer8::Play (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play_1_0_4361, XTL::EmuIDirectSoundBuffer8_Play),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play_1_0_4361, IDirectSoundBuffer8_Play),
// CDirectSoundStream::FlushEx (XREF)
OOVPA_TABLE_XREF(CDirectSoundStream_FlushEx_1_0_5233),
// IDirectSoundBuffer8::StopEx
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_StopEx_1_0_5233, XTL::EmuIDirectSoundBuffer8_StopEx),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_StopEx_1_0_5233, IDirectSoundBuffer8_StopEx),
// DirectSound::CDirectSound::EnableHeadphones (XRef)
OOVPA_TABLE_XREF(CDirectSound_EnableHeadphones_1_0_5233),
// IDirectSound8::EnableHeadphones
OOVPA_TABLE_PATCH(IDirectSound8_EnableHeadphones_1_0_5233, XTL::EmuIDirectSound8_EnableHeadphones),
OOVPA_TABLE_PATCH(IDirectSound8_EnableHeadphones_1_0_5233, IDirectSound8_EnableHeadphones),
// IDirectSound8::DownloadEffectsImage (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, XTL::EmuIDirectSound8_DownloadEffectsImage),
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, IDirectSound8_DownloadEffectsImage),
// IDirectSound8::SetOrientation (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, XTL::EmuIDirectSound8_SetOrientation),
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, IDirectSound8_SetOrientation),
// CDirectSound::SetDistanceFactorA (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetDistanceFactor_1_0_5344),
// IDirectSound8::SetDistanceFactor
OOVPA_TABLE_PATCH(IDirectSound_SetDistanceFactor_1_0_5344, XTL::EmuIDirectSound8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSound_SetDistanceFactor_1_0_5344, IDirectSound8_SetDistanceFactor),
// CDirectSound::SetDistanceFactorA (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSound_SetDistanceFactorA_1_0_4627),
// IDirectSound8::SetDistanceFactor (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_4432, XTL::EmuIDirectSound8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_4432, IDirectSound8_SetDistanceFactor),
// CDirectSound::SetRolloffFactor (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSound_SetRolloffFactor_1_0_4627),
// IDirectSound8::SetRolloffFactor (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_4627, XTL::EmuIDirectSound8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_4627, IDirectSound8_SetRolloffFactor),
// CDirectSound::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetDopplerFactor_1_0_5344),
// IDirectSound8::SetDopplerFactor
OOVPA_TABLE_PATCH(IDirectSound_SetDopplerFactor_1_0_5344, XTL::EmuIDirectSound8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSound_SetDopplerFactor_1_0_5344, IDirectSound8_SetDopplerFactor),
// CDirectSound::SetDopplerFactor (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSound_SetDopplerFactor_1_0_4627),
// IDirectSound8::SetDopplerFactor (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetDopplerFactor_1_0_4627, XTL::EmuIDirectSound8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDopplerFactor_1_0_4627, IDirectSound8_SetDopplerFactor),
// CDirectSound::CommitDeferredSettings (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(CDirectSound_CommitDeferredSettings_1_0_4432, XTL::EmuCDirectSound_CommitDeferredSettings),
OOVPA_TABLE_PATCH(CDirectSound_CommitDeferredSettings_1_0_4432, CDirectSound_CommitDeferredSettings),
// CDirectSoundVoice::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMaxDistance_1_0_5344),
// CDirectSoundBuffer::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMaxDistance_1_0_5344),
// IDirectSoundBuffer_SetMaxDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_5344, XTL::EmuIDirectSoundBuffer8_SetMaxDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_5344, IDirectSoundBuffer8_SetMaxDistance),
// CDirectSoundVoice::SetMinDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMinDistance_1_0_5344),
// CDirectSoundBuffer::SetMinDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMinDistance_1_0_5344),
// IDirectSoundBuffer_SetMinDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_5344, XTL::EmuIDirectSoundBuffer8_SetMinDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_5344, IDirectSoundBuffer8_SetMinDistance),
// CDirectSoundVoice::SetMinDistance (XREF) (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMinDistance_1_0_4432),
// CDirectSoundBuffer::SetMinDistance (XREF) (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMinDistance_1_0_4432),
// IDirectSoundBuffer_SetMinDistance (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_4432, XTL::EmuIDirectSoundBuffer8_SetMinDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_4432, IDirectSoundBuffer8_SetMinDistance),
// CDirectSoundVoice::SetMaxDistance (XREF) (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMaxDistance_1_0_4432),
// CDirectSoundBuffer::SetMaxDistance (XREF) (* unchanged since 4432 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMaxDistance_1_0_4432),
// IDirectSoundBuffer_SetMaxDistance (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_4432, XTL::EmuIDirectSoundBuffer8_SetMaxDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_4432, IDirectSoundBuffer8_SetMaxDistance),
// CDirectSoundVoice::SetPosition (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetPosition_1_0_4627),
// CDirectSoundBuffer::SetPosition (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetPosition_1_0_4627),
// IDirectSoundBuffer8_SetPosition (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPosition_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPosition_1_0_3936, IDirectSoundBuffer8_SetPosition),
// CDirectSoundVoice::SetVelocity (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetVelocity_1_0_4627),
// CDirectSoundBuffer::SetVelocity (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetVelocity_1_0_4627),
// IDirectSoundBuffer8_SetVelocity (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVelocity_1_0_3936, XTL::EmuIDirectSoundBuffer8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVelocity_1_0_3936, IDirectSoundBuffer8_SetVelocity),
// CDirectSoundVoice::SetI3DL2Source (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetI3DL2Source_1_0_4627),
// CDirectSoundBuffer::SetI3DL2Source (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetI3DL2Source_1_0_4627),
// IDirectSoundBuffer_SetI3DL2Source (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetI3DL2Source_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetI3DL2Source),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetI3DL2Source_1_0_4627, IDirectSoundBuffer8_SetI3DL2Source),
// IDirectSoundBuffer_Stop (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Stop_1_0_4627, XTL::EmuIDirectSoundBuffer8_Stop),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Stop_1_0_4627, IDirectSoundBuffer8_Stop),
// IDirectSoundBuffer8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, XTL::EmuIDirectSoundBuffer8_Release),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, IDirectSoundBuffer8_Release),
// IDirectSoundStream::SetVolume
// (This is actually the XREF we are using)
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_5233, XTL::EmuIDirectSoundStream_SetVolume),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_5233, IDirectSoundStream_SetVolume),
// DirectSound::CDirectSoundVoice::SetFormat (XRef)
OOVPA_TABLE_XREF(X_DirectSound_CDirectSoundVoice_SetFormat_1_0_5233),
// DirectSound::CDirectSoundBuffer::SetFormat (XRef) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(X_DirectSound_CDirectSoundBuffer_SetFormat_1_0_4627),
// IDirectSoundBuffer8_SetFormat (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(X_IDirectSoundBuffer_SetFormat_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetFormat),
OOVPA_TABLE_PATCH(X_IDirectSoundBuffer_SetFormat_1_0_4627, IDirectSoundBuffer8_SetFormat),
// CDirectSoundVoice::SetMode (XRef)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMode_1_0_5233),
// CDirectSoundBuffer::SetMode (XRef)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMode_1_0_5233),
// IDirectSoundBuffer_SetMode
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMode_1_0_5233, XTL::EmuIDirectSoundBuffer8_SetMode),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMode_1_0_5233, IDirectSoundBuffer8_SetMode),
// CDirectSoundVoice::SetRolloffCurve (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetRolloffCurve_1_0_5233),
// CDirectSoundBuffer::SetRolloffCurve (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetRolloffCurve_1_0_5233),
// IDirectSoundBuffer8::SetRolloffCurve
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetRolloffCurve_1_0_5233, XTL::EmuIDirectSoundBuffer8_SetRolloffCurve),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetRolloffCurve_1_0_5233, IDirectSoundBuffer8_SetRolloffCurve),
// IDirectSound8::AddRef (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, XTL::EmuIDirectSound8_AddRef),
OOVPA_TABLE_PATCH(IDirectSound8_AddRef_1_0_3936, IDirectSound8_AddRef),
// CDirectSound_SetI3DL2Listener
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetI3DL2Listener_1_0_5344),
// IDirectSound8_SetI3DL2Listener
OOVPA_TABLE_PATCH(IDirectSound_SetI3DL2Listener_1_0_5344, XTL::EmuIDirectSound8_SetI3DL2Listener),
OOVPA_TABLE_PATCH(IDirectSound_SetI3DL2Listener_1_0_5344, IDirectSound8_SetI3DL2Listener),
// CDirectSound::SetRolloffFactor (XREF)`
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetRolloffFactor_1_0_5344),
// IDirectSound8::SetRolloffFactor
OOVPA_TABLE_PATCH(IDirectSound_SetRolloffFactor_1_0_5344, XTL::EmuIDirectSound8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSound_SetRolloffFactor_1_0_5344, IDirectSound8_SetRolloffFactor),
#if 0 // Add when needed...
// CDirectSoundVoice::SetDistanceFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetDistanceFactor_1_0_5558),
// CDirectSoundBuffer::SetDistanceFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetDistanceFactor_1_0_5558),
// IDirectSoundBuffer_SetDistanceFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetDistanceFactor_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetDistanceFactor_1_0_5558, IDirectSoundBuffer8_SetDistanceFactor),
#endif
};

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

@ -1949,17 +1949,17 @@ OOVPA_END;
OOVPATable DSound_1_0_5558[] = {
// DirectSoundCreate (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, XTL::EmuDirectSoundCreate),
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, DirectSoundCreate),
// CDirectSound_CreateSoundBuffer (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSound_CreateSoundBuffer_1_0_4627),
// CDirectSound::SynchPlayback
OOVPA_TABLE_PATCH(CDirectSound_SynchPlayback_1_0_5558, XTL::EmuCDirectSound_SynchPlayback),
OOVPA_TABLE_PATCH(CDirectSound_SynchPlayback_1_0_5558, CDirectSound_SynchPlayback),
// CMcpxStream::Pause
OOVPA_TABLE_XREF(CMcpxStream_Pause_1_0_5558),
// CDirectSoundStream::Pause
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_5558, XTL::EmuCDirectSoundStream_Pause),
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_5558, CDirectSoundStream_Pause),
// CDirectSoundStream::Pause (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_4361, XTL::EmuCDirectSoundStream_Pause),
OOVPA_TABLE_PATCH(CDirectSoundStream_Pause_1_0_4361, CDirectSoundStream_Pause),
// CDirectSoundVoiceSettings_SetMixBinVolumes (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundVoiceSettings_SetMixBinVolumes_1_0_4627),
// CDirectSoundVoice_SetMixBinVolumes (* unchanged since 4627 *)
@ -1967,53 +1967,53 @@ OOVPATable DSound_1_0_5558[] = {
// CDirectSoundBuffer_SetMixBinVolumes (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMixBinVolumes_1_0_4627),
// IDirectSoundBuffer8_SetMixBinVolumes (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBinVolumes_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetMixBinVolumes),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBinVolumes_1_0_4627, IDirectSoundBuffer8_SetMixBinVolumes),
// IDirectSound8::CreateSoundBuffer (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4627, XTL::EmuIDirectSound8_CreateSoundBuffer),
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4627, IDirectSound8_CreateSoundBuffer),
// CDirectSound::CommitDeferredSettings
OOVPA_TABLE_PATCH(CDirectSound_CommitDeferredSettings_1_0_5558, XTL::EmuCDirectSound_CommitDeferredSettings),
OOVPA_TABLE_PATCH(CDirectSound_CommitDeferredSettings_1_0_5558, CDirectSound_CommitDeferredSettings),
// CDirectSound::SetDistanceFactorA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDistanceFactorA_1_0_5558),
// IDirectSound8::SetDistanceFactor (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_4432, XTL::EmuIDirectSound8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_4432, IDirectSound8_SetDistanceFactor),
// CDirectSound::SetRolloffFactor (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetRolloffFactor_1_0_5558),
// IDirectSound8::SetRolloffFactor (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_4627, XTL::EmuIDirectSound8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_4627, IDirectSound8_SetRolloffFactor),
// CDirectSound::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDopplerFactor_1_0_5558),
// CDirectSoundStream::FlushEx (XREF) (* unchanged since 5233 *)
OOVPA_TABLE_XREF(CDirectSoundStream_FlushEx_1_0_5233),
// IDirectSoundBuffer8::StopEx (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_StopEx_1_0_5233, XTL::EmuIDirectSoundBuffer8_StopEx),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_StopEx_1_0_5233, IDirectSoundBuffer8_StopEx),
// IDirectSound8::SetDopplerFactor (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetDopplerFactor_1_0_4627, XTL::EmuIDirectSound8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDopplerFactor_1_0_4627, IDirectSound8_SetDopplerFactor),
// CDirectSoundVoice::SetFrequency (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetFrequency_1_0_4627),
// CDirectSoundBuffer::SetFrequency (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetFrequency_1_0_4627),
// CDirectSoundStream::SetFrequency
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFrequency_1_0_5558, XTL::EmuCDirectSoundStream_SetFrequency),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFrequency_1_0_5558, CDirectSoundStream_SetFrequency),
// IDirectSoundBuffer8::SetFrequency (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetFrequency),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_4627, IDirectSoundBuffer8_SetFrequency),
// CMcpxVoiceClient_SetVolume
OOVPA_TABLE_XREF(CMcpxVoiceClient_SetVolume_1_0_5558),
// CDirectSound_CreateSoundStream (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSound_CreateSoundStream_1_0_4361),
// DirectSoundCreateStream (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_4361, XTL::EmuDirectSoundCreateStream),
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_4361, DirectSoundCreateStream),
// IDirectSound8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, XTL::EmuIDirectSound8_Release),
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, IDirectSound8_Release),
// IDirectSound8::DownloadEffectsImage (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, XTL::EmuIDirectSound8_DownloadEffectsImage),
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, IDirectSound8_DownloadEffectsImage),
// IDirectSound8::SetOrientation (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, XTL::EmuIDirectSound8_SetOrientation),
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, IDirectSound8_SetOrientation),
// CDirectSoundVoice::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMaxDistance_1_0_5558),
// CDirectSoundBuffer::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMaxDistance_1_0_5558),
// IDirectSoundBuffer_SetMaxDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetMaxDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_5558, IDirectSoundBuffer8_SetMaxDistance),
// CDirectSoundVoice::SetMinDistance (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetMinDistance_1_0_5558),
// CDirectSoundBuffer::SetMinDistance (XREF)
@ -2021,51 +2021,51 @@ OOVPATable DSound_1_0_5558[] = {
// CDirectSoundStream::SetRolloffCurve (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundStream_SetRolloffCurve_1_0_5558),
// IDirectSoundBuffer_SetMinDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetMinDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_5558, IDirectSoundBuffer8_SetMinDistance),
// CDirectSoundVoice::SetRolloffFactor (XREF) (* unchanged since 4627 *)
/* THESE ARE NOT CORRECT
OOVPA_TABLE_XREF(CDirectSoundVoice_SetRolloffFactor_1_0_4627),
// CDirectSoundBuffer::SetRolloffFactor (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetRolloffFactor_1_0_4627),
// IDirectSoundBuffer_SetRolloffFactor (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetRolloffFactor_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetRolloffFactor_1_0_4627, IDirectSoundBuffer8_SetRolloffFactor),
*/
// CDirectSoundVoice::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetDopplerFactor_1_0_5558),
// CDirectSoundBuffer::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetDopplerFactor_1_0_5558),
// IDirectSoundBuffer8_SetDopplerFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetDopplerFactor_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetDopplerFactor_1_0_5558, IDirectSoundBuffer8_SetDopplerFactor),
// IDirectSoundBuffer_Stop (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Stop_1_0_4627, XTL::EmuIDirectSoundBuffer8_Stop),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Stop_1_0_4627, IDirectSoundBuffer8_Stop),
//// CDirectSound_SetMixBinHeadroom
//OOVPA_TABLE_XREF(CDirectSound_SetMixBinHeadroom_1_0_4627), //// IDirectSound8_SetMixBinHeadroom
//OOVPA_TABLE_PATCH(IDirectSound8_SetMixBinHeadroom_1_0_5558, XTL::EmuIDirectSound8_SetMixBinHeadroom),
//OOVPA_TABLE_PATCH(IDirectSound8_SetMixBinHeadroom_1_0_5558, IDirectSound8_SetMixBinHeadroom),
// CDirectSound_SetI3DL2Listener
OOVPA_TABLE_XREF(CDirectSound_SetI3DL2Listener_1_0_5558),
// IDirectSound8_SetI3DL2Listener
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_5558, XTL::EmuIDirectSound8_SetI3DL2Listener),
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_5558, IDirectSound8_SetI3DL2Listener),
// IDirectSoundBuffer8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, XTL::EmuIDirectSoundBuffer8_Release),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, IDirectSoundBuffer8_Release),
// DirectSound::CFullHRTFSource::GetCenterVolume (XREF)
OOVPA_TABLE_XREF(DirectSound_CFullHRTFSource_GetCenterVolume_1_0_5558),
// DirectSound::CHRTFSource::SetFullHRTF5Channel (XREF)
OOVPA_TABLE_XREF(DirectSound_CHRTFSource_SetFullHRTF5Channel_1_0_5558),
// DirectSoundUseFullHRTF
OOVPA_TABLE_PATCH(DirectSoundUseFullHRTF_1_0_5558, XTL::EmuDirectSoundUseFullHRTF),
OOVPA_TABLE_PATCH(DirectSoundUseFullHRTF_1_0_5558, DirectSoundUseFullHRTF),
// DirectSoundDoWork
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_5558, XTL::EmuDirectSoundDoWork),
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_5558, DirectSoundDoWork),
// CDirectSoundBuffer::SetBufferData
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetBufferData_1_0_5558),
// IDirectSoundBuffer8::SetBufferData
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetBufferData),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_5558, IDirectSoundBuffer8_SetBufferData),
// CMcpxBuffer::SetCurrentPosition
OOVPA_TABLE_XREF(CMcpxBuffer_SetCurrentPosition_1_0_5558),
// CDirectSoundBuffer::SetCurrentPosition
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetCurrentPosition_1_0_5558),
// IDirectSoundBuffer8::SetCurrentPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetCurrentPosition_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetCurrentPosition_1_0_5558, IDirectSoundBuffer8_SetCurrentPosition),
// DirectSound::CMcpxVoiceClient::SetLFO (XREF)
OOVPA_TABLE_XREF(CMcpxVoiceClient_SetLFO_1_0_5558),
// CDirectSoundVoice::SetLFO (XREF)
@ -2073,15 +2073,15 @@ OOVPATable DSound_1_0_5558[] = {
// CDirectSoundBuffer::SetLFO (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetLFO_1_0_5558),
// IDirectSoundBuffer8::SetLFO
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLFO_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetLFO),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLFO_1_0_5558, IDirectSoundBuffer8_SetLFO),
// CDirectSoundVoice::SetVolume (XREF) (* unchanged since 5233 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetVolume_1_0_5233),
// CDirectSoundBuffer::SetVolume (XREF) (* unchanged since 5233 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetVolume_1_0_5233),
// IDirectSoundBuffer8::SetVolume (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVolume_1_0_5233, XTL::EmuIDirectSoundBuffer8_SetVolume),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVolume_1_0_5233, IDirectSoundBuffer8_SetVolume),
// CDirectSoundStream_SetVolume (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_4627, XTL::EmuCDirectSoundStream_SetVolume),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_4627, CDirectSoundStream_SetVolume),
// CDirectSoundVoiceSettings_SetMixBins
OOVPA_TABLE_XREF(CDirectSoundVoiceSettings_SetMixBins_1_0_5558),
// CDirectSoundVoice_SetMixBins
@ -2089,53 +2089,53 @@ OOVPATable DSound_1_0_5558[] = {
// CDirectSoundBuffer_SetMixBins
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMixBins_1_0_5558),
// IDirectSoundBuffer8_SetMixBins
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBins_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetMixBins),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBins_1_0_5558, IDirectSoundBuffer8_SetMixBins),
// CDirectSoundBuffer::SetPlayRegion
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetPlayRegion_1_0_5558),
// IDirectSoundBuffer8::SetPlayRegion
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetPlayRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_5558, IDirectSoundBuffer8_SetPlayRegion),
// CDirectSoundBuffer::SetLoopRegion (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetLoopRegion_1_0_5558),
// IDirectSoundBuffer8::SetLoopRegion
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLoopRegion_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetLoopRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLoopRegion_1_0_5558, IDirectSoundBuffer8_SetLoopRegion),
// CMcpxBuffer::Play
OOVPA_TABLE_XREF(CMcpxBuffer_Play_1_0_5558),
// CDirectSoundBuffer::Play (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_Play_1_0_5558),
// IDirectSoundBuffer_Play
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play_1_0_5558, XTL::EmuIDirectSoundBuffer8_Play),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Play_1_0_5558, IDirectSoundBuffer8_Play),
// CMcpxBuffer::GetStatus
OOVPA_TABLE_XREF(CMcpxBuffer_GetStatus_1_0_5558),
// CDirectSoundBuffer::GetStatus
OOVPA_TABLE_XREF(CDirectSoundBuffer_GetStatus_1_0_4627),
// IDirectSoundBuffer8::GetStatus
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_4627, XTL::EmuIDirectSoundBuffer8_GetStatus),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_4627, IDirectSoundBuffer8_GetStatus),
// WaveFormat::CreateXboxAdpcmFormat (XREF)
OOVPA_TABLE_XREF(WaveFormat_CreateXboxAdpcmFormat_1_0_5558),
// XAudioCreateAdpcmFormat
OOVPA_TABLE_PATCH(XAudioCreateAdpcmFormat_1_0_5558, XTL::EmuXAudioCreateAdpcmFormat),
OOVPA_TABLE_PATCH(XAudioCreateAdpcmFormat_1_0_5558, XAudioCreateAdpcmFormat),
// CDirectSoundVoice::SetFormat (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetFormat_1_0_5558),
// CDirectSoundBuffer::SetFormat (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetFormat_1_0_5558),
// IDirectSoundBuffer8_SetFormat
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFormat_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetFormat),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFormat_1_0_5558, IDirectSoundBuffer8_SetFormat),
// CDirectSoundVoice::SetConeAngles (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetConeAngles_1_0_5558),
// CDirectSoundBuffer::SetConeAngles (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetConeAngles_1_0_5558),
// IDirectSoundBuffer_SetConeAngles
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetConeAngles_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetConeAngles),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetConeAngles_1_0_5558, IDirectSoundBuffer8_SetConeAngles),
// CDirectSoundVoice::SetRolloffCurve (XREF) (* unchanged since 5233 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetRolloffCurve_1_0_5233),
// CDirectSoundBuffer::SetRolloffCurve (XREF) (* unchanged since 5233 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetRolloffCurve_1_0_5233),
// CDirectSoundStream::SetRolloffCurve
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetRolloffCurve_1_0_5558, XTL::EmuCDirectSoundStream_SetRolloffCurve),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetRolloffCurve_1_0_5558, CDirectSoundStream_SetRolloffCurve),
// IDirectSoundBuffer8::SetRolloffCurve (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetRolloffCurve_1_0_5233, XTL::EmuIDirectSoundBuffer8_SetRolloffCurve),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetRolloffCurve_1_0_5233, IDirectSoundBuffer8_SetRolloffCurve),
// CDirectSoundVoice::CommitDeferredSettings (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_CommitDeferredSettings_1_0_5558),
@ -2145,87 +2145,87 @@ OOVPATable DSound_1_0_5558[] = {
// CDirectSoundBuffer::SetAllParameters (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetAllParameters_1_0_5558),
// IDirectSoundBuffer8::SetAllParameters
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetAllParameters_1_0_5558, XTL::EmuIDirectSound8_SetAllParameters), // Use that for now, EmuIDirectSoundBuffer8_SetAllParameters,
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetAllParameters_1_0_5558, IDirectSound8_SetAllParameters), // Use that for now, EmuIDirectSoundBuffer8_SetAllParameters,
*/
// CDirectSoundVoice::SetPosition (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetPosition_1_0_5558),
// CDirectSoundBuffer::SetPosition (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetPosition_1_0_5558),
// IDirectSoundBuffer_SetPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPosition_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPosition_1_0_5558, IDirectSoundBuffer8_SetPosition),
// CDirectSoundVoice::SetVelocity (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetVelocity_1_0_5558),
// CDirectSoundBuffer::SetVelocity (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetVelocity_1_0_5558),
// IDirectSoundBuffer::SetVelocity
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVelocity_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVelocity_1_0_5558, IDirectSoundBuffer8_SetVelocity),
// CDirectSoundVoice::SetDistanceFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetDistanceFactor_1_0_5558),
// CDirectSoundBuffer::SetDistanceFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetDistanceFactor_1_0_5558),
// IDirectSoundBuffer_SetDistanceFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetDistanceFactor_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetDistanceFactor_1_0_5558, IDirectSoundBuffer8_SetDistanceFactor),
// IDirectSoundStream::SetVolume (* unchanged since 5233 *)
// (This is actually the XREF we are using)
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_5233, XTL::EmuIDirectSoundStream_SetVolume),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_5233, IDirectSoundStream_SetVolume),
// DirectSoundCreateBuffer
OOVPA_TABLE_PATCH(DirectSoundCreateBuffer_1_0_4627, XTL::EmuDirectSoundCreateBuffer),
OOVPA_TABLE_PATCH(DirectSoundCreateBuffer_1_0_4627, DirectSoundCreateBuffer),
// IDirectSoundBuffer_Lock
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Lock_1_0_5558, XTL::EmuIDirectSoundBuffer8_Lock),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Lock_1_0_5558, IDirectSoundBuffer8_Lock),
// CDirectSoundVoice::SetI3DL2Source (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetI3DL2Source_1_0_5558),
// CDirectSoundBuffer::SetI3DL2Source (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetI3DL2Source_1_0_5558),
// IDirectSoundBuffer_SetI3DL2Source
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetI3DL2Source_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetI3DL2Source),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetI3DL2Source_1_0_5558, IDirectSoundBuffer8_SetI3DL2Source),
// CDirectSoundVoice::SetAllParameters (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetAllParameters_1_0_5558),
// CDirectSoundBuffer::SetAllParameters (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetAllParameters_1_0_5558),
// IDirectSoundBuffer_SetAllParameters
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetAllParameters_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetAllParameters),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetAllParameters_1_0_5558, IDirectSoundBuffer8_SetAllParameters),
// DirectSound::CDirectSoundVoice::SetHeadroom (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetHeadroom_1_0_5558),
// DirectSound::CDirectSoundBuffer::SetHeadroom (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetHeadroom_1_0_5558),
// IDirectSoundBuffer_SetHeadroom
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetHeadroom_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetHeadroom),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetHeadroom_1_0_5558, IDirectSoundBuffer8_SetHeadroom),
// DirectSound::CDirectSoundStream::SetHeadroom
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetHeadroom_1_0_5558, XTL::EmuIDirectSoundStream_SetHeadroom),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetHeadroom_1_0_5558, IDirectSoundStream_SetHeadroom),
// CDirectSoundBuffer::GetCurrentPosition
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_GetCurrentPosition_1_0_5558),
// IDirectSoundBuffer8::GetCurrentPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer_GetCurrentPosition_1_0_5558, XTL::EmuIDirectSoundBuffer8_GetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_GetCurrentPosition_1_0_5558, IDirectSoundBuffer8_GetCurrentPosition),
// CDirectSoundStream::SetFormat (XREF)
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFormat_1_0_5558, XTL::EmuCDirectSoundStream_SetFormat),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFormat_1_0_5558, CDirectSoundStream_SetFormat),
// CDirectSoundStream_SetMixBins
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBins_1_0_5558, XTL::EmuCDirectSoundStream_SetMixBins),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBins_1_0_5558, CDirectSoundStream_SetMixBins),
// CDirectSound_SetMixBinHeadroom
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetMixBinHeadroom_1_0_5558),
// IDirectSound8_SetMixBinHeadroom
OOVPA_TABLE_PATCH(IDirectSound_SetMixBinHeadroom_1_0_5558, XTL::EmuIDirectSound8_SetMixBinHeadroom),
OOVPA_TABLE_PATCH(IDirectSound_SetMixBinHeadroom_1_0_5558, IDirectSound8_SetMixBinHeadroom),
// DirectSound::CDirectSound::EnableHeadphones (XRef)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_EnableHeadphones_1_0_5558),
// IDirectSound8::EnableHeadphones
OOVPA_TABLE_PATCH(IDirectSound_EnableHeadphones_1_0_5558, XTL::EmuIDirectSound8_EnableHeadphones),
OOVPA_TABLE_PATCH(IDirectSound_EnableHeadphones_1_0_5558, IDirectSound8_EnableHeadphones),
// DirectSound::CDirectSound::GetOutputLevels (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_GetOutputLevels_1_0_5558),
// IDirectSound_GetOutputLevels
OOVPA_TABLE_PATCH(IDirectSound_GetOutputLevels_1_0_5558, XTL::EmuIDirectSound8_GetOutputLevels),
OOVPA_TABLE_PATCH(IDirectSound_GetOutputLevels_1_0_5558, IDirectSound8_GetOutputLevels),
// XAudioDownloadEffectsImage
OOVPA_TABLE_PATCH(XAudioDownloadEffectsImage_1_0_5558, XTL::EmuXAudioDownloadEffectsImage),
OOVPA_TABLE_PATCH(XAudioDownloadEffectsImage_1_0_5558, XAudioDownloadEffectsImage),
// CDirectSound::SetPosition (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetPosition_1_0_5558),
// IDirectSound8::SetPosition
OOVPA_TABLE_PATCH(IDirectSound_SetPosition_1_0_5558, XTL::EmuIDirectSound8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSound_SetPosition_1_0_5558, IDirectSound8_SetPosition),
// CDirectSound::SetVelocity (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetVelocity_1_0_5558),
// IDirectSound8::SetVelocity
OOVPA_TABLE_PATCH(IDirectSound_SetVelocity_1_0_5558, XTL::EmuIDirectSound8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSound_SetVelocity_1_0_5558, IDirectSound8_SetVelocity),
// CDirectSound_CreateSoundStream
OOVPA_TABLE_XREF(DirectSound_CDirectSound_CreateSoundStream_1_0_5558),
// IDirectSound_CreateSoundStream
OOVPA_TABLE_PATCH(IDirectSound_CreateSoundStream_1_0_5558, XTL::EmuIDirectSound8_CreateStream),
OOVPA_TABLE_PATCH(IDirectSound_CreateSoundStream_1_0_5558, IDirectSound8_CreateStream),
};
// ******************************************************************

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

@ -1608,40 +1608,40 @@ OOVPA_END;
OOVPATable DSound_1_0_5788[] = {
// DirectSoundCreate (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, XTL::EmuDirectSoundCreate),
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, DirectSoundCreate),
// CDirectSound_CreateSoundBuffer
OOVPA_TABLE_XREF(CDirectSound_CreateSoundBuffer_1_0_4627),
// IDirectSoundBuffer8::SetPlayRegion (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetPlayRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_4361, IDirectSoundBuffer8_SetPlayRegion),
// CMcpxBuffer::SetBufferData
OOVPA_TABLE_XREF(CMcpxBuffer_SetBufferData_1_0_5788),
// CDirectSoundBuffer::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetBufferData_1_0_4361),
// IDirectSoundBuffer8::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetBufferData),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, IDirectSoundBuffer8_SetBufferData),
// CMcpxBuffer::GetStatus
OOVPA_TABLE_XREF(CMcpxBuffer_GetStatus_1_0_5788),
// CDirectSoundBuffer::GetStatus
OOVPA_TABLE_XREF(CDirectSoundBuffer_GetStatus_1_0_4627),
// IDirectSoundBuffer8::GetStatus
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_4627, XTL::EmuIDirectSoundBuffer8_GetStatus),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_4627, IDirectSoundBuffer8_GetStatus),
// CDirectSound_SetI3DL2Listener
OOVPA_TABLE_XREF(CDirectSound_SetI3DL2Listener_1_0_5788),
// IDirectSound8_SetI3DL2Listener
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_5788, XTL::EmuIDirectSound8_SetI3DL2Listener),
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_5788, IDirectSound8_SetI3DL2Listener),
// DirectSound::CDirectSoundVoice::SetFormat (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetFormat_1_0_5788),
// DirectSound::CDirectSoundBuffer::SetFormat (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetFormat_1_0_5788),
// IDirectSoundBuffer8_SetFormat
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFormat_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetFormat),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFormat_1_0_5788, IDirectSoundBuffer8_SetFormat),
// CDirectSoundVoice::SetConeAngles (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetConeAngles_1_0_5558),
// CDirectSoundBuffer::SetConeAngles (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetConeAngles_1_0_5558),
// IDirectSoundBuffer_SetConeAngles
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetConeAngles_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetConeAngles),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetConeAngles_1_0_5558, IDirectSoundBuffer8_SetConeAngles),
// CDirectSoundVoiceSettings_SetMixBinVolumes
OOVPA_TABLE_XREF(CDirectSoundVoiceSettings_SetMixBinVolumes_1_0_4627),
// CDirectSoundVoice_SetMixBinVolumes
@ -1649,45 +1649,45 @@ OOVPATable DSound_1_0_5788[] = {
// CDirectSoundBuffer_SetMixBinVolumes
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMixBinVolumes_1_0_4627),
// IDirectSoundBuffer8_SetMixBinVolumes
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBinVolumes_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetMixBinVolumes),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBinVolumes_1_0_4627, IDirectSoundBuffer8_SetMixBinVolumes),
// CDirectSoundStream_SetMixBinVolumes
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBinVolumes_1_0_5788, XTL::EmuCDirectSoundStream_SetMixBinVolumes2),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBinVolumes_1_0_5788, CDirectSoundStream_SetMixBinVolumes2),
// CDirectSoundVoice::SetRolloffCurve (XREF) (* unchanged since 5233 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetRolloffCurve_1_0_5233),
// CDirectSoundBuffer::SetRolloffCurve (XREF) (* unchanged since 5233 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetRolloffCurve_1_0_5233),
// CDirectSoundStream::SetRolloffCurve
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetRolloffCurve_1_0_5558, XTL::EmuCDirectSoundStream_SetRolloffCurve),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetRolloffCurve_1_0_5558, CDirectSoundStream_SetRolloffCurve),
// IDirectSoundBuffer8::SetRolloffCurve (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetRolloffCurve_1_0_5233, XTL::EmuIDirectSoundBuffer8_SetRolloffCurve),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetRolloffCurve_1_0_5233, IDirectSoundBuffer8_SetRolloffCurve),
// IDirectSound8::CreateSoundBuffer
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4627, XTL::EmuIDirectSound8_CreateSoundBuffer),
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4627, IDirectSound8_CreateSoundBuffer),
// CDirectSoundVoice::SetFrequency (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetFrequency_1_0_4627),
// CDirectSoundBuffer::SetFrequency
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetFrequency_1_0_4627),
// IDirectSoundBuffer8::SetFrequency
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetFrequency),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_4627, IDirectSoundBuffer8_SetFrequency),
// CDirectSoundStream_SetVolume
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_4627, XTL::EmuCDirectSoundStream_SetVolume),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_4627, CDirectSoundStream_SetVolume),
// IDirectSound8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, XTL::EmuIDirectSound8_Release),
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, IDirectSound8_Release),
// IDirectSound8::DownloadEffectsImage (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, XTL::EmuIDirectSound8_DownloadEffectsImage),
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, IDirectSound8_DownloadEffectsImage),
// IDirectSound8::SetOrientation (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, XTL::EmuIDirectSound8_SetOrientation),
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, IDirectSound8_SetOrientation),
// CDirectSoundVoice::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetMaxDistance_1_0_5788),
// CDirectSoundBuffer::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetMaxDistance_1_0_5788),
// IDirectSoundBuffer_SetMaxDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetMaxDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_5788, IDirectSoundBuffer8_SetMaxDistance),
// CDirectSoundVoice::SetMinDistance (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetMinDistance_1_0_5788),
// CDirectSoundBuffer::SetMinDistance (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetMinDistance_1_0_5788),
// IDirectSoundBuffer_SetMinDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetMinDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_5788, IDirectSoundBuffer8_SetMinDistance),
// CMcpxBuffer::Play
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_Play_1_0_5788),
// CMcpxBuffer::Play
@ -1695,35 +1695,35 @@ OOVPATable DSound_1_0_5788[] = {
OOVPA_TABLE_XREF(CMcpxBuffer_Play_1_0_5788),
*/
// IDirectSoundBuffer_Stop (Possibly weak, but quite OK for 4627 DSOUND)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Stop_1_0_4627, XTL::EmuIDirectSoundBuffer8_Stop),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Stop_1_0_4627, IDirectSoundBuffer8_Stop),
// IDirectSoundBuffer8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, XTL::EmuIDirectSoundBuffer8_Release),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, IDirectSoundBuffer8_Release),
// DirectSound::CFullHRTFSource::GetCenterVolume (XREF)
OOVPA_TABLE_XREF(DirectSound_CFullHRTFSource_GetCenterVolume_1_0_5558),
// DirectSound::CHRTFSource::SetFullHRTF5Channel (XREF)
OOVPA_TABLE_XREF(DirectSound_CHRTFSource_SetFullHRTF5Channel_1_0_5558),
// DirectSoundUseFullHRTF
OOVPA_TABLE_PATCH(DirectSoundUseFullHRTF_1_0_5558, XTL::EmuDirectSoundUseFullHRTF),
OOVPA_TABLE_PATCH(DirectSoundUseFullHRTF_1_0_5558, DirectSoundUseFullHRTF),
// DirectSound::CDirectSoundVoice::SetHeadroom (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetHeadroom_1_0_5788),
// DirectSound::CDirectSoundBuffer::SetHeadroom (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetHeadroom_1_0_5788),
// IDirectSoundBuffer_SetHeadroom
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetHeadroom_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetHeadroom),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetHeadroom_1_0_5788, IDirectSoundBuffer8_SetHeadroom),
// CDirectSoundVoice::SetAllParameters (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetAllParameters_1_0_5558),
// CDirectSoundBuffer::SetAllParameters (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetAllParameters_1_0_5558),
// IDirectSoundBuffer_SetAllParameters
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetAllParameters_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetAllParameters),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetAllParameters_1_0_5558, IDirectSoundBuffer8_SetAllParameters),
// IDirectSoundBuffer_Lock
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Lock_1_0_5788, XTL::EmuIDirectSoundBuffer8_Lock),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Lock_1_0_5788, IDirectSoundBuffer8_Lock),
// CDirectSoundVoice::SetI3DL2Source (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetI3DL2Source_1_0_5558),
// CDirectSoundBuffer::SetI3DL2Source (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetI3DL2Source_1_0_5558),
// IDirectSoundBuffer_SetI3DL2Source
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetI3DL2Source_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetI3DL2Source),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetI3DL2Source_1_0_5558, IDirectSoundBuffer8_SetI3DL2Source),
// DirectSound::CDirectSoundVoiceSettings::SetMixBins (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBins_1_0_5788),
// DirectSound::CDirectSoundVoice::SetMixBins (XREF)
@ -1731,37 +1731,37 @@ OOVPATable DSound_1_0_5788[] = {
// DirectSound::CDirectSoundBuffer::SetMixBins (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetMixBins_1_0_5788),
// IDirectSoundBuffer_SetMixBins
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMixBins_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetMixBins),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMixBins_1_0_5788, IDirectSoundBuffer8_SetMixBins),
// DirectSound::CDirectSoundStream::SetMixBins (XREF)
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBins_1_0_5788, XTL::EmuCDirectSoundStream_SetMixBins),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBins_1_0_5788, CDirectSoundStream_SetMixBins),
// CDirectSound_SetMixBinHeadroom
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetMixBinHeadroom_1_0_5788),
// IDirectSound8_SetMixBinHeadroom
OOVPA_TABLE_PATCH(IDirectSound_SetMixBinHeadroom_1_0_5788, XTL::EmuIDirectSound8_SetMixBinHeadroom),
OOVPA_TABLE_PATCH(IDirectSound_SetMixBinHeadroom_1_0_5788, IDirectSound8_SetMixBinHeadroom),
// CDirectSound::SetPosition (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetPosition_1_0_5788),
// IDirectSound8::SetPosition
OOVPA_TABLE_PATCH(IDirectSound_SetPosition_1_0_5788, XTL::EmuIDirectSound8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSound_SetPosition_1_0_5788, IDirectSound8_SetPosition),
// CDirectSound::SetVelocity (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetVelocity_1_0_5788),
// IDirectSound8::SetVelocity
OOVPA_TABLE_PATCH(IDirectSound_SetVelocity_1_0_5788, XTL::EmuIDirectSound8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSound_SetVelocity_1_0_5788, IDirectSound8_SetVelocity),
// CDirectSoundVoice::SetDistanceFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetDistanceFactor_1_0_5558),
// CDirectSoundBuffer::SetDistanceFactor (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetDistanceFactor_1_0_5558),
// IDirectSoundBuffer_SetDistanceFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetDistanceFactor_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetDistanceFactor_1_0_5558, IDirectSoundBuffer8_SetDistanceFactor),
// CDirectSound::CommitDeferredSettings
OOVPA_TABLE_PATCH(DirectSound_CDirectSound_CommitDeferredSettings_1_0_5788, XTL::EmuCDirectSound_CommitDeferredSettings),
OOVPA_TABLE_PATCH(DirectSound_CDirectSound_CommitDeferredSettings_1_0_5788, CDirectSound_CommitDeferredSettings),
// DirectSoundCreateBuffer
OOVPA_TABLE_PATCH(DirectSoundCreateBuffer_1_0_4627, XTL::EmuDirectSoundCreateBuffer),
OOVPA_TABLE_PATCH(DirectSoundCreateBuffer_1_0_4627, DirectSoundCreateBuffer),
// CMcpxBuffer::SetCurrentPosition
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_SetCurrentPosition_1_0_5788),
// CDirectSoundBuffer::SetCurrentPosition
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetCurrentPosition_1_0_5788),
// IDirectSoundBuffer8::SetCurrentPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetCurrentPosition_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetCurrentPosition_1_0_5788, IDirectSoundBuffer8_SetCurrentPosition),
// DirectSound::CMcpxVoiceClient::SetLFO (XREF)
OOVPA_TABLE_XREF(CMcpxVoiceClient_SetLFO_1_0_5558),
// CDirectSoundVoice::SetLFO (XREF)
@ -1769,43 +1769,43 @@ OOVPATable DSound_1_0_5788[] = {
// CDirectSoundBuffer::SetLFO (XREF)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetLFO_1_0_5558),
// IDirectSoundBuffer8::SetLFO
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLFO_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetLFO),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetLFO_1_0_5558, IDirectSoundBuffer8_SetLFO),
// CDirectSoundBuffer::GetCurrentPosition
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_GetCurrentPosition_1_0_5788),
// IDirectSoundBuffer8::GetCurrentPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer_GetCurrentPosition_1_0_5788, XTL::EmuIDirectSoundBuffer8_GetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_GetCurrentPosition_1_0_5788, IDirectSoundBuffer8_GetCurrentPosition),
// CDirectSoundBuffer::SetPlayRegion
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetPlayRegion_1_0_5558),
// IDirectSoundBuffer8::SetPlayRegion
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_5558, XTL::EmuIDirectSoundBuffer8_SetPlayRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_5558, IDirectSoundBuffer8_SetPlayRegion),
// CDirectSoundBuffer::SetLoopRegion (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetLoopRegion_1_0_5788),
// IDirectSoundBuffer8::SetLoopRegion
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetLoopRegion_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetLoopRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetLoopRegion_1_0_5788, IDirectSoundBuffer8_SetLoopRegion),
// CMcpxBuffer_Stop
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_Stop_1_0_5788),
// CDirectSoundBuffer_Stop
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_StopEx_1_0_5788),
// CDirectSoundBuffer_Stop
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundBuffer_StopEx_1_0_5788, XTL::EmuIDirectSoundBuffer8_StopEx),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundBuffer_StopEx_1_0_5788, IDirectSoundBuffer8_StopEx),
// CDirectSound::SetDistanceFactorA (XREF)
OOVPA_TABLE_XREF(CDirectSound_SetDistanceFactorA_1_0_5558),
// IDirectSound8::SetDistanceFactor (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_4432, XTL::EmuIDirectSound8_SetDistanceFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDistanceFactor_1_0_4432, IDirectSound8_SetDistanceFactor),
// CDirectSound::SetRolloffFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetRolloffFactor_1_0_5788),
// IDirectSound8::SetRolloffFactor (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_4627, XTL::EmuIDirectSound8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_4627, IDirectSound8_SetRolloffFactor),
// CDirectSound::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetDopplerFactor_1_0_5788),
// IDirectSound8::SetDopplerFactor (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetDopplerFactor_1_0_4627, XTL::EmuIDirectSound8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDopplerFactor_1_0_4627, IDirectSound8_SetDopplerFactor),
// CDirectSoundVoice::SetPitch
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetPitch_1_0_5788),
// IDirectSoundBuffer8::SetPitch
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetPitch_1_0_5788),
// IDirectSoundBuffer8::SetPitch
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPitch_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetPitch),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPitch_1_0_5788, IDirectSoundBuffer8_SetPitch),
// CMcpxVoiceClient_SetVolume
OOVPA_TABLE_XREF(CMcpxVoiceClient_SetVolume_1_0_5558),
// CDirectSoundVoice::SetVolume (XREF) (* unchanged since 5233 *)
@ -1813,114 +1813,114 @@ OOVPATable DSound_1_0_5788[] = {
// CDirectSoundBuffer::SetVolume (XREF) (* unchanged since 5233 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetVolume_1_0_5233),
// IDirectSoundBuffer8::SetVolume (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVolume_1_0_5233, XTL::EmuIDirectSoundBuffer8_SetVolume),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetVolume_1_0_5233, IDirectSoundBuffer8_SetVolume),
// IDirectSoundStream::SetVolume (* unchanged since 5233 *)
// (This is actually the XREF we are using)
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_5233, XTL::EmuIDirectSoundStream_SetVolume),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_5233, IDirectSoundStream_SetVolume),
// DirectSound::CDirectSoundBuffer::PlayEx (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_PlayEx_1_0_5788),
// IDirectSoundBuffer_PlayEx
OOVPA_TABLE_PATCH(IDirectSoundBuffer_PlayEx_1_0_5788, XTL::EmuIDirectSoundBuffer8_PlayEx),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_PlayEx_1_0_5788, IDirectSoundBuffer8_PlayEx),
// CDirectSoundVoice::SetRolloffFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetRolloffFactor_1_0_5788),
// CDirectSoundBuffer::SetRolloffFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetRolloffFactor_1_0_5788),
// IDirectSoundBuffer_SetRolloffFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetRolloffFactor_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetRolloffFactor_1_0_5788, IDirectSoundBuffer8_SetRolloffFactor),
// CDirectSoundVoice::SetFrequency (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetFrequency_1_0_4627),
// CDirectSoundBuffer::SetFrequency (* unchanged since 4627 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetFrequency_1_0_4627),
// CDirectSoundStream::SetFrequency
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFrequency_1_0_5558, XTL::EmuCDirectSoundStream_SetFrequency),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFrequency_1_0_5558, CDirectSoundStream_SetFrequency),
// CDirectSoundVoice::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetDopplerFactor_1_0_5788),
// CDirectSoundBuffer::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetDopplerFactor_1_0_5788),
// IDirectSoundBuffer8_SetDopplerFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetDopplerFactor_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetDopplerFactor_1_0_5788, IDirectSoundBuffer8_SetDopplerFactor),
// CDirectSoundVoice::SetPosition (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetPosition_1_0_5788),
// CDirectSoundBuffer::SetPosition (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetPosition_1_0_5788),
// IDirectSoundBuffer8_SetPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetPosition_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetPosition_1_0_5788, IDirectSoundBuffer8_SetPosition),
// CDirectSoundVoice::SetVelocity (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetVelocity_1_0_5788),
// CDirectSoundBuffer::SetVelocity (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetVelocity_1_0_5788),
// IDirectSoundBuffer8_SetVelocity
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetVelocity_1_0_5788, XTL::EmuIDirectSoundBuffer8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetVelocity_1_0_5788, IDirectSoundBuffer8_SetVelocity),
// DirectSound_CMcpxBuffer_Pause_1_0_5788
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_Pause_1_0_5788),
// CDirectSoundBuffer::Pause
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_Pause_1_0_5788),
// IDirectSoundBuffer8_Pause
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Pause_1_0_5788, XTL::EmuIDirectSoundBuffer8_Pause),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Pause_1_0_5788, IDirectSoundBuffer8_Pause),
// CDirectSound_CreateSoundStream
OOVPA_TABLE_PATCH(DirectSound_CDirectSound_CreateSoundStream_1_0_5788, XTL::EmuDirectSoundCreateStream),
OOVPA_TABLE_PATCH(DirectSound_CDirectSound_CreateSoundStream_1_0_5788, DirectSoundCreateStream),
// DirectSoundCreateStream
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_5788, XTL::EmuDirectSoundCreateStream),
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_5788, DirectSoundCreateStream),
// CMcpxStream::Pause
OOVPA_TABLE_XREF(DirectSound_CMcpxStream_Pause_1_0_5788),
// CDirectSoundStream::Pause
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_Pause_1_0_5788, XTL::EmuCDirectSoundStream_Pause),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_Pause_1_0_5788, CDirectSoundStream_Pause),
// CDirectSoundStream::FlushEx (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundStream_FlushEx_1_0_5788),
// IDirectSoundStream_FlushEx
OOVPA_TABLE_PATCH(IDirectSoundStream_FlushEx_1_0_5788, XTL::EmuIDirectSoundStream_FlushEx),
OOVPA_TABLE_PATCH(IDirectSoundStream_FlushEx_1_0_5788, IDirectSoundStream_FlushEx),
// DirectSoundDoWork
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_5788, XTL::EmuDirectSoundDoWork),
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_5788, DirectSoundDoWork),
// CDirectSound::SynchPlayback (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(CDirectSound_SynchPlayback_1_0_5558, XTL::EmuCDirectSound_SynchPlayback),
OOVPA_TABLE_PATCH(CDirectSound_SynchPlayback_1_0_5558, CDirectSound_SynchPlayback),
// DirectSound::CDirectSound::EnableHeadphones (XRef)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_EnableHeadphones_1_0_5558),
// IDirectSound8::EnableHeadphones
OOVPA_TABLE_PATCH(IDirectSound_EnableHeadphones_1_0_5558, XTL::EmuIDirectSound8_EnableHeadphones),
OOVPA_TABLE_PATCH(IDirectSound_EnableHeadphones_1_0_5558, IDirectSound8_EnableHeadphones),
// XAudioDownloadEffectsImage (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(XAudioDownloadEffectsImage_1_0_4627, XTL::EmuXAudioDownloadEffectsImage),
OOVPA_TABLE_PATCH(XAudioDownloadEffectsImage_1_0_4627, XAudioDownloadEffectsImage),
// DirectSound::CDirectSound::GetOutputLevels (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_GetOutputLevels_1_0_5558),
// DirectSound::CDirectSound::GetOutputLevels (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_GetOutputLevels_1_0_5558),
// IDirectSound_GetOutputLevels
OOVPA_TABLE_PATCH(IDirectSound_GetOutputLevels_1_0_5558, XTL::EmuIDirectSound8_GetOutputLevels),
OOVPA_TABLE_PATCH(IDirectSound_GetOutputLevels_1_0_5558, IDirectSound8_GetOutputLevels),
// IDirectSoundStream_FlushEx
OOVPA_TABLE_PATCH(IDirectSound_SetEffectData_1_0_5788, XTL::EmuIDirectSound8_SetEffectData),
OOVPA_TABLE_PATCH(IDirectSound_SetEffectData_1_0_5788, IDirectSound8_SetEffectData),
// DirectSound::CMemoryManager::PoolAlloc
OOVPA_TABLE_XREF(DirectSound_CMemoryManager_PoolAlloc_1_0_5788),
// XFileCreateMediaObjectAsync
OOVPA_TABLE_PATCH(XFileCreateMediaObjectAsync_1_0_5788, XTL::EmuXFileCreateMediaObjectAsync),
OOVPA_TABLE_PATCH(XFileCreateMediaObjectAsync_1_0_5788, XFileCreateMediaObjectAsync),
// WaveFormat::CreateXboxAdpcmFormat (XREF)
OOVPA_TABLE_XREF(WaveFormat_CreateXboxAdpcmFormat_1_0_5558),
// XAudioCreateAdpcmFormat
OOVPA_TABLE_PATCH(XAudioCreateAdpcmFormat_1_0_5558, XTL::EmuXAudioCreateAdpcmFormat),
OOVPA_TABLE_PATCH(XAudioCreateAdpcmFormat_1_0_5558, XAudioCreateAdpcmFormat),
// CDirectSoundStream::SetFormat (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFormat_1_0_5558, XTL::EmuCDirectSoundStream_SetFormat),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFormat_1_0_5558, CDirectSoundStream_SetFormat),
// CDirectSoundStream::SetPitch
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetPitch_1_0_5788, XTL::EmuCDirectSoundStream_SetPitch),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetPitch_1_0_5788, CDirectSoundStream_SetPitch),
// DirectSound::CDirectSoundStream::SetHeadroom
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetHeadroom_1_0_5788, XTL::EmuIDirectSoundStream_SetHeadroom),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetHeadroom_1_0_5788, IDirectSoundStream_SetHeadroom),
// CDirectSound_CreateSoundStream
OOVPA_TABLE_XREF(DirectSound_CDirectSound_CreateSoundStream_1_0_5558),
// IDirectSound_CreateSoundStream
OOVPA_TABLE_PATCH(IDirectSound_CreateSoundStream_1_0_5558, XTL::EmuIDirectSound8_CreateStream),
OOVPA_TABLE_PATCH(IDirectSound_CreateSoundStream_1_0_5558, IDirectSound8_CreateStream),
// CMcpxBuffer::Play2
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_Play2_1_0_5788),
// CDirectSoundBuffer::Play
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_Play_1_0_5788),
// IDirectSoundBuffer8::Play
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Play_1_0_5788, XTL::EmuIDirectSoundBuffer8_Play),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Play_1_0_5788, IDirectSoundBuffer8_Play),
// CMcpxVoiceClient::SetEG
OOVPA_TABLE_XREF(DirectSound_CMcpxVoiceClient_SetEG_1_0_4627),
// CDirectSoundVoice::SetEG (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetEG_1_0_4627),
// DirectSound::CDirectSoundStream::SetEG
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetEG_1_0_4627, XTL::EmuCDirectSoundStream_SetEG),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetEG_1_0_4627, CDirectSoundStream_SetEG),
// DirectSound::CDirectSoundBuffer::SetEG (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetEG_1_0_4627),
// IDirectSoundBuffer::SetEG
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetEG_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetEG),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetEG_1_0_4627, IDirectSoundBuffer8_SetEG),
};
// ******************************************************************

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

@ -1608,34 +1608,34 @@ OOVPA_END;
OOVPATable DSound_1_0_5849[] = {
// DirectSoundCreate (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, XTL::EmuDirectSoundCreate),
OOVPA_TABLE_PATCH(DirectSoundCreate_1_0_4361, DirectSoundCreate),
// CDirectSound_CreateSoundBuffer
OOVPA_TABLE_XREF(CDirectSound_CreateSoundBuffer_1_0_4627),
// IDirectSoundBuffer8::SetPlayRegion (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetPlayRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPlayRegion_1_0_4361, IDirectSoundBuffer8_SetPlayRegion),
// CMcpxBuffer::SetBufferData
OOVPA_TABLE_XREF(CMcpxBuffer_SetBufferData_1_0_5849),
// CDirectSoundBuffer::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetBufferData_1_0_4361),
// IDirectSoundBuffer8::SetBufferData (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, XTL::EmuIDirectSoundBuffer8_SetBufferData),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetBufferData_1_0_4361, IDirectSoundBuffer8_SetBufferData),
// CMcpxBuffer::GetStatus
OOVPA_TABLE_XREF(CMcpxBuffer_GetStatus_1_0_5849),
// CDirectSoundBuffer::GetStatus
OOVPA_TABLE_XREF(CDirectSoundBuffer_GetStatus_1_0_4627),
// IDirectSoundBuffer8::GetStatus
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_4627, XTL::EmuIDirectSoundBuffer8_GetStatus),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_GetStatus_1_0_4627, IDirectSoundBuffer8_GetStatus),
// CDirectSound_SetI3DL2Listener
OOVPA_TABLE_XREF(CDirectSound_SetI3DL2Listener_1_0_5849),
// IDirectSound8_SetI3DL2Listener
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_5849, XTL::EmuIDirectSound8_SetI3DL2Listener),
OOVPA_TABLE_PATCH(IDirectSound8_SetI3DL2Listener_1_0_5849, IDirectSound8_SetI3DL2Listener),
// DirectSound::CDirectSoundVoice::SetFormat (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetFormat_1_0_5849),
// DirectSound::CDirectSoundBuffer::SetFormat (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetFormat_1_0_5849),
// IDirectSoundBuffer8_SetFormat
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFormat_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetFormat),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFormat_1_0_5849, IDirectSoundBuffer8_SetFormat),
// CDirectSoundVoiceSettings_SetMixBinVolumes
OOVPA_TABLE_XREF(CDirectSoundVoiceSettings_SetMixBinVolumes_1_0_4627),
// CDirectSoundVoice_SetMixBinVolumes
@ -1643,39 +1643,39 @@ OOVPATable DSound_1_0_5849[] = {
// CDirectSoundBuffer_SetMixBinVolumes
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetMixBinVolumes_1_0_4627),
// IDirectSoundBuffer8_SetMixBinVolumes
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBinVolumes_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetMixBinVolumes),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetMixBinVolumes_1_0_4627, IDirectSoundBuffer8_SetMixBinVolumes),
// CDirectSoundStream_SetMixBinVolumes
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBinVolumes_1_0_5849, XTL::EmuCDirectSoundStream_SetMixBinVolumes2),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBinVolumes_1_0_5849, CDirectSoundStream_SetMixBinVolumes2),
// IDirectSound8::CreateSoundBuffer
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4627, XTL::EmuIDirectSound8_CreateSoundBuffer),
OOVPA_TABLE_PATCH(IDirectSound8_CreateSoundBuffer_1_0_4627, IDirectSound8_CreateSoundBuffer),
// CDirectSoundVoice::SetFrequency (XREF)
OOVPA_TABLE_XREF(CDirectSoundVoice_SetFrequency_1_0_4627),
// CDirectSoundBuffer::SetFrequency
OOVPA_TABLE_XREF(CDirectSoundBuffer_SetFrequency_1_0_4627),
// IDirectSoundBuffer8::SetFrequency
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_4627, XTL::EmuIDirectSoundBuffer8_SetFrequency),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetFrequency_1_0_4627, IDirectSoundBuffer8_SetFrequency),
// CMcpxVoiceClient_SetVolume
OOVPA_TABLE_XREF(CMcpxVoiceClient_SetVolume_1_0_4627),
// CDirectSoundStream_SetVolume
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_4627, XTL::EmuCDirectSoundStream_SetVolume),
OOVPA_TABLE_PATCH(CDirectSoundStream_SetVolume_1_0_4627, CDirectSoundStream_SetVolume),
// IDirectSound8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, XTL::EmuIDirectSound8_Release),
OOVPA_TABLE_PATCH(IDirectSound8_Release_1_0_3936, IDirectSound8_Release),
// IDirectSound8::DownloadEffectsImage (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, XTL::EmuIDirectSound8_DownloadEffectsImage),
OOVPA_TABLE_PATCH(IDirectSound8_DownloadEffectsImage_1_0_3936, IDirectSound8_DownloadEffectsImage),
// IDirectSound8::SetOrientation (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, XTL::EmuIDirectSound8_SetOrientation),
OOVPA_TABLE_PATCH(IDirectSound8_SetOrientation_1_0_3936, IDirectSound8_SetOrientation),
// CDirectSoundVoice::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetMaxDistance_1_0_5849),
// CDirectSoundBuffer::SetMaxDistance (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetMaxDistance_1_0_5849),
// IDirectSoundBuffer_SetMaxDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetMaxDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMaxDistance_1_0_5849, IDirectSoundBuffer8_SetMaxDistance),
// CDirectSoundVoice::SetMinDistance (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetMinDistance_1_0_5849),
// CDirectSoundBuffer::SetMinDistance (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetMinDistance_1_0_5849),
// IDirectSoundBuffer_SetMinDistance
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetMinDistance),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMinDistance_1_0_5849, IDirectSoundBuffer8_SetMinDistance),
// CMcpxBuffer::Play
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_Play_1_0_5849),
// CMcpxBuffer::Play
@ -1683,17 +1683,17 @@ OOVPATable DSound_1_0_5849[] = {
OOVPA_TABLE_XREF(CMcpxBuffer_Play_1_0_5849),
*/
// IDirectSoundBuffer_Stop (Possibly weak, but quite OK for 4627 DSOUND)
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Stop_1_0_4627, XTL::EmuIDirectSoundBuffer8_Stop),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Stop_1_0_4627, IDirectSoundBuffer8_Stop),
// IDirectSoundBuffer8::Release (* unchanged since 3936 *)
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, XTL::EmuIDirectSoundBuffer8_Release),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_Release_1_0_3936, IDirectSoundBuffer8_Release),
// DirectSound::CDirectSoundVoice::SetHeadroom (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetHeadroom_1_0_5849),
// DirectSound::CDirectSoundBuffer::SetHeadroom (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetHeadroom_1_0_5849),
// IDirectSoundBuffer_SetHeadroom
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetHeadroom_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetHeadroom),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetHeadroom_1_0_5849, IDirectSoundBuffer8_SetHeadroom),
// IDirectSoundBuffer_Lock
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Lock_1_0_5849, XTL::EmuIDirectSoundBuffer8_Lock),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Lock_1_0_5849, IDirectSoundBuffer8_Lock),
// DirectSound::CDirectSoundVoiceSettings::SetMixBins (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoiceSettings_SetMixBins_1_0_5849),
// DirectSound::CDirectSoundVoice::SetMixBins (XREF)
@ -1701,135 +1701,135 @@ OOVPATable DSound_1_0_5849[] = {
// DirectSound::CDirectSoundBuffer::SetMixBins (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetMixBins_1_0_5849),
// IDirectSoundBuffer_SetMixBins
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMixBins_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetMixBins),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetMixBins_1_0_5849, IDirectSoundBuffer8_SetMixBins),
// DirectSound::CDirectSoundStream::SetMixBins (XREF)
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBins_1_0_5849, XTL::EmuCDirectSoundStream_SetMixBins),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetMixBins_1_0_5849, CDirectSoundStream_SetMixBins),
// CDirectSound_SetMixBinHeadroom
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetMixBinHeadroom_1_0_5849),
// IDirectSound8_SetMixBinHeadroom
OOVPA_TABLE_PATCH(IDirectSound_SetMixBinHeadroom_1_0_5849, XTL::EmuIDirectSound8_SetMixBinHeadroom),
OOVPA_TABLE_PATCH(IDirectSound_SetMixBinHeadroom_1_0_5849, IDirectSound8_SetMixBinHeadroom),
// CDirectSound::SetPosition (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetPosition_1_0_5849),
// IDirectSound8::SetPosition
OOVPA_TABLE_PATCH(IDirectSound_SetPosition_1_0_5849, XTL::EmuIDirectSound8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSound_SetPosition_1_0_5849, IDirectSound8_SetPosition),
// CDirectSound::SetVelocity (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetVelocity_1_0_5849),
// IDirectSound8::SetVelocity
OOVPA_TABLE_PATCH(IDirectSound_SetVelocity_1_0_5849, XTL::EmuIDirectSound8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSound_SetVelocity_1_0_5849, IDirectSound8_SetVelocity),
// CDirectSound::CommitDeferredSettings
OOVPA_TABLE_PATCH(DirectSound_CDirectSound_CommitDeferredSettings_1_0_5849, XTL::EmuCDirectSound_CommitDeferredSettings),
OOVPA_TABLE_PATCH(DirectSound_CDirectSound_CommitDeferredSettings_1_0_5849, CDirectSound_CommitDeferredSettings),
// DirectSoundCreateBuffer
OOVPA_TABLE_PATCH(DirectSoundCreateBuffer_1_0_4627, XTL::EmuDirectSoundCreateBuffer),
OOVPA_TABLE_PATCH(DirectSoundCreateBuffer_1_0_4627, DirectSoundCreateBuffer),
// CMcpxBuffer::SetCurrentPosition
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_SetCurrentPosition_1_0_5849),
// CDirectSoundBuffer::SetCurrentPosition
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetCurrentPosition_1_0_5849),
// IDirectSoundBuffer8::SetCurrentPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetCurrentPosition_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetCurrentPosition_1_0_5849, IDirectSoundBuffer8_SetCurrentPosition),
// CDirectSoundBuffer::GetCurrentPosition
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_GetCurrentPosition_1_0_5849),
// IDirectSoundBuffer8::GetCurrentPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer_GetCurrentPosition_1_0_5849, XTL::EmuIDirectSoundBuffer8_GetCurrentPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_GetCurrentPosition_1_0_5849, IDirectSoundBuffer8_GetCurrentPosition),
// CDirectSoundBuffer::SetLoopRegion (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetLoopRegion_1_0_5849),
// IDirectSoundBuffer8::SetLoopRegion
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetLoopRegion_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetLoopRegion),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetLoopRegion_1_0_5849, IDirectSoundBuffer8_SetLoopRegion),
// CMcpxBuffer_Stop
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_Stop_1_0_5849),
// CDirectSoundBuffer_Stop
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_StopEx_1_0_5849),
// CDirectSoundBuffer_Stop
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundBuffer_StopEx_1_0_5849, XTL::EmuIDirectSoundBuffer8_StopEx),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundBuffer_StopEx_1_0_5849, IDirectSoundBuffer8_StopEx),
// CDirectSound::SetRolloffFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetRolloffFactor_1_0_5849),
// IDirectSound8::SetRolloffFactor (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_4627, XTL::EmuIDirectSound8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetRolloffFactor_1_0_4627, IDirectSound8_SetRolloffFactor),
// CDirectSound::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSound_SetDopplerFactor_1_0_5849),
// IDirectSound8::SetDopplerFactor (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(IDirectSound8_SetDopplerFactor_1_0_4627, XTL::EmuIDirectSound8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSound8_SetDopplerFactor_1_0_4627, IDirectSound8_SetDopplerFactor),
// CDirectSoundVoice::SetPitch
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetPitch_1_0_5849),
// IDirectSoundBuffer8::SetPitch
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetPitch_1_0_5849),
// IDirectSoundBuffer8::SetPitch
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPitch_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetPitch),
OOVPA_TABLE_PATCH(IDirectSoundBuffer8_SetPitch_1_0_5849, IDirectSoundBuffer8_SetPitch),
// CDirectSoundVoice::SetVolume (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetVolume_1_0_5849),
// CDirectSoundBuffer::SetVolume (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetVolume_1_0_5849),
// IDirectSoundBuffer8::SetVolume
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetVolume_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetVolume),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetVolume_1_0_5849, IDirectSoundBuffer8_SetVolume),
// DirectSound::CDirectSoundBuffer::PlayEx (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_PlayEx_1_0_5849),
// IDirectSoundBuffer_PlayEx
OOVPA_TABLE_PATCH(IDirectSoundBuffer_PlayEx_1_0_5849, XTL::EmuIDirectSoundBuffer8_PlayEx),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_PlayEx_1_0_5849, IDirectSoundBuffer8_PlayEx),
// CDirectSoundVoice::SetRolloffFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetRolloffFactor_1_0_5849),
// CDirectSoundBuffer::SetRolloffFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetRolloffFactor_1_0_5849),
// IDirectSoundBuffer_SetRolloffFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetRolloffFactor_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetRolloffFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetRolloffFactor_1_0_5849, IDirectSoundBuffer8_SetRolloffFactor),
// CDirectSoundVoice::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetDopplerFactor_1_0_5849),
// CDirectSoundBuffer::SetDopplerFactor (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetDopplerFactor_1_0_5849),
// IDirectSoundBuffer8_SetDopplerFactor
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetDopplerFactor_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetDopplerFactor),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetDopplerFactor_1_0_5849, IDirectSoundBuffer8_SetDopplerFactor),
// CDirectSoundVoice::SetPosition (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetPosition_1_0_5849),
// CDirectSoundBuffer::SetPosition (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetPosition_1_0_5849),
// IDirectSoundBuffer8_SetPosition
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetPosition_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetPosition),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetPosition_1_0_5849, IDirectSoundBuffer8_SetPosition),
// CDirectSoundVoice::SetVelocity (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundVoice_SetVelocity_1_0_5849),
// CDirectSoundBuffer::SetVelocity (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_SetVelocity_1_0_5849),
// IDirectSoundBuffer8_SetVelocity
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetVelocity_1_0_5849, XTL::EmuIDirectSoundBuffer8_SetVelocity),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_SetVelocity_1_0_5849, IDirectSoundBuffer8_SetVelocity),
// DirectSound_CMcpxBuffer_Pause_1_0_5849
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_Pause_1_0_5849),
// CDirectSoundBuffer::Pause
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_Pause_1_0_5849),
// IDirectSoundBuffer8_Pause
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Pause_1_0_5849, XTL::EmuIDirectSoundBuffer8_Pause),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Pause_1_0_5849, IDirectSoundBuffer8_Pause),
// CDirectSound_CreateSoundStream
OOVPA_TABLE_PATCH(DirectSound_CDirectSound_CreateSoundStream_1_0_5849, XTL::EmuDirectSoundCreateStream),
OOVPA_TABLE_PATCH(DirectSound_CDirectSound_CreateSoundStream_1_0_5849, DirectSoundCreateStream),
// DirectSoundCreateStream
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_5849, XTL::EmuDirectSoundCreateStream),
OOVPA_TABLE_PATCH(DirectSoundCreateStream_1_0_5849, DirectSoundCreateStream),
// CMcpxStream::Pause
OOVPA_TABLE_XREF(DirectSound_CMcpxStream_Pause_1_0_5849),
// CDirectSoundStream::Pause
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_Pause_1_0_5849, XTL::EmuCDirectSoundStream_Pause),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_Pause_1_0_5849, CDirectSoundStream_Pause),
// CDirectSoundStream::FlushEx (XREF)
OOVPA_TABLE_XREF(DirectSound_CDirectSoundStream_FlushEx_1_0_5849),
// IDirectSoundStream_FlushEx
OOVPA_TABLE_PATCH(IDirectSoundStream_FlushEx_1_0_5849, XTL::EmuIDirectSoundStream_FlushEx),
OOVPA_TABLE_PATCH(IDirectSoundStream_FlushEx_1_0_5849, IDirectSoundStream_FlushEx),
// DirectSoundDoWork
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_5849, XTL::EmuDirectSoundDoWork),
OOVPA_TABLE_PATCH(DirectSoundDoWork_1_0_5849, DirectSoundDoWork),
// CDirectSound::SynchPlayback (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(CDirectSound_SynchPlayback_1_0_5558, XTL::EmuCDirectSound_SynchPlayback),
OOVPA_TABLE_PATCH(CDirectSound_SynchPlayback_1_0_5558, CDirectSound_SynchPlayback),
// XAudioDownloadEffectsImage (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(XAudioDownloadEffectsImage_1_0_4627, XTL::EmuXAudioDownloadEffectsImage),
OOVPA_TABLE_PATCH(XAudioDownloadEffectsImage_1_0_4627, XAudioDownloadEffectsImage),
// IDirectSoundStream_FlushEx
OOVPA_TABLE_PATCH(IDirectSound_SetEffectData_1_0_5849, XTL::EmuIDirectSound8_SetEffectData),
OOVPA_TABLE_PATCH(IDirectSound_SetEffectData_1_0_5849, IDirectSound8_SetEffectData),
// DirectSound::CMemoryManager::PoolAlloc
OOVPA_TABLE_XREF(DirectSound_CMemoryManager_PoolAlloc_1_0_5849),
// XFileCreateMediaObjectAsync
OOVPA_TABLE_PATCH(XFileCreateMediaObjectAsync_1_0_5849, XTL::EmuXFileCreateMediaObjectAsync),
OOVPA_TABLE_PATCH(XFileCreateMediaObjectAsync_1_0_5849, XFileCreateMediaObjectAsync),
// CDirectSoundStream::SetFormat (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFormat_1_0_5558, XTL::EmuCDirectSoundStream_SetFormat),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetFormat_1_0_5558, CDirectSoundStream_SetFormat),
// CDirectSoundStream::SetPitch
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetPitch_1_0_5849, XTL::EmuCDirectSoundStream_SetPitch),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetPitch_1_0_5849, CDirectSoundStream_SetPitch),
// DirectSound::CDirectSoundStream::SetHeadroom
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetHeadroom_1_0_5849, XTL::EmuIDirectSoundStream_SetHeadroom),
OOVPA_TABLE_PATCH(DirectSound_CDirectSoundStream_SetHeadroom_1_0_5849, IDirectSoundStream_SetHeadroom),
// CMcpxBuffer::Play2
OOVPA_TABLE_XREF(DirectSound_CMcpxBuffer_Play2_1_0_5849),
// CDirectSoundBuffer::Play
OOVPA_TABLE_XREF(DirectSound_CDirectSoundBuffer_Play_1_0_5849),
// IDirectSoundBuffer8::Play
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Play_1_0_5849, XTL::EmuIDirectSoundBuffer8_Play),
OOVPA_TABLE_PATCH(IDirectSoundBuffer_Play_1_0_5849, IDirectSoundBuffer8_Play),
};
// ******************************************************************

12
src/CxbxKrnl/HLEDataBase/XG.1.0.3911.inl
View File

@ -128,22 +128,22 @@ OOVPATable XG_1_0_3911[] = {
// XGIsSwizzledFormat
/* Leave unpatched
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_3911, XTL::EmuXGIsSwizzledFormat),
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_3911, XGIsSwizzledFormat),
*/
// XGSwizzleRect
/* Leave unpatched
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_3911, XTL::EmuXGSwizzleRect),
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_3911, XGSwizzleRect),
*/
// XGUnswizzleRect
/* Leave unpatched
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_3911, XTL::EmuXGUnswizzleRect),
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_3911, XGUnswizzleRect),
*/
// XGSwizzleBox
OOVPA_TABLE_PATCH(XGSwizzleBox_1_0_3911, XTL::EmuXGSwizzleBox),
OOVPA_TABLE_PATCH(XGSwizzleBox_1_0_3911, XGSwizzleBox),
// XGWriteSurfaceOrTextureToXPR
OOVPA_TABLE_PATCH(XGWriteSurfaceOrTextureToXPR_1_0_3911, XTL::EmuXGWriteSurfaceOrTextureToXPR),
OOVPA_TABLE_PATCH(XGWriteSurfaceOrTextureToXPR_1_0_3911, XGWriteSurfaceOrTextureToXPR),
// XGSetTextureHeader
OOVPA_TABLE_PATCH(XGSetTextureHeader_1_0_3911, XTL::EmuXGSetTextureHeader),
OOVPA_TABLE_PATCH(XGSetTextureHeader_1_0_3911, XGSetTextureHeader),
};
// ******************************************************************

10
src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl
View File

@ -116,19 +116,19 @@ OOVPATable XG_1_0_4034[] = {
// XGIsSwizzledFormat
/*{
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_3911, XTL::EmuXGIsSwizzledFormat),*/
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_3911, XGIsSwizzledFormat),*/
// XGSwizzleRect (* unchanged since 3911 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_3911, XTL::EmuXGSwizzleRect),
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_3911, XGSwizzleRect),
*/
// XGUnswizzleRect
/*{
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_3911, XTL::EmuXGUnswizzleRect),*/
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_3911, XGUnswizzleRect),*/
// XGSwizzleBox (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XGSwizzleBox_1_0_3911, XTL::EmuXGSwizzleBox),
OOVPA_TABLE_PATCH(XGSwizzleBox_1_0_3911, XGSwizzleBox),
// XGWriteSurfaceOrTextureToXPR
/*{
OOVPA_TABLE_PATCH(XGWriteSurfaceOrTextureToXPR_1_0_3911, XTL::EmuXGWriteSurfaceOrTextureToXPR),*/
OOVPA_TABLE_PATCH(XGWriteSurfaceOrTextureToXPR_1_0_3911, XGWriteSurfaceOrTextureToXPR),*/
};
// ******************************************************************

8
src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl
View File

@ -153,18 +153,18 @@ OOVPATable XG_1_0_4361[] = {
// XGIsSwizzledFormat
/* Leave unpatched
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XTL::EmuXGIsSwizzledFormat),
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XGIsSwizzledFormat),
*/
// XGSwizzleRect
/* Leave unpatched
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_4361, XTL::EmuXGSwizzleRect),
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_4361, XGSwizzleRect),
*/
// XGUnswizzleRect
/* Leave unpatched
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_4361, XTL::EmuXGUnswizzleRect),
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_4361, XGUnswizzleRect),
*/
// XGSetTextureHeader (* Unchanged since 3911 *)
OOVPA_TABLE_PATCH(XGSetTextureHeader_1_0_3911, XTL::EmuXGSetTextureHeader),
OOVPA_TABLE_PATCH(XGSetTextureHeader_1_0_3911, XGSetTextureHeader),
// XGSetVertexBufferHeader
OOVPA_TABLE_XREF(XGSetVertexBufferHeader_1_0_4361),
// XGSetIndexBufferHeader

4
src/CxbxKrnl/HLEDataBase/XG.1.0.4432.inl
View File

@ -41,11 +41,11 @@ OOVPATable XG_1_0_4432[1] = {
// XGIsSwizzledFormat (* unchanged since 4361 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XTL::EmuXGIsSwizzledFormat),
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XGIsSwizzledFormat),
*/
// XGSwizzleRect (* unchanged since 4361 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_4361, XTL::EmuXGSwizzleRect),
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_4361, XGSwizzleRect),
*/
};

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

@ -94,20 +94,20 @@ OOVPATable XG_1_0_4627[] = {
// XGIsSwizzledFormat (* unchanged since 4361 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XTL::EmuXGIsSwizzledFormat),
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XGIsSwizzledFormat),
*/
// XGSwizzleRect (* unchanged since 4361 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_4361, XTL::EmuXGSwizzleRect),
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_4361, XGSwizzleRect),
*/
// XGUnswizzleRect
/* Leave unpatched
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_4627, XTL::EmuXGUnswizzleRect),
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_4627, XGUnswizzleRect),
*/
// XGSwizzleBox
OOVPA_TABLE_PATCH(XGSwizzleBox_1_0_4627, XTL::EmuXGSwizzleBox),
OOVPA_TABLE_PATCH(XGSwizzleBox_1_0_4627, XGSwizzleBox),
// XGWriteSurfaceOrTextureToXPR
OOVPA_TABLE_PATCH(XGWriteSurfaceOrTextureToXPR_1_0_4627, XTL::EmuXGWriteSurfaceOrTextureToXPR),
OOVPA_TABLE_PATCH(XGWriteSurfaceOrTextureToXPR_1_0_4627, XGWriteSurfaceOrTextureToXPR),
};
// ******************************************************************

4
src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl
View File

@ -39,11 +39,11 @@ OOVPATable XG_1_0_5233[1] = {
// XGIsSwizzledFormat (* unchanged since 4361 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XTL::EmuXGIsSwizzledFormat),
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XGIsSwizzledFormat),
*/
// XGSwizzleRect (* unchanged since 4361 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_4361, XTL::EmuXGSwizzleRect),
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_4361, XGSwizzleRect),
*/
};

10
src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl
View File

@ -125,21 +125,21 @@ OOVPATable XG_1_0_5558[] = {
// XGIsSwizzledFormat (* unchanged since 4361 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XTL::EmuXGIsSwizzledFormat),
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XGIsSwizzledFormat),
*/
// XGSwizzleRect
/* Leave unpatched
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_5558, XTL::EmuXGSwizzleRect),
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_5558, XGSwizzleRect),
*/
// XGSwizzleBox (* UNTESTED *)
OOVPA_TABLE_PATCH(XGSwizzleBox_1_0_5558, XTL::EmuXGSwizzleBox),
OOVPA_TABLE_PATCH(XGSwizzleBox_1_0_5558, XGSwizzleBox),
// XGUnswizzleRect
/* Leave unpatched
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_5558, XTL::EmuXGUnswizzleRect),
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_5558, XGUnswizzleRect),
*/
// XGUnswizzleBox (* UNTESTED *)
/*
OOVPA_TABLE_PATCH(XGUnswizzleBox_1_0_5558, XTL::EmuXGUnswizzleBox),
OOVPA_TABLE_PATCH(XGUnswizzleBox_1_0_5558, XGUnswizzleBox),
*/
};

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

@ -74,17 +74,17 @@ OOVPA_END;
// ******************************************************************
// * XG_1_0_5788
// ******************************************************************
OOVPATable XG_1_0_5788[] = {
OOVPATable XG_1_0_5788[1] = {
// XGIsSwizzledFormat (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XTL::EmuXBFormatIsSwizzled),
// OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XGFormatIsSwizzled),
// XGSwizzleRect (* unchanged since 5558 *)
//OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_5558, XTL::EmuXGSwizzleRect),
//OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_5558, XGSwizzleRect),
// XGUnswizzleRect (* unchanged since 5558 *)
//OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_5558, XTL::EmuXGUnswizzleRect),
//OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_5558, XGUnswizzleRect),
// XFONT_OpenBitmapFontFromMemory
/*
OOVPA_TABLE_PATCH(XFONT_OpenBitmapFontFromMemory_1_0_5788, XTL::EmuXFONT_OpenBitmapFontFromMemory),
OOVPA_TABLE_PATCH(XFONT_OpenBitmapFontFromMemory_1_0_5788, XFONT_OpenBitmapFontFromMemory),
*/
};

8
src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl
View File

@ -78,19 +78,19 @@ OOVPATable XG_1_0_5849[1] = {
// XGIsSwizzledFormat (* unchanged since 4361 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XTL::EmuXGIsSwizzledFormat),
OOVPA_TABLE_PATCH(XGIsSwizzledFormat_1_0_4361, XGIsSwizzledFormat),
*/
// XGSwizzleRect (* unchanged since 5558 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_5558, XTL::EmuXGSwizzleRect),
OOVPA_TABLE_PATCH(XGSwizzleRect_1_0_5558, XGSwizzleRect),
*/
// XGUnswizzleRect (* unchanged since 5558 *)
/* Leave unpatched
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_5558, XTL::EmuXGUnswizzleRect),
OOVPA_TABLE_PATCH(XGUnswizzleRect_1_0_5558, XGUnswizzleRect),
*/
// XFONT_OpenBitmapFontFromMemory
/*
OOVPA_TABLE_PATCH(XFONT_OpenBitmapFontFromMemory_1_0_5849, XTL::EmuXFONT_OpenBitmapFontFromMemory),
OOVPA_TABLE_PATCH(XFONT_OpenBitmapFontFromMemory_1_0_5849, XFONT_OpenBitmapFontFromMemory),
*/
};

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

@ -138,13 +138,13 @@ OOVPA_END;
OOVPATable XNet_1_0_3911[] = {
// XNetStartup
OOVPA_TABLE_PATCH(XNetStartup_1_0_3911, XTL::EmuXNetStartup),
OOVPA_TABLE_PATCH(XNetStartup_1_0_3911, XNetStartup),
// WSAStartup
OOVPA_TABLE_PATCH(WSAStartup_1_0_3911, XTL::EmuWSAStartup),
OOVPA_TABLE_PATCH(WSAStartup_1_0_3911, WSAStartup),
// XnInit (XREF)
OOVPA_TABLE_XREF(XnInit_1_0_3911),
// XNetGetEthernetLinkStatus
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_3911, XTL::EmuXNetGetEthernetLinkStatus),
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_3911, XNetGetEthernetLinkStatus),
};
// ******************************************************************

14
src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl
View File

@ -330,21 +330,21 @@ OOVPA_END;
// ******************************************************************
OOVPATable XNet_1_0_4627[] = {
// XNetStartup
OOVPA_TABLE_PATCH(XNetStartup_1_0_4627, XTL::EmuXNetStartup), // same as xonline 4361
OOVPA_TABLE_PATCH(XNetStartup_1_0_4627, XNetStartup), // same as xonline 4361
// WSAStartup
OOVPA_TABLE_PATCH(WSAStartup_1_0_4627, XTL::EmuWSAStartup), // same as xonline 4361
OOVPA_TABLE_PATCH(WSAStartup_1_0_4627, WSAStartup), // same as xonline 4361
// XnInit (XREF)
OOVPA_TABLE_XREF(XnInit_1_0_4627),
// socket
OOVPA_TABLE_PATCH(socket_1_0_4627, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emusocket)),
OOVPA_TABLE_PATCH_EmuThis(socket_1_0_4627, socket),
// connect
OOVPA_TABLE_PATCH(connect_1_0_4627, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emuconnect)),
OOVPA_TABLE_PATCH_EmuThis(connect_1_0_4627, connect),
// send
OOVPA_TABLE_PATCH(send_1_0_4627, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emusend)),
OOVPA_TABLE_PATCH_EmuThis(send_1_0_4627, send),
// recv
OOVPA_TABLE_PATCH(recv_1_0_4627, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emurecv)),
OOVPA_TABLE_PATCH_EmuThis(recv_1_0_4627, recv),
// ioctlsocket
OOVPA_TABLE_PATCH(ioctlsocket_1_0_4627, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emuioctlsocket)),
OOVPA_TABLE_PATCH_EmuThis(ioctlsocket_1_0_4627, ioctlsocket),
};
// ******************************************************************

12
src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl
View File

@ -208,19 +208,19 @@ OOVPA_END;
OOVPATable XOnline_1_0_4361[] = {
// XNetStartup
OOVPA_TABLE_PATCH(XNetStartup_1_0_4361, XTL::EmuXNetStartup),
OOVPA_TABLE_PATCH(XNetStartup_1_0_4361, XNetStartup),
// WSAStartup
OOVPA_TABLE_PATCH(WSAStartup_1_0_4361, XTL::EmuWSAStartup),
OOVPA_TABLE_PATCH(WSAStartup_1_0_4361, WSAStartup),
// XnInit (XREF)
OOVPA_TABLE_XREF(XnInit_1_0_4361),
// socket
OOVPA_TABLE_PATCH(socket_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emusocket)),
OOVPA_TABLE_PATCH_EmuThis(socket_1_0_4361, socket),
// bind
OOVPA_TABLE_PATCH(bind_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emubind)),
OOVPA_TABLE_PATCH_EmuThis(bind_1_0_4361, bind),
// listen
OOVPA_TABLE_PATCH(listen_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emulisten)),
OOVPA_TABLE_PATCH_EmuThis(listen_1_0_4361, listen),
// ioctlsocket
OOVPA_TABLE_PATCH(ioctlsocket_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emuioctlsocket)),
OOVPA_TABLE_PATCH_EmuThis(ioctlsocket_1_0_4361, ioctlsocket),
};
// ******************************************************************

14
src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl
View File

@ -98,21 +98,21 @@ OOVPA_END;
OOVPATable XOnline_1_0_4627[] ={
// XNetStartup (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(XNetStartup_1_0_4361, XTL::EmuXNetStartup),
OOVPA_TABLE_PATCH(XNetStartup_1_0_4361, XNetStartup),
// WSAStartup
OOVPA_TABLE_PATCH(WSAStartup_1_0_4361, XTL::EmuWSAStartup),
OOVPA_TABLE_PATCH(WSAStartup_1_0_4361, WSAStartup),
// XnInit (XREF)
OOVPA_TABLE_XREF(XnInit_1_0_4627),
// socket
OOVPA_TABLE_PATCH(socket_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emusocket)),
OOVPA_TABLE_PATCH_EmuThis(socket_1_0_4361, socket),
// bind (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(bind_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emubind)),
OOVPA_TABLE_PATCH_EmuThis(bind_1_0_4361, bind),
// listen
OOVPA_TABLE_PATCH(listen_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emulisten)),
OOVPA_TABLE_PATCH_EmuThis(listen_1_0_4361, listen),
// ioctlsocket (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(ioctlsocket_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emuioctlsocket)),
OOVPA_TABLE_PATCH_EmuThis(ioctlsocket_1_0_4361, ioctlsocket),
// XNetGetEthernetLinkStatus
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_4627, XTL::EmuXNetGetEthernetLinkStatus),
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_4627, XNetGetEthernetLinkStatus),
// XoUpdateLaunchNewImageInternal (XREF)
OOVPA_TABLE_XREF(XoUpdateLaunchNewImageInternal_1_0_4627),
};

16
src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl
View File

@ -95,29 +95,29 @@ OOVPA_END;
OOVPATable XOnline_1_0_5233[] = {
// XNetStartup
OOVPA_TABLE_PATCH(XNetStartup_1_0_5344, XTL::EmuXNetStartup),
OOVPA_TABLE_PATCH(XNetStartup_1_0_5344, XNetStartup),
// WSAStartup (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(WSAStartup_1_0_4361, XTL::EmuWSAStartup),
OOVPA_TABLE_PATCH(WSAStartup_1_0_4361, WSAStartup),
// XnInit (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(XnInit_1_0_4627),
// socket
/*
OOVPA_TABLE_PATCH(socket_1_0_4361, MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emusocket)),
OOVPA_TABLE_PATCH_EmuThis(socket_1_0_4361, socket),
*/
// bind (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(bind_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emubind)),
OOVPA_TABLE_PATCH_EmuThis(bind_1_0_4361, bind),
// listen
/*
OOVPA_TABLE_PATCH(listen_1_0_4361, MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emulisten)),
OOVPA_TABLE_PATCH_EmuThis(listen_1_0_4361, listen),
*/
// ioctlsocket (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(ioctlsocket_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emuioctlsocket)),
OOVPA_TABLE_PATCH_EmuThis(ioctlsocket_1_0_4361, ioctlsocket),
// XNetGetEthernetLinkStatus
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_5344, XTL::EmuXNetGetEthernetLinkStatus),
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_5344, XNetGetEthernetLinkStatus),
// CXo::XOnlineLogon (XREF)
OOVPA_TABLE_XREF(CXo_XOnlineLogon_1_0_5344),
// XOnlineLogon
OOVPA_TABLE_PATCH(XOnlineLogon_1_0_5344, XTL::EmuXOnlineLogon),
OOVPA_TABLE_PATCH(XOnlineLogon_1_0_5344, XOnlineLogon),
};
// ******************************************************************

14
src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl
View File

@ -123,25 +123,25 @@ OOVPA_END;
OOVPATable XOnline_1_0_5558[] = {
// XNetStartup
OOVPA_TABLE_PATCH(XNetStartup_1_0_5344, XTL::EmuXNetStartup),
OOVPA_TABLE_PATCH(XNetStartup_1_0_5344, XNetStartup),
// WSAStartup
OOVPA_TABLE_PATCH(WSAStartup_1_0_5558, XTL::EmuWSAStartup),
OOVPA_TABLE_PATCH(WSAStartup_1_0_5558, WSAStartup),
// XnInit (XREF) (* unchanged since 4627 *)
OOVPA_TABLE_XREF(XnInit_1_0_4627),
// socket
/*
OOVPA_TABLE_PATCH(socket_1_0_4361, MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emusocket)),
OOVPA_TABLE_PATCH_EmuThis(socket_1_0_4361, socket),
*/
// bind (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(bind_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emubind)),
OOVPA_TABLE_PATCH_EmuThis(bind_1_0_4361, bind),
// listen
/*
OOVPA_TABLE_PATCH(listen_1_0_4361, MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emulisten)),
OOVPA_TABLE_PATCH_EmuThis(listen_1_0_4361, listen),
*/
// ioctlsocket (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(ioctlsocket_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emuioctlsocket)),
OOVPA_TABLE_PATCH_EmuThis(ioctlsocket_1_0_4361, ioctlsocket),
// XNetGetEthernetLinkStatus
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_5344, XTL::EmuXNetGetEthernetLinkStatus),
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_5344, XNetGetEthernetLinkStatus),
};
// ******************************************************************

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

@ -99,17 +99,17 @@ OOVPA_END;
// ******************************************************************
OOVPATable XOnline_1_0_5788[] = {
// XNetStartup
OOVPA_TABLE_PATCH(XNetStartup_1_0_5788, XTL::EmuXNetStartup),
OOVPA_TABLE_PATCH(XNetStartup_1_0_5788, XNetStartup),
// WSAStartup
OOVPA_TABLE_PATCH(WSAStartup_1_0_5788, XTL::EmuWSAStartup),
OOVPA_TABLE_PATCH(WSAStartup_1_0_5788, WSAStartup),
// XnInit (XREF)
OOVPA_TABLE_XREF(XnInit_1_0_5788),
// XNetGetEthernetLinkStatus
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_5788, XTL::EmuXNetGetEthernetLinkStatus),
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_5788, XNetGetEthernetLinkStatus),
// bind (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(bind_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emubind)),
OOVPA_TABLE_PATCH_EmuThis(bind_1_0_4361, bind),
// ioctlsocket (* unchanged since 4361 *)
OOVPA_TABLE_PATCH(ioctlsocket_1_0_4361, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emuioctlsocket)),
OOVPA_TABLE_PATCH_EmuThis(ioctlsocket_1_0_4361, ioctlsocket),
};
// ******************************************************************

6
src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl
View File

@ -89,13 +89,13 @@ OOVPA_END;
// ******************************************************************
OOVPATable XOnline_1_0_5849[] = {
// XNetStartup
OOVPA_TABLE_PATCH(XNetStartup_1_0_5849, XTL::EmuXNetStartup),
OOVPA_TABLE_PATCH(XNetStartup_1_0_5849, XNetStartup),
// WSAStartup
OOVPA_TABLE_PATCH(WSAStartup_1_0_5849, XTL::EmuWSAStartup),
OOVPA_TABLE_PATCH(WSAStartup_1_0_5849, WSAStartup),
// XnInit (XREF)
OOVPA_TABLE_XREF(XnInit_1_0_5849),
// XNetGetEthernetLinkStatus
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_5849, XTL::EmuXNetGetEthernetLinkStatus),
OOVPA_TABLE_PATCH(XNetGetEthernetLinkStatus_1_0_5849, XNetGetEthernetLinkStatus),
};
// ******************************************************************

32
src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl
View File

@ -591,61 +591,61 @@ OOVPA_END;
OOVPATable XactEng_1_0_4627[] = {
// XACTEngineCreate
OOVPA_TABLE_PATCH(XACTEngineCreate_1_0_4627, XTL::EmuXACTEngineCreate),
OOVPA_TABLE_PATCH(XACTEngineCreate_1_0_4627, XACTEngineCreate),
// XACTEngineCreate
OOVPA_TABLE_PATCH(XACTEngineCreate_1_0_4928, XTL::EmuXACTEngineCreate),
OOVPA_TABLE_PATCH(XACTEngineCreate_1_0_4928, XACTEngineCreate),
// XACTEngineDoWork
OOVPA_TABLE_PATCH(XACTEngineDoWork_1_0_4627, XTL::EmuXACTEngineDoWork),
OOVPA_TABLE_PATCH(XACTEngineDoWork_1_0_4627, XACTEngineDoWork),
// XACT_CEngine_RegisterWaveBank
OOVPA_TABLE_XREF(XACT_CEngine_RegisterWaveBank_1_0_4627),
// IXACTEngine_RegisterWaveBank
OOVPA_TABLE_PATCH(IXACTEngine_RegisterWaveBank_1_0_4627, XTL::EmuIXACTEngine_RegisterWaveBank),
OOVPA_TABLE_PATCH(IXACTEngine_RegisterWaveBank_1_0_4627, IXACTEngine_RegisterWaveBank),
// XACT::CEngine::RegisterStreamedWaveBank (XREF)
OOVPA_TABLE_XREF(XACT_CEngine_RegisterStreamedWaveBank_1_0_4627),
// XACT::CEngine::RegisterStreamedWaveBank (XREF)
OOVPA_TABLE_XREF(XACT_CEngine_RegisterStreamedWaveBank_1_0_4928),
// IXACTEngine_RegisterStreamedWaveBank
OOVPA_TABLE_PATCH(IXACTEngine_RegisterStreamedWaveBank_1_0_4627, XTL::EmuIXACTEngine_RegisterStreamedWaveBank),
OOVPA_TABLE_PATCH(IXACTEngine_RegisterStreamedWaveBank_1_0_4627, IXACTEngine_RegisterStreamedWaveBank),
// IXACTEngine_RegisterStreamedWaveBank
OOVPA_TABLE_PATCH(IXACTEngine_RegisterStreamedWaveBank_1_0_4928, XTL::EmuIXACTEngine_RegisterStreamedWaveBank),
OOVPA_TABLE_PATCH(IXACTEngine_RegisterStreamedWaveBank_1_0_4928, IXACTEngine_RegisterStreamedWaveBank),
// XACT::CEngine::CreateSoundBank (XREF)
OOVPA_TABLE_XREF(XACT_CEngine_CreateSoundBank_1_0_4627),
// XACT::CEngine::CreateSoundBank (XREF)
OOVPA_TABLE_XREF(XACT_CEngine_CreateSoundBank_1_0_4928),
// IXACTEngine_CreateSoundBank
OOVPA_TABLE_PATCH(IXACTEngine_CreateSoundBank_1_0_4627, XTL::EmuIXACTEngine_CreateSoundBank),
OOVPA_TABLE_PATCH(IXACTEngine_CreateSoundBank_1_0_4627, IXACTEngine_CreateSoundBank),
// IXACTEngine_CreateSoundBank
OOVPA_TABLE_PATCH(IXACTEngine_CreateSoundBank_1_0_4928, XTL::EmuIXACTEngine_CreateSoundBank),
OOVPA_TABLE_PATCH(IXACTEngine_CreateSoundBank_1_0_4928, IXACTEngine_CreateSoundBank),
// XACT::CEngine::DownloadEffectsImage (XREF)
OOVPA_TABLE_XREF(XACT_CEngine_DownloadEffectsImage_1_0_4627),
// IXACTEngine_DownloadEffectsImage
OOVPA_TABLE_PATCH(IXACTEngine_DownloadEffectsImage_1_0_4627, XTL::EmuIXACTEngine_DownloadEffectsImage),
OOVPA_TABLE_PATCH(IXACTEngine_DownloadEffectsImage_1_0_4627, IXACTEngine_DownloadEffectsImage),
// XACT::CEngine::CreateSoundSource (XREF)
OOVPA_TABLE_XREF(XACT_CEngine_CreateSoundSource_1_0_4627),
// IXACTEngine_CreateSoundSource
OOVPA_TABLE_PATCH(IXACTEngine_CreateSoundSource_1_0_4627, XTL::EmuIXACTEngine_CreateSoundSource),
OOVPA_TABLE_PATCH(IXACTEngine_CreateSoundSource_1_0_4627, IXACTEngine_CreateSoundSource),
// XACT::CSoundBank::GetSoundCueIndexFromFriendlyName (XREF)
OOVPA_TABLE_XREF(XACT_CSoundBank_GetSoundCueIndexFromFriendlyName_1_0_4627),
// IXACTSoundBank_GetSoundCueIndexFromFriendlyName
OOVPA_TABLE_PATCH(IXACTSoundBank_GetSoundCueIndexFromFriendlyName_1_0_4627, XTL::EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName),
OOVPA_TABLE_PATCH(IXACTSoundBank_GetSoundCueIndexFromFriendlyName_1_0_4627, IXACTSoundBank_GetSoundCueIndexFromFriendlyName),
// IXACTSoundBank_Play
OOVPA_TABLE_PATCH(IXACTSoundBank_Play_1_0_4627, XTL::EmuIXACTSoundBank_Play),
OOVPA_TABLE_PATCH(IXACTSoundBank_Play_1_0_4627, IXACTSoundBank_Play),
// XACT::CEngine::RegisterNotification
OOVPA_TABLE_XREF(XACT_CEngine_RegisterNotification_1_0_4627),
// IXACTEngine_RegisterNotification
OOVPA_TABLE_PATCH(IXACTEngine_RegisterNotification_1_0_4627, XTL::EmuIXACTEngine_RegisterNotification),
OOVPA_TABLE_PATCH(IXACTEngine_RegisterNotification_1_0_4627, IXACTEngine_RegisterNotification),
// XACT::CEngine::GetNotification
OOVPA_TABLE_XREF(XACT_CEngine_GetNotification_1_0_4627),
// IXACTEngine_GetNotification
OOVPA_TABLE_PATCH(IXACTEngine_GetNotification_1_0_4627, XTL::EmuIXACTEngine_GetNotification),
OOVPA_TABLE_PATCH(IXACTEngine_GetNotification_1_0_4627, IXACTEngine_GetNotification),
// XACT::CEngine::UnRegisterWaveBank (XREF)
OOVPA_TABLE_XREF(XACT_CEngine_UnRegisterWaveBank_1_0_4627),
// XACT::CEngine::UnRegisterWaveBank (XREF)
OOVPA_TABLE_XREF(XACT_CEngine_UnRegisterWaveBank_1_0_4928),
// IXACTEngine_UnRegisterWaveBank
OOVPA_TABLE_PATCH(IXACTEngine_UnRegisterWaveBank_1_0_4627, XTL::EmuIXACTEngine_UnRegisterWaveBank),
OOVPA_TABLE_PATCH(IXACTEngine_UnRegisterWaveBank_1_0_4627, IXACTEngine_UnRegisterWaveBank),
// IXACTEngine_UnRegisterWaveBank
OOVPA_TABLE_PATCH(IXACTEngine_UnRegisterWaveBank_1_0_4928, XTL::EmuIXACTEngine_UnRegisterWaveBank),
OOVPA_TABLE_PATCH(IXACTEngine_UnRegisterWaveBank_1_0_4928, IXACTEngine_UnRegisterWaveBank),
};
// ******************************************************************

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

@ -976,92 +976,92 @@ OOVPA_END;
OOVPATable XAPI_1_0_3911[] = {
// GetExitCodeThread
OOVPA_TABLE_PATCH(GetExitCodeThread_1_0_3911, XTL::EmuGetExitCodeThread),
OOVPA_TABLE_PATCH(GetExitCodeThread_1_0_3911, GetExitCodeThread),
//*/
// XInitDevices
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XTL::EmuXInitDevices), /* Too High Level
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XInitDevices), /* Too High Level
// CreateMutex
OOVPA_TABLE_PATCH(CreateMutex_1_0_3911, XTL::EmuCreateMutex), //*/
OOVPA_TABLE_PATCH(CreateMutex_1_0_3911, CreateMutex), //*/
/* Too High Level */
// CreateThread
/*
OOVPA_TABLE_PATCH(CreateThread_1_0_3911, XTL::EmuCreateThread),
OOVPA_TABLE_PATCH(CreateThread_1_0_3911, CreateThread),
*/
// SetThreadPriority
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority), //*/
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, SetThreadPriority), //*/
// GetTimeZoneInformation
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, XTL::EmuGetTimeZoneInformation),
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, GetTimeZoneInformation),
// XRegisterThreadNotifyRoutine
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XTL::EmuXRegisterThreadNotifyRoutine),
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XRegisterThreadNotifyRoutine),
/*
// XCalculateSignatureBegin
OOVPA_TABLE_PATCH(XCalculateSignatureBegin_1_0_3911, XTL::EmuXCalculateSignatureBegin),
OOVPA_TABLE_PATCH(XCalculateSignatureBegin_1_0_3911, XCalculateSignatureBegin),
*/
// XGetDevices
OOVPA_TABLE_PATCH(XGetDevices_1_0_3911, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_3911, XGetDevices),
// XGetDeviceChanges
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_3911, XTL::EmuXGetDeviceChanges),
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_3911, XGetDeviceChanges),
// XInputOpen
OOVPA_TABLE_PATCH(XInputOpen_1_0_3911, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_3911, XInputOpen),
// XID_fCloseDevice
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_3911),
// XInputClose
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XTL::EmuXInputClose),
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XInputClose),
// XInputGetCapabilities
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_3911, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_3911, XInputGetCapabilities),
// XInputGetState
OOVPA_TABLE_PATCH(XInputGetState_1_0_3911, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_3911, XInputGetState),
// XInputSetState
OOVPA_TABLE_PATCH(XInputSetState_1_0_3911, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_3911, XInputSetState),
// SetThreadPriorityBoost
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_3911, XTL::EmuSetThreadPriorityBoost),
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_3911, SetThreadPriorityBoost),
// GetThreadPriority
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_3911, XTL::EmuGetThreadPriority),
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_3911, GetThreadPriority),
// CreateFiber
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, XTL::EmuCreateFiber),
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, CreateFiber),
// DeleteFiber
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, XTL::EmuDeleteFiber),
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, DeleteFiber),
// SwitchToFiber
OOVPA_TABLE_PATCH(SwitchToFiber_1_0_3911, XTL::EmuSwitchToFiber),
OOVPA_TABLE_PATCH(SwitchToFiber_1_0_3911, SwitchToFiber),
// ConvertThreadToFiber
OOVPA_TABLE_PATCH(ConvertThreadToFiber_1_0_3911, XTL::EmuConvertThreadToFiber),
OOVPA_TABLE_PATCH(ConvertThreadToFiber_1_0_3911, ConvertThreadToFiber),
// SignalObjectAndWait
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, XTL::EmuSignalObjectAndWait),
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, SignalObjectAndWait),
// QueueUserAPC
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, XTL::EmuQueueUserAPC),
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, QueueUserAPC),
// lstrcmpiW
/*
OOVPA_TABLE_PATCH(lstrcmpiW_1_0_3911, XTL::EmulstrcmpiW),
OOVPA_TABLE_PATCH(lstrcmpiW_1_0_3911, lstrcmpiW),
*/
// XMountAlternateTitleA
OOVPA_TABLE_PATCH(XMountAlternateTitleA_1_0_3911, XTL::EmuXMountAlternateTitle),
OOVPA_TABLE_PATCH(XMountAlternateTitleA_1_0_3911, XMountAlternateTitle),
// XUnmountAlternateTitleA
OOVPA_TABLE_PATCH(XUnmountAlternateTitleA_1_0_3911, XTL::EmuXUnmountAlternateTitle),
OOVPA_TABLE_PATCH(XUnmountAlternateTitleA_1_0_3911, XUnmountAlternateTitle),
// XMountMUA
OOVPA_TABLE_PATCH(XMountMUA_1_0_3911, XTL::EmuXMountMUA),
OOVPA_TABLE_PATCH(XMountMUA_1_0_3911, XMountMUA),
// XLaunchNewImageA
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_3911, XTL::EmuXLaunchNewImage),
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_3911, XLaunchNewImage),
// XGetLaunchInfo
OOVPA_TABLE_PATCH(XGetLaunchInfo_1_0_3911, XTL::EmuXGetLaunchInfo),
OOVPA_TABLE_PATCH(XGetLaunchInfo_1_0_3911, XGetLaunchInfo),
// XAutoPowerDownResetTimer
OOVPA_TABLE_PATCH(XAutoPowerDownResetTimer_1_0_3911, XTL::EmuXAutoPowerDownResetTimer),
OOVPA_TABLE_PATCH(XAutoPowerDownResetTimer_1_0_3911, XAutoPowerDownResetTimer),
// XMountMURootA
OOVPA_TABLE_PATCH(XMountMURootA_1_0_3911, XTL::EmuXMountMURootA),
OOVPA_TABLE_PATCH(XMountMURootA_1_0_3911, XMountMURootA),
// XMountUtilityDrive
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_3911, XTL::EmuXMountUtilityDrive),
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_3911, XMountUtilityDrive),
// ReadFileEx
/*
OOVPA_TABLE_PATCH(ReadFileEx_1_0_3911, XTL::EmuReadFileEx),
OOVPA_TABLE_PATCH(ReadFileEx_1_0_3911, ReadFileEx),
// WriteFileEx
OOVPA_TABLE_PATCH(WriteFileEx_1_0_3911, XTL::EmuWriteFileEx),
OOVPA_TABLE_PATCH(WriteFileEx_1_0_3911, WriteFileEx),
*/
// CloseHandle
/*
OOVPA_TABLE_PATCH(CloseHandle_1_0_3911, XTL::EmuCloseHandle),
OOVPA_TABLE_PATCH(CloseHandle_1_0_3911, CloseHandle),
*/
// ExitThread
/*
OOVPA_TABLE_PATCH(ExitThread_1_0_3911, XTL::EmuExitThread),
OOVPA_TABLE_PATCH(ExitThread_1_0_3911, ExitThread),
*/
};

42
src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl
View File

@ -164,54 +164,54 @@ OOVPA_END;
OOVPATable XAPI_1_0_4034[] = {
// XInitDevices (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XTL::EmuXInitDevices),
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XInitDevices),
// XGetDevices (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XGetDevices_1_0_3911, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_3911, XGetDevices),
/* These functions havent been rev'd yet (may be same as new/old)
// XInputOpen
OOVPA_TABLE_PATCH(XInputOpen_1_0_4034, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_4034, XInputOpen),
// XInputGetCapabilities
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4361, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4361, XInputGetCapabilities),
// XInputGetState
OOVPA_TABLE_PATCH(XInputGetState_1_0_4361, XTL::EmuXInputGetState), */
OOVPA_TABLE_PATCH(XInputGetState_1_0_4361, XInputGetState), */
/* Too High Level
// CreateThread (* unchanged since 1.0.3911 *)
OOVPA_TABLE_PATCH(CreateThread_1_0_3911, XTL::EmuCreateThread), */
OOVPA_TABLE_PATCH(CreateThread_1_0_3911, CreateThread), */
/*
// CloseHandle (*???*)
OOVPA_TABLE_PATCH(CloseHandle_1_0_(???), XTL::EmuCloseHandle), */
OOVPA_TABLE_PATCH(CloseHandle_1_0_(???), CloseHandle), */
//*/
// CreateFiber (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, XTL::EmuCreateFiber),
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, CreateFiber),
// DeleteFiber (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, XTL::EmuDeleteFiber),
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, DeleteFiber),
// GetTimeZoneInformation (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, XTL::EmuGetTimeZoneInformation),
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, GetTimeZoneInformation),
// SetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority),
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, SetThreadPriority),
// SignalObjectAndWait (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, XTL::EmuSignalObjectAndWait),
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, SignalObjectAndWait),
// QueueUserAPC (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, XTL::EmuQueueUserAPC),
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, QueueUserAPC),
// XInputSetState (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInputSetState_1_0_3911, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_3911, XInputSetState),
// XRegisterThreadNotifyRoutine (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XTL::EmuXRegisterThreadNotifyRoutine),
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XRegisterThreadNotifyRoutine),
// XGetDeviceChanges (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_3911, XTL::EmuXGetDeviceChanges),
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_3911, XGetDeviceChanges),
// XID_fCloseDevice (* unchanged since 3911 *)
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_3911),
// XInputClose (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XTL::EmuXInputClose),
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XInputClose),
// XInputGetCapabilities (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_3911, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_3911, XInputGetCapabilities),
// GetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_3911, XTL::EmuGetThreadPriority),
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_3911, GetThreadPriority),
// XInputOpen (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInputOpen_1_0_3911, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_3911, XInputOpen),
// XInputGetState (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInputGetState_1_0_3911, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_3911, XInputGetState),
};
// ******************************************************************

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

@ -211,55 +211,55 @@ OOVPA_END;
OOVPATable XAPI_1_0_4134[] = {
// XInitDevices (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XTL::EmuXInitDevices), //*/
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XInitDevices), //*/
// SetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority),
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, SetThreadPriority),
// GetExitCodeThread (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetExitCodeThread_1_0_3911, XTL::EmuGetExitCodeThread),
OOVPA_TABLE_PATCH(GetExitCodeThread_1_0_3911, GetExitCodeThread),
// XGetDevices
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XGetDevices),
// XInputOpen
OOVPA_TABLE_PATCH(XInputOpen_1_0_4134, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_4134, XInputOpen),
// XInputGetState
OOVPA_TABLE_PATCH(XInputGetState_1_0_4134, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_4134, XInputGetState),
// XInputSetState (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInputSetState_1_0_3911, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_3911, XInputSetState),
// XMountUtilityDrive
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4134, XTL::EmuXMountUtilityDrive),
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4134, XMountUtilityDrive),
// CreateFiber (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, XTL::EmuCreateFiber),
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, CreateFiber),
// DeleteFiber (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, XTL::EmuDeleteFiber),
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, DeleteFiber),
// GetTimeZoneInformation (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, XTL::EmuGetTimeZoneInformation),
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, GetTimeZoneInformation),
// XRegisterThreadNotifyRoutine (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XTL::EmuXRegisterThreadNotifyRoutine),
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XRegisterThreadNotifyRoutine),
// XGetDeviceChanges (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_3911, XTL::EmuXGetDeviceChanges),
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_3911, XGetDeviceChanges),
// XID_fCloseDevice (* unchanged since 3911 *)
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_3911),
// XInputClose (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XTL::EmuXInputClose),
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XInputClose),
// XInputGetCapabilities (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_3911, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_3911, XInputGetCapabilities),
// GetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_3911, XTL::EmuGetThreadPriority),
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_3911, GetThreadPriority),
// XInputPoll
OOVPA_TABLE_PATCH(XInputPoll_1_0_4134, XTL::EmuXInputPoll),
OOVPA_TABLE_PATCH(XInputPoll_1_0_4134, XInputPoll),
// SetThreadPriorityBoost (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_3911, XTL::EmuSetThreadPriorityBoost),
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_3911, SetThreadPriorityBoost),
// SignalObjectAndWait (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, XTL::EmuSignalObjectAndWait),
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, SignalObjectAndWait),
// QueueUserAPC (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, XTL::EmuQueueUserAPC),
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, QueueUserAPC),
// XMountMUA
OOVPA_TABLE_PATCH(XMountMUA_1_0_4134, XTL::EmuXMountMUA),
OOVPA_TABLE_PATCH(XMountMUA_1_0_4134, XMountMUA),
// timeSetEvent
OOVPA_TABLE_PATCH(timeSetEvent_1_0_4134, XTL::EmutimeSetEvent),
OOVPA_TABLE_PATCH(timeSetEvent_1_0_4134, timeSetEvent),
// timeKillEvent
OOVPA_TABLE_PATCH(timeKillEvent_1_0_4134, XTL::EmutimeKillEvent),
OOVPA_TABLE_PATCH(timeKillEvent_1_0_4134, timeKillEvent),
// XLaunchNewImageA
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_3911, XTL::EmuXLaunchNewImage),
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_3911, XLaunchNewImage),
};
// ******************************************************************

38
src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl
View File

@ -340,49 +340,49 @@ OOVPA_END;
OOVPATable XAPI_1_0_4361[] = {
// XInitDevices (* unchanged since 1.0.3911 *)
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XTL::EmuXInitDevices),
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XInitDevices),
// XGetDevices (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XGetDevices),
// XGetDeviceChanges (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_3911, XTL::EmuXGetDeviceChanges),
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_3911, XGetDeviceChanges),
// XInputOpen
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XInputOpen),
// XID_fCloseDevice
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_4361),
// XInputClose (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XTL::EmuXInputClose),
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XInputClose),
// XInputGetCapabilities
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4361, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4361, XInputGetCapabilities),
// XInputGetState
OOVPA_TABLE_PATCH(XInputGetState_1_0_4361, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_4361, XInputGetState),
// XInputSetState
OOVPA_TABLE_PATCH(XInputSetState_1_0_4361, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_4361, XInputSetState),
//*/
/*
// XapiThreadStartup
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XTL::EmuXapiThreadStartup),
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XapiThreadStartup),
//*/
// XMountUtilityDrive
// TODO: This needs to be verified on 4361, not just 4242!
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4134, XTL::EmuXMountUtilityDrive),
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4134, XMountUtilityDrive),
// CreateFiber (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, XTL::EmuCreateFiber),
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, CreateFiber),
// DeleteFiber (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, XTL::EmuDeleteFiber),
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, DeleteFiber),
// GetTimeZoneInformation (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, XTL::EmuGetTimeZoneInformation),
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, GetTimeZoneInformation),
// SetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority),
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, SetThreadPriority),
// GetExitCodeThread (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetExitCodeThread_1_0_3911, XTL::EmuGetExitCodeThread),
OOVPA_TABLE_PATCH(GetExitCodeThread_1_0_3911, GetExitCodeThread),
// SetThreadPriorityBoost (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_3911, XTL::EmuSetThreadPriorityBoost),
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_3911, SetThreadPriorityBoost),
// SignalObjectAndWait (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, XTL::EmuSignalObjectAndWait),
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, SignalObjectAndWait),
// QueueUserAPC (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, XTL::EmuQueueUserAPC),
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, QueueUserAPC),
// XMountMUA
OOVPA_TABLE_PATCH(XMountMUA_1_0_4361, XTL::EmuXMountMUA),
OOVPA_TABLE_PATCH(XMountMUA_1_0_4361, XMountMUA),
};
// ******************************************************************

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

@ -59,47 +59,47 @@ OOVPA_END;
// ******************************************************************
OOVPATable XAPI_1_0_4432[] = {
// XMountUtilityDrive
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive),
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XMountUtilityDrive),
// XInitDevices (* unchanged since 1.0.3911 *)
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XTL::EmuXInitDevices),
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XInitDevices),
// XGetDevices (* unchanged since 1.0.4134 *)
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XGetDevices),
// XInputOpen (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XInputOpen),
// XID_fCloseDevice
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_4361),
// XInputClose (* unchanged since 1.0.3911 *)
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XTL::EmuXInputClose),
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XInputClose),
// XInputGetCapabilities (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4361, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4361, XInputGetCapabilities),
// XInputGetState (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputGetState_1_0_4361, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_4361, XInputGetState),
// XInputSetState (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputSetState_1_0_4361, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_4361, XInputSetState),
/*
// XapiThreadStartup (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XTL::EmuXapiThreadStartup), //*/
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XapiThreadStartup), //*/
//*/
// GetExitCodeThread (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetExitCodeThread_1_0_3911, XTL::EmuGetExitCodeThread),
OOVPA_TABLE_PATCH(GetExitCodeThread_1_0_3911, GetExitCodeThread),
// GetTimeZoneInformation (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, XTL::EmuGetTimeZoneInformation),
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, GetTimeZoneInformation),
// SetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority),
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, SetThreadPriority),
// SignalObjectAndWait (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, XTL::EmuSignalObjectAndWait),
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, SignalObjectAndWait),
// CreateFiber (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, XTL::EmuCreateFiber),
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, CreateFiber),
// DeleteFiber (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, XTL::EmuDeleteFiber),
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, DeleteFiber),
// QueueUserAPC (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, XTL::EmuQueueUserAPC),
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, QueueUserAPC),
// timeSetEvent
OOVPA_TABLE_PATCH(timeSetEvent_1_0_4134, XTL::EmutimeSetEvent),
OOVPA_TABLE_PATCH(timeSetEvent_1_0_4134, timeSetEvent),
// timeKillEvent
OOVPA_TABLE_PATCH(timeKillEvent_1_0_4134, XTL::EmutimeKillEvent),
OOVPA_TABLE_PATCH(timeKillEvent_1_0_4134, timeKillEvent),
// XLaunchNewImageA
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_3911, XTL::EmuXLaunchNewImage),
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_3911, XLaunchNewImage),
};
// ******************************************************************

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

@ -639,118 +639,118 @@ OOVPA_END;
OOVPATable XAPI_1_0_4627[] = {
// XFormatUtilityDrive
OOVPA_TABLE_PATCH(XFormatUtilityDrive_1_0_4627, XTL::EmuXFormatUtilityDrive),
OOVPA_TABLE_PATCH(XFormatUtilityDrive_1_0_4627, XFormatUtilityDrive),
// SetThreadPriorityBoost
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_4627, XTL::EmuSetThreadPriorityBoost),
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_4627, SetThreadPriorityBoost),
// SetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority),
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, SetThreadPriority),
// GetThreadPriority
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_4627, XTL::EmuGetThreadPriority),
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_4627, GetThreadPriority),
// XRegisterThreadNotifyRoutine (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XTL::EmuXRegisterThreadNotifyRoutine),
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XRegisterThreadNotifyRoutine),
// XMountUtilityDrive (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive),
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XMountUtilityDrive),
// XInitDevices (* unchanged since 1.0.3911 *)
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XTL::EmuXInitDevices),
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XInitDevices),
// XGetDevices (* unchanged since 1.0.4134 *)
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XGetDevices),
// XInputOpen (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XInputOpen),
// XInputPoll (* unchanged since 4134 *)
OOVPA_TABLE_PATCH(XInputPoll_1_0_4134, XTL::EmuXInputPoll),
OOVPA_TABLE_PATCH(XInputPoll_1_0_4134, XInputPoll),
// XID_fCloseDevice
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_4627),
// XID_fCloseDevice
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_4928),
// XInputClose
OOVPA_TABLE_PATCH(XInputClose_1_0_4928, XTL::EmuXInputClose),
OOVPA_TABLE_PATCH(XInputClose_1_0_4928, XInputClose),
// XInputGetCapabilities (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4361, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4361, XInputGetCapabilities),
// XInputGetState (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputGetState_1_0_4361, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_4361, XInputGetState),
// XInputGetState
OOVPA_TABLE_PATCH(XInputGetState_1_0_4928, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_4928, XInputGetState),
// XInputGetCapabilities
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4928, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4928, XInputGetCapabilities),
// XInputGetCapabilities2
OOVPA_TABLE_PATCH(XInputGetCapabilities2_1_0_4928, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities2_1_0_4928, XInputGetCapabilities),
// XInputGetCapabilities3
OOVPA_TABLE_PATCH(XInputGetCapabilities3_1_0_4928, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities3_1_0_4928, XInputGetCapabilities),
// XInputGetCapabilities4
OOVPA_TABLE_PATCH(XInputGetCapabilities4_1_0_4928, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities4_1_0_4928, XInputGetCapabilities),
// XInputGetCapabilities5
OOVPA_TABLE_PATCH(XInputGetCapabilities5_1_0_4928, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities5_1_0_4928, XInputGetCapabilities),
// XInputSetState (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputSetState_1_0_4361, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_4361, XInputSetState),
// XInputSetState
OOVPA_TABLE_PATCH(XInputSetState_1_0_4928, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_4928, XInputSetState),
/* obsolete?
// XapiThreadStartup (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XTL::EmuXapiThreadStartup),
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XapiThreadStartup),
//*/
//*/
// XInputGetCapabilities
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4831, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4831, XInputGetCapabilities),
// XInputGetCapabilities2
OOVPA_TABLE_PATCH(XInputGetCapabilities2_1_0_4831, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities2_1_0_4831, XInputGetCapabilities),
// XInputGetCapabilities3
OOVPA_TABLE_PATCH(XInputGetCapabilities3_1_0_4831, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities3_1_0_4831, XInputGetCapabilities),
// XInputGetCapabilities4
OOVPA_TABLE_PATCH(XInputGetCapabilities4_1_0_4831, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities4_1_0_4831, XInputGetCapabilities),
// XInputGetCapabilities5
OOVPA_TABLE_PATCH(XInputGetCapabilities5_1_0_4831, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities5_1_0_4831, XInputGetCapabilities),
// XInputGetCapabilities6
OOVPA_TABLE_PATCH(XInputGetCapabilities6_1_0_4928, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities6_1_0_4928, XInputGetCapabilities),
// +s
/* not necessary?
// XCalculateSignatureBeginEx
OOVPA_TABLE_PATCH(XCalculateSignatureBeginEx_1_0_4627, XTL::EmuXCalculateSignatureBeginEx),
OOVPA_TABLE_PATCH(XCalculateSignatureBeginEx_1_0_4627, XCalculateSignatureBeginEx),
// XCalculateSignatureBegin
OOVPA_TABLE_PATCH(XCalculateSignatureBegin_1_0_4627, XTL::EmuXCalculateSignatureBegin),
OOVPA_TABLE_PATCH(XCalculateSignatureBegin_1_0_4627, XCalculateSignatureBegin),
// XCalculateSignatureUpdate
OOVPA_TABLE_PATCH(XCalculateSignatureUpdate_1_0_4627, XTL::EmuXCalculateSignatureUpdate),
OOVPA_TABLE_PATCH(XCalculateSignatureUpdate_1_0_4627, XCalculateSignatureUpdate),
// XCalculateSignatureEnd
OOVPA_TABLE_PATCH(XCalculateSignatureEnd_1_0_4627, XTL::EmuXCalculateSignatureEnd), //*/
OOVPA_TABLE_PATCH(XCalculateSignatureEnd_1_0_4627, XCalculateSignatureEnd), //*/
// s+
// CreateFiber (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, XTL::EmuCreateFiber),
OOVPA_TABLE_PATCH(CreateFiber_1_0_3911, CreateFiber),
// DeleteFiber (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, XTL::EmuDeleteFiber),
OOVPA_TABLE_PATCH(DeleteFiber_1_0_3911, DeleteFiber),
// GetTimeZoneInformation (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, XTL::EmuGetTimeZoneInformation),
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, GetTimeZoneInformation),
// GetExitCodeThread (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetExitCodeThread_1_0_3911, XTL::EmuGetExitCodeThread),
OOVPA_TABLE_PATCH(GetExitCodeThread_1_0_3911, GetExitCodeThread),
// GetOverlappedResult
OOVPA_TABLE_PATCH(GetOverlappedResult_1_0_4627, XTL::EmuGetOverlappedResult),
OOVPA_TABLE_PATCH(GetOverlappedResult_1_0_4627, GetOverlappedResult),
// XLaunchNewImageA
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_4627, XTL::EmuXLaunchNewImage),
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_4627, XLaunchNewImage),
// XLaunchNewImageA
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_4928, XTL::EmuXLaunchNewImage),
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_4928, XLaunchNewImage),
// XGetLaunchInfo
OOVPA_TABLE_PATCH(XGetLaunchInfo_1_0_4627, XTL::EmuXGetLaunchInfo),
OOVPA_TABLE_PATCH(XGetLaunchInfo_1_0_4627, XGetLaunchInfo),
// XSetProcessQuantumLength
OOVPA_TABLE_PATCH(XSetProcessQuantumLength_1_0_4627, XTL::EmuXSetProcessQuantumLength),
OOVPA_TABLE_PATCH(XSetProcessQuantumLength_1_0_4627, XSetProcessQuantumLength),
// SignalObjectAndWait (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, XTL::EmuSignalObjectAndWait),
OOVPA_TABLE_PATCH(SignalObjectAndWait_1_0_3911, SignalObjectAndWait),
// timeSetEvent
OOVPA_TABLE_PATCH(timeSetEvent_1_0_4627, XTL::EmutimeSetEvent),
OOVPA_TABLE_PATCH(timeSetEvent_1_0_4627, timeSetEvent),
// timeKillEvent
OOVPA_TABLE_PATCH(timeKillEvent_1_0_4627, XTL::EmutimeKillEvent),
OOVPA_TABLE_PATCH(timeKillEvent_1_0_4627, timeKillEvent),
// RaiseException
OOVPA_TABLE_PATCH(RaiseException_1_0_4627, XTL::EmuRaiseException),
OOVPA_TABLE_PATCH(RaiseException_1_0_4627, RaiseException),
// QueueUserAPC (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, XTL::EmuQueueUserAPC),
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, QueueUserAPC),
// XMountAlternateTitleA
OOVPA_TABLE_PATCH(XMountAlternateTitleA_1_0_4627, XTL::EmuXMountAlternateTitle),
OOVPA_TABLE_PATCH(XMountAlternateTitleA_1_0_4627, XMountAlternateTitle),
// XMountAlternateTitleA
OOVPA_TABLE_PATCH(XMountAlternateTitleA_1_0_4928, XTL::EmuXMountAlternateTitle),
OOVPA_TABLE_PATCH(XMountAlternateTitleA_1_0_4928, XMountAlternateTitle),
// XUnmountAlternateTitleA
OOVPA_TABLE_PATCH(XUnmountAlternateTitleA_1_0_4627, XTL::EmuXUnmountAlternateTitle),
OOVPA_TABLE_PATCH(XUnmountAlternateTitleA_1_0_4627, XUnmountAlternateTitle),
// XInputGetDeviceDescription
OOVPA_TABLE_PATCH(XInputGetDeviceDescription_1_0_4831, XTL::EmuXInputGetDeviceDescription),
OOVPA_TABLE_PATCH(XInputGetDeviceDescription_1_0_4831, XInputGetDeviceDescription),
// MoveFileA
/*
OOVPA_TABLE_PATCH(MoveFileA_1_0_4627, XTL::EmuMoveFileA),
OOVPA_TABLE_PATCH(MoveFileA_1_0_4627, MoveFileA),
*/
};

36
src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl
View File

@ -38,46 +38,46 @@
OOVPATable XAPI_1_0_4721[] = {
/*
// RtlCreateHeap (* unchanged since 1.0.4361 *) (* OR FARTHER *)
obsolete OOVPA_TABLE_PATCH(RtlCreateHeap_1_0_3911, XTL::EmuRtlCreateHeap),
obsolete OOVPA_TABLE_PATCH(RtlCreateHeap_1_0_3911, RtlCreateHeap),
// RtlAllocateHeap (* unchanged since 1.0.4361 *) (* OR FARTHER *)
obsolete OOVPA_TABLE_PATCH(RtlAllocateHeap_1_0_3911, XTL::EmuRtlAllocateHeap),
obsolete OOVPA_TABLE_PATCH(RtlAllocateHeap_1_0_3911, RtlAllocateHeap),
// RtlReAllocateHeap
obsolete OOVPA_TABLE_PATCH(RtlReAllocateHeap_1_0_4627, XTL::EmuRtlReAllocateHeap),
obsolete OOVPA_TABLE_PATCH(RtlReAllocateHeap_1_0_4627, RtlReAllocateHeap),
// RtlFreeHeap
obsolete OOVPA_TABLE_PATCH(RtlFreeHeap_1_0_4627, XTL::EmuRtlFreeHeap),
obsolete OOVPA_TABLE_PATCH(RtlFreeHeap_1_0_4627, RtlFreeHeap),
// RtlSizeHeap
obsolete OOVPA_TABLE_PATCH(RtlSizeHeap_1_0_4627, XTL::EmuRtlSizeHeap),
obsolete OOVPA_TABLE_PATCH(RtlSizeHeap_1_0_4627, RtlSizeHeap),
// RtlDestroyHeap
obsolete OOVPA_TABLE_PATCH(RtlDestroyHeap_1_0_4627, XTL::EmuRtlDestroyHeap),
obsolete OOVPA_TABLE_PATCH(RtlDestroyHeap_1_0_4627, RtlDestroyHeap),
*/
// XMountUtilityDrive
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive),
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XMountUtilityDrive),
// XInitDevices (* unchanged since 1.0.3911 *)
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XTL::EmuXInitDevices),
OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XInitDevices),
// XGetDevices (* unchanged since 1.0.4134 *)
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XGetDevices),
// XInputOpen (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XInputOpen),
// XInputGetCapabilities (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4361, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_4361, XInputGetCapabilities),
// XInputGetState (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputGetState_1_0_4361, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_4361, XInputGetState),
// XInputSetState (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputSetState_1_0_4361, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_4361, XInputSetState),
// XID_fCloseDevice (* unchanged since 1.0.4361 *)
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_4361),
// XInputClose (* unchanged since 1.0.3911 *)
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XTL::EmuXInputClose),
OOVPA_TABLE_PATCH(XInputClose_1_0_3911, XInputClose),
// XInputClose (* unchanged since 1.0.4361 *)
// OOVPA_TABLE_PATCH(XInputClose_1_0_4361, XTL::EmuXInputClose),
// OOVPA_TABLE_PATCH(XInputClose_1_0_4361, XInputClose),
// XapiThreadStartup (* unchanged since 1.0.4361 *)
// obsolete OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XTL::EmuXapiThreadStartup),
// obsolete OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XapiThreadStartup),
//* Too High Level
// XapiInitProcess (* unchanged since 1.0.4361 *)
// obsolete OOVPA_TABLE_PATCH(XapiInitProcess_1_0_4361, XTL::EmuXapiInitProcess),
// obsolete OOVPA_TABLE_PATCH(XapiInitProcess_1_0_4361, XapiInitProcess),
//*/
// XapiBootToDash (* unchanged since 1.0.3911 *)
/* obsolete OOVPA_TABLE_PATCH(XapiBootDash_1_0_3911, XTL::EmuXapiBootDash),*/
/* obsolete OOVPA_TABLE_PATCH(XapiBootDash_1_0_3911, XapiBootDash),*/
};
// ******************************************************************

30
src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl
View File

@ -99,37 +99,37 @@ OOVPA_END;
OOVPATable XAPI_1_0_5233[] = {
// GetTimeZoneInformation (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, XTL::EmuGetTimeZoneInformation),
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, GetTimeZoneInformation),
// SetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority),
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, SetThreadPriority),
// SetThreadPriorityBoost (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_4627, XTL::EmuSetThreadPriorityBoost),
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_4627, SetThreadPriorityBoost),
// GetThreadPriority (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_4627, XTL::EmuGetThreadPriority),
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_4627, GetThreadPriority),
// XRegisterThreadNotifyRoutine (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XTL::EmuXRegisterThreadNotifyRoutine),
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XRegisterThreadNotifyRoutine),
// XMountUtilityDrive (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive),
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XMountUtilityDrive),
// XInitDevices
OOVPA_TABLE_PATCH(XInitDevices_1_0_5233, XTL::EmuXInitDevices),
OOVPA_TABLE_PATCH(XInitDevices_1_0_5233, XInitDevices),
// XGetDevices (* unchanged since 1.0.4134 *)
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XGetDevices),
// XGetDeviceChanges
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_5233, XTL::EmuXGetDeviceChanges),
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_5233, XGetDeviceChanges),
// XInputOpen (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XInputOpen),
// XInputGetCapabilities
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_5233, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_5233, XInputGetCapabilities),
// XID_fCloseDevice (* unchanged since 1.0.4928 *)
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_4928),
// XInputClose (* unchanged since 1.0.4928 *)
OOVPA_TABLE_PATCH(XInputClose_1_0_4928, XTL::EmuXInputClose),
OOVPA_TABLE_PATCH(XInputClose_1_0_4928, XInputClose),
// XInputGetState (* unchanged since 1.0.4928 *)
OOVPA_TABLE_PATCH(XInputGetState_1_0_4928, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_4928, XInputGetState),
// XInputSetState
OOVPA_TABLE_PATCH(XInputSetState_1_0_5233, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_5233, XInputSetState),
// QueueUserAPC (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, XTL::EmuQueueUserAPC),
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, QueueUserAPC),
};
// ******************************************************************

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

@ -247,57 +247,57 @@ OOVPA_END;
OOVPATable XAPI_1_0_5558[] = {
// SetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority),
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, SetThreadPriority),
// XRegisterThreadNotifyRoutine (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XTL::EmuXRegisterThreadNotifyRoutine),
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XRegisterThreadNotifyRoutine),
// XMountUtilityDrive (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive),
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XMountUtilityDrive),
// XInitDevices (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(XInitDevices_1_0_5233, XTL::EmuXInitDevices),
OOVPA_TABLE_PATCH(XInitDevices_1_0_5233, XInitDevices),
// XGetDevices (* unchanged since 1.0.4134 *)
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XGetDevices),
// XGetDeviceChanges (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_5233, XTL::EmuXGetDeviceChanges),
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_5233, XGetDeviceChanges),
// XInputOpen (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XInputOpen),
// XInputGetCapabilities
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_5558, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_5558, XInputGetCapabilities),
// XInputGetState
OOVPA_TABLE_PATCH(XInputGetState_1_0_5558, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_5558, XInputGetState),
// XInputSetState (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(XInputSetState_1_0_5233, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_5233, XInputSetState),
/* obsolete?
// XapiThreadStartup (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XTL::EmuXapiThreadStartup),
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XapiThreadStartup),
//*/
// XLaunchNewImageA
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_5558, XTL::EmuXLaunchNewImage),
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_5558, XLaunchNewImage),
// XGetLaunchInfo
OOVPA_TABLE_PATCH(XGetLaunchInfo_1_0_5558, XTL::EmuXGetLaunchInfo),
OOVPA_TABLE_PATCH(XGetLaunchInfo_1_0_5558, XGetLaunchInfo),
// QueueUserAPC (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, XTL::EmuQueueUserAPC),
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, QueueUserAPC),
// SetThreadPriorityBoost (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_4627, XTL::EmuSetThreadPriorityBoost),
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_4627, SetThreadPriorityBoost),
// GetThreadPriority (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_4627, XTL::EmuGetThreadPriority),
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_4627, GetThreadPriority),
// GetTimeZoneInformation (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, XTL::EmuGetTimeZoneInformation),
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, GetTimeZoneInformation),
// XMountMUA
OOVPA_TABLE_PATCH(XMountMUA_1_0_5558, XTL::EmuXMountMUA),
OOVPA_TABLE_PATCH(XMountMUA_1_0_5558, XMountMUA),
// CreateFiber
OOVPA_TABLE_PATCH(CreateFiber_1_0_5558, XTL::EmuCreateFiber),
OOVPA_TABLE_PATCH(CreateFiber_1_0_5558, CreateFiber),
// DeleteFiber
OOVPA_TABLE_PATCH(DeleteFiber_1_0_5558, XTL::EmuDeleteFiber),
OOVPA_TABLE_PATCH(DeleteFiber_1_0_5558, DeleteFiber),
// SwitchToFiber
OOVPA_TABLE_PATCH(SwitchToFiber_1_0_5558, XTL::EmuSwitchToFiber),
OOVPA_TABLE_PATCH(SwitchToFiber_1_0_5558, SwitchToFiber),
// ConvertThreadToFiber
OOVPA_TABLE_PATCH(ConvertThreadToFiber_1_0_5558, XTL::EmuConvertThreadToFiber),
OOVPA_TABLE_PATCH(ConvertThreadToFiber_1_0_5558, ConvertThreadToFiber),
//// XapiFiberStartup
//OOVPA_TABLE_PATCH(XapiFiberStartup_1_0_5558, XTL::EmuXapiFiberStartup),
//OOVPA_TABLE_PATCH(XapiFiberStartup_1_0_5558, XapiFiberStartup),
// XID_fCloseDevice
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_5558),
// XInputClose
OOVPA_TABLE_PATCH(XInputClose_1_0_5558, XTL::EmuXInputClose),
OOVPA_TABLE_PATCH(XInputClose_1_0_5558, XInputClose),
};
// ******************************************************************

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

@ -148,67 +148,67 @@ OOVPA_END;
OOVPATable XAPI_1_0_5788[] = {
// SetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority),
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, SetThreadPriority),
// XMountUtilityDrive (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive),
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XMountUtilityDrive),
// XInitDevices (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(XInitDevices_1_0_5233, XTL::EmuXInitDevices),
OOVPA_TABLE_PATCH(XInitDevices_1_0_5233, XInitDevices),
// XGetDevices (* unchanged since 1.0.4134 *)
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XGetDevices),
// XInputOpen (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XInputOpen),
// XInputGetCapabilities (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_5558, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_5558, XInputGetCapabilities),
// XInputGetState (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(XInputGetState_1_0_5558, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_5558, XInputGetState),
// XGetDeviceChanges
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_5788, XTL::EmuXGetDeviceChanges),
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_5788, XGetDeviceChanges),
/* obsolete?
// XapiThreadStartup (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XTL::EmuXapiThreadStartup), //*/
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XapiThreadStartup), //*/
// XGetLaunchInfo (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(XGetLaunchInfo_1_0_5558, XTL::EmuXGetLaunchInfo),
OOVPA_TABLE_PATCH(XGetLaunchInfo_1_0_5558, XGetLaunchInfo),
// QueueUserAPC (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, XTL::EmuQueueUserAPC),
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, QueueUserAPC),
// XRegisterThreadNotifyRoutine (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XTL::EmuXRegisterThreadNotifyRoutine),
OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XRegisterThreadNotifyRoutine),
// GetThreadPriority
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_5788, XTL::EmuGetThreadPriority),
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_5788, GetThreadPriority),
// SetThreadPriorityBoost
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_5788, XTL::EmuSetThreadPriorityBoost),
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_5788, SetThreadPriorityBoost),
// GetThreadPriorityBoost
/*{
OOVPA_TABLE_PATCH(GetThreadPriorityBoost_1_0_5788, XTL::EmuGetThreadPriorityBoost),*/
OOVPA_TABLE_PATCH(GetThreadPriorityBoost_1_0_5788, GetThreadPriorityBoost),*/
// XMountMUA (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(XMountMUA_1_0_5558, XTL::EmuXMountMUA),
OOVPA_TABLE_PATCH(XMountMUA_1_0_5558, XMountMUA),
// GetTimeZoneInformation (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, XTL::EmuGetTimeZoneInformation),
OOVPA_TABLE_PATCH(GetTimeZoneInformation_1_0_3911, GetTimeZoneInformation),
// RaiseException
OOVPA_TABLE_PATCH(RaiseException_1_0_5788, XTL::EmuRaiseException),
OOVPA_TABLE_PATCH(RaiseException_1_0_5788, RaiseException),
// XLaunchNewImageA (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_5558, XTL::EmuXLaunchNewImage),
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_5558, XLaunchNewImage),
// XInputSetState (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(XInputSetState_1_0_5233, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_5233, XInputSetState),
// XGetDeviceEnumerationStatus
OOVPA_TABLE_PATCH(XGetDeviceEnumerationStatus_1_0_5788, XTL::EmuXGetDeviceEnumerationStatus),
OOVPA_TABLE_PATCH(XGetDeviceEnumerationStatus_1_0_5788, XGetDeviceEnumerationStatus),
// SwitchToThread
/*
OOVPA_TABLE_PATCH(SwitchToThread_1_0_5788, XTL::EmuSwitchToThread),
OOVPA_TABLE_PATCH(SwitchToThread_1_0_5788, SwitchToThread),
*/
// XFormatUtilityDrive (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(XFormatUtilityDrive_1_0_4627, XTL::EmuXFormatUtilityDrive),
OOVPA_TABLE_PATCH(XFormatUtilityDrive_1_0_4627, XFormatUtilityDrive),
// CreateFiber
OOVPA_TABLE_PATCH(CreateFiber_1_0_5558, XTL::EmuCreateFiber),
OOVPA_TABLE_PATCH(CreateFiber_1_0_5558, CreateFiber),
// DeleteFiber
OOVPA_TABLE_PATCH(DeleteFiber_1_0_5558, XTL::EmuDeleteFiber),
OOVPA_TABLE_PATCH(DeleteFiber_1_0_5558, DeleteFiber),
// SwitchToFiber
OOVPA_TABLE_PATCH(SwitchToFiber_1_0_5558, XTL::EmuSwitchToFiber),
OOVPA_TABLE_PATCH(SwitchToFiber_1_0_5558, SwitchToFiber),
// ConvertThreadToFiber
OOVPA_TABLE_PATCH(ConvertThreadToFiber_1_0_5558, XTL::EmuConvertThreadToFiber),
OOVPA_TABLE_PATCH(ConvertThreadToFiber_1_0_5558, ConvertThreadToFiber),
// XID_fCloseDevice (* unchanged since 5558 *)
OOVPA_TABLE_XREF(XID_fCloseDevice_1_0_5558),
// XInputClose (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(XInputClose_1_0_5558, XTL::EmuXInputClose),
OOVPA_TABLE_PATCH(XInputClose_1_0_5558, XInputClose),
};
// ******************************************************************

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

@ -148,55 +148,55 @@ OOVPA_END;
OOVPATable XAPI_1_0_5849[] = {
// SetThreadPriority (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority),
OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, SetThreadPriority),
// XMountUtilityDrive (* unchanged since 4432 *)
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive),
OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XMountUtilityDrive),
// XInitDevices (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(XInitDevices_1_0_5233, XTL::EmuXInitDevices),
OOVPA_TABLE_PATCH(XInitDevices_1_0_5233, XInitDevices),
// XGetDevices (* unchanged since 1.0.4134 *)
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XTL::EmuXGetDevices),
OOVPA_TABLE_PATCH(XGetDevices_1_0_4134, XGetDevices),
// XInputOpen (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XTL::EmuXInputOpen),
OOVPA_TABLE_PATCH(XInputOpen_1_0_4361, XInputOpen),
// XInputGetCapabilities (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_5558, XTL::EmuXInputGetCapabilities),
OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_5558, XInputGetCapabilities),
// XInputGetState (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(XInputGetState_1_0_5558, XTL::EmuXInputGetState),
OOVPA_TABLE_PATCH(XInputGetState_1_0_5558, XInputGetState),
// XGetDeviceChanges
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_5849, XTL::EmuXGetDeviceChanges),
OOVPA_TABLE_PATCH(XGetDeviceChanges_1_0_5849, XGetDeviceChanges),
/* obsolete?
// XapiThreadStartup (* unchanged since 1.0.4361 *)
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XTL::EmuXapiThreadStartup), //*/
OOVPA_TABLE_PATCH(XapiThreadStartup_1_0_4361, XapiThreadStartup), //*/
// QueueUserAPC (* unchanged since 3911 *)
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, XTL::EmuQueueUserAPC),
OOVPA_TABLE_PATCH(QueueUserAPC_1_0_3911, QueueUserAPC),
// GetThreadPriority
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_5849, XTL::EmuGetThreadPriority),
OOVPA_TABLE_PATCH(GetThreadPriority_1_0_5849, GetThreadPriority),
// SetThreadPriorityBoost
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_5849, XTL::EmuSetThreadPriorityBoost),
OOVPA_TABLE_PATCH(SetThreadPriorityBoost_1_0_5849, SetThreadPriorityBoost),
// GetThreadPriorityBoost
/*{
OOVPA_TABLE_PATCH(GetThreadPriorityBoost_1_0_5849, XTL::EmuGetThreadPriorityBoost),*/
OOVPA_TABLE_PATCH(GetThreadPriorityBoost_1_0_5849, GetThreadPriorityBoost),*/
// RaiseException
OOVPA_TABLE_PATCH(RaiseException_1_0_5849, XTL::EmuRaiseException),
OOVPA_TABLE_PATCH(RaiseException_1_0_5849, RaiseException),
// XLaunchNewImageA (* unchanged since 5558 *)
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_5558, XTL::EmuXLaunchNewImage),
OOVPA_TABLE_PATCH(XLaunchNewImageA_1_0_5558, XLaunchNewImage),
// XInputSetState (* unchanged since 5233 *)
OOVPA_TABLE_PATCH(XInputSetState_1_0_5233, XTL::EmuXInputSetState),
OOVPA_TABLE_PATCH(XInputSetState_1_0_5233, XInputSetState),
// XGetDeviceEnumerationStatus
OOVPA_TABLE_PATCH(XGetDeviceEnumerationStatus_1_0_5849, XTL::EmuXGetDeviceEnumerationStatus),
OOVPA_TABLE_PATCH(XGetDeviceEnumerationStatus_1_0_5849, XGetDeviceEnumerationStatus),
// SwitchToThread
/*
OOVPA_TABLE_PATCH(SwitchToThread_1_0_5849, XTL::EmuSwitchToThread),
OOVPA_TABLE_PATCH(SwitchToThread_1_0_5849, SwitchToThread),
*/
// XFormatUtilityDrive (* unchanged since 4627 *)
OOVPA_TABLE_PATCH(XFormatUtilityDrive_1_0_4627, XTL::EmuXFormatUtilityDrive),
OOVPA_TABLE_PATCH(XFormatUtilityDrive_1_0_4627, XFormatUtilityDrive),
// CreateFiber
OOVPA_TABLE_PATCH(CreateFiber_1_0_5558, XTL::EmuCreateFiber),
OOVPA_TABLE_PATCH(CreateFiber_1_0_5558, CreateFiber),
// DeleteFiber
OOVPA_TABLE_PATCH(DeleteFiber_1_0_5558, XTL::EmuDeleteFiber),
OOVPA_TABLE_PATCH(DeleteFiber_1_0_5558, DeleteFiber),
// SwitchToFiber
OOVPA_TABLE_PATCH(SwitchToFiber_1_0_5558, XTL::EmuSwitchToFiber),
OOVPA_TABLE_PATCH(SwitchToFiber_1_0_5558, SwitchToFiber),
// ConvertThreadToFiber
OOVPA_TABLE_PATCH(ConvertThreadToFiber_1_0_5558, XTL::EmuConvertThreadToFiber),
OOVPA_TABLE_PATCH(ConvertThreadToFiber_1_0_5558, ConvertThreadToFiber),
};
// ******************************************************************

45
src/CxbxKrnl/HLEIntercept.cpp
View File

@ -341,11 +341,11 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
void *pFunc = nullptr;
if(BuildVersion == 3925)
pFunc = EmuLocateFunction((OOVPA*)&IDirect3DDevice8_SetRenderState_CullMode_1_0_3925, lower, upper);
pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetRenderState_CullMode_1_0_3925, lower, upper);
else if(BuildVersion < 5233)
pFunc = EmuLocateFunction((OOVPA*)&IDirect3DDevice8_SetRenderState_CullMode_1_0_4034, lower, upper);
pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetRenderState_CullMode_1_0_4034, lower, upper);
else
pFunc = EmuLocateFunction((OOVPA*)&IDirect3DDevice8_SetRenderState_CullMode_1_0_5233, lower, upper);
pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetRenderState_CullMode_1_0_5233, lower, upper);
// locate D3DDeferredRenderState
if(pFunc != nullptr)
@ -411,14 +411,14 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
pFunc = nullptr;
if(BuildVersion == 3925)
pFunc = EmuLocateFunction((OOVPA*)&IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_3925, lower, upper);
pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_1_0_3925, lower, upper);
else if(BuildVersion == 4134)
pFunc = EmuLocateFunction((OOVPA*)&IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4134, lower, upper);
pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_1_0_4134, lower, upper);
else if(BuildVersion == 4361 || BuildVersion == 4432)
pFunc = EmuLocateFunction((OOVPA*)&IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4361, lower, upper);
pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_1_0_4361, lower, upper);
else if(BuildVersion == 4627 || BuildVersion == 5233 || BuildVersion == 5558 || BuildVersion == 5788
|| BuildVersion == 5849)
pFunc = EmuLocateFunction((OOVPA*)&IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4627, lower, upper);
pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_1_0_4627, lower, upper);
if(pFunc != nullptr)
{
@ -457,7 +457,7 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
// void *pFunc = nullptr;
// if(BuildVersion == 5849)
// pFunc = EmuLocateFunction((OOVPA*)&IDirect3DDevice8_SetRenderState_CullMode_1_0_5849_LTCG, lower, upper);
// pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetRenderState_CullMode_1_0_5849_LTCG, lower, upper);
// // locate D3DDeferredRenderState
// if(pFunc != nullptr)
@ -498,7 +498,7 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
// pFunc = nullptr;
// if(BuildVersion == 3925)
// pFunc = EmuLocateFunction((OOVPA*)&IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_5849_LTCG, lower, upper);
// pFunc = EmuLocateFunction((OOVPA*)&D3DDevice_SetTextureState_TexCoordIndex_1_0_5849_LTCG, lower, upper);
// if(pFunc != nullptr)
// {
@ -914,25 +914,30 @@ void VerifyHLEDataEntry(HLEVerifyContext *context, const OOVPATable *table, uint
// does this entry specify a redirection (patch)?
void * entry_redirect = table[index].lpRedirect;
if (entry_redirect != nullptr) {
// check no patch occurs twice in this table
for (uint32 t = index + 1; t < count; t++) {
if (entry_redirect == table[t].lpRedirect) {
if (table[index].Oovpa == table[t].Oovpa) {
HLEError(context, "Patch registered again (with same OOVPA) at index %d",
t);
} else {
HLEError(context, "Patch also used for another OOVPA at index %d",
t);
if (table[index].Oovpa == nullptr) {
HLEError(context, "Patch without an OOVPA at index %d",
index);
} else
// check no patch occurs twice in this table
for (uint32 t = index + 1; t < count; t++) {
if (entry_redirect == table[t].lpRedirect) {
if (table[index].Oovpa == table[t].Oovpa) {
HLEError(context, "Patch registered again (with same OOVPA) at index %d",
t);
} else {
HLEError(context, "Patch also used for another OOVPA at index %d",
t);
}
}
}
}
}
}
else
context->against_index = index;
// verify the OOVPA of this entry
VerifyHLEOOVPA(context, table[index].Oovpa);
if (table[index].Oovpa != nullptr)
VerifyHLEOOVPA(context, table[index].Oovpa);
}
void VerifyHLEData(HLEVerifyContext *context, const HLEData *data)

18
src/CxbxKrnl/OOVPA.h
View File

@ -183,18 +183,20 @@ OOVPA_XREF(Name, Count, XRefNoSaveIndex, XRefZero)
#if _DEBUG_TRACE
#define OOVPA_TABLE_PATCH(Oovpa, Patch) \
{&Oovpa.Header, Patch, #Patch}
#define OOVPA_TABLE_ENTRY(Oovpa, Patch, Name) { Oovpa, Patch, #Name }
#else
#define OOVPA_TABLE_ENTRY(Oovpa, Patch, Name) { Oovpa, Patch }
#endif
// Note : Space after :: is mandatory when the following symbol is ##-concatenated!
// TODO : _DEBUG_TRACE OOVPA_TABLE_* macro's :
// Cut Version off of Oovpa, and log separatly as "("#Version")"
#define OOVPA_TABLE_XREF(Oovpa) \
{&Oovpa.Header, 0, #Oovpa" (XRef)"}
#else
#define OOVPA_TABLE_PATCH(Oovpa, Patch) \
{&Oovpa.Header, Patch}
OOVPA_TABLE_ENTRY(&Oovpa.Header, XTL:: EMUPATCH(Patch), #Patch)
#define OOVPA_TABLE_PATCH_EmuThis(Oovpa, Patch) \
OOVPA_TABLE_ENTRY(&Oovpa.Header, MFPtoFP<XTL::EmuThis>(&XTL::EmuThis:: EMUPATCH(Patch)), #Patch)
#define OOVPA_TABLE_XREF(Oovpa) \
{&Oovpa.Header, 0}
#endif
OOVPA_TABLE_ENTRY(&Oovpa.Header, nullptr, #Oovpa" (XRef)")
#pragma pack()